Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: media/formats/mp4/mp4_stream_parser.cc

Issue 1716503002: Basic media tracks implementation for media stream parsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added DISALLOW_COPY_AND_ASSIGN in MediaTracks Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/formats/mp4/mp4_stream_parser.cc
diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc
index 7becdf941019ffca0378baf9e08a9702957f35cc..c04ee86df6603ade543de2e5055969419ccff7ed 100644
--- a/media/formats/mp4/mp4_stream_parser.cc
+++ b/media/formats/mp4/mp4_stream_parser.cc
@@ -14,6 +14,7 @@
#include "base/time/time.h"
#include "build/build_config.h"
#include "media/base/audio_decoder_config.h"
+#include "media/base/media_tracks.h"
#include "media/base/stream_parser_buffer.h"
#include "media/base/text_track_config.h"
#include "media/base/timestamp_constants.h"
@@ -353,7 +354,14 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) {
if (!moov_->pssh.empty())
OnEncryptedMediaInitData(moov_->pssh);
- RCHECK(config_cb_.Run(audio_config, video_config, TextTrackConfigMap()));
+ scoped_ptr<MediaTracks> media_tracks(new MediaTracks());
wolenetz 2016/02/26 00:06:21 ditto: TODO+crbug for sourcing inband track metada
servolk 2016/02/26 01:56:33 Done.
+ if (audio_config.IsValidConfig()) {
+ media_tracks->AddAudioTrack(audio_config, "audio", "", "", "");
+ }
+ if (video_config.IsValidConfig()) {
+ media_tracks->AddVideoTrack(video_config, "video", "", "", "");
+ }
+ RCHECK(config_cb_.Run(std::move(media_tracks), TextTrackConfigMap()));
StreamParser::InitParameters params(kInfiniteDuration());
if (moov_->extends.header.fragment_duration > 0) {

Powered by Google App Engine
This is Rietveld 408576698