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

Unified Diff: media/filters/media_source_state.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/filters/media_source_state.cc
diff --git a/media/filters/media_source_state.cc b/media/filters/media_source_state.cc
index ede96052668fb086df2664f5a11b3f36b647b6ca..6977e39538e2702f6889db40d14e65294b66fd1b 100644
--- a/media/filters/media_source_state.cc
+++ b/media/filters/media_source_state.cc
@@ -6,6 +6,8 @@
#include "base/callback_helpers.h"
#include "base/stl_util.h"
+#include "media/base/media_track.h"
+#include "media/base/media_tracks.h"
#include "media/filters/chunk_demuxer.h"
#include "media/filters/frame_processor.h"
#include "media/filters/source_buffer_stream.h"
@@ -468,9 +470,13 @@ bool MediaSourceState::IsSeekWaitingForData() const {
bool MediaSourceState::OnNewConfigs(
bool allow_audio,
bool allow_video,
- const AudioDecoderConfig& audio_config,
- const VideoDecoderConfig& video_config,
+ scoped_ptr<MediaTracks> tracks,
const StreamParser::TextTrackConfigMap& text_configs) {
+ DCHECK(tracks);
wolenetz 2016/02/26 00:06:21 nit: though scoped_ptr allows this IIUC, I prefer
servolk 2016/02/26 01:56:32 Done.
+ media_tracks_ = std::move(tracks);
+ const AudioDecoderConfig& audio_config = media_tracks_->getFirstAudioConfig();
+ const VideoDecoderConfig& video_config = media_tracks_->getFirstVideoConfig();
+
DVLOG(1) << "OnNewConfigs(" << allow_audio << ", " << allow_video << ", "
<< audio_config.IsValidConfig() << ", "
<< video_config.IsValidConfig() << ")";
@@ -638,7 +644,7 @@ bool MediaSourceState::OnNewConfigs(
DVLOG(1) << "OnNewConfigs() : " << (success ? "success" : "failed");
if (success)
- init_segment_received_cb_.Run();
+ init_segment_received_cb_.Run(*media_tracks_);
return success;
}

Powered by Google App Engine
This is Rietveld 408576698