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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 2684103005: Allow media track switching. (Closed)
Patch Set: Added a LayoutTest for media track switching Created 3 years, 9 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/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index e97de2c75d4c2f768bba0262c6112729420e2407..5a61f0058fd3bb71ba9d31ebac6d10ccc41c3534 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -712,6 +712,13 @@ void ChunkDemuxer::OnEnabledAudioTracksChanged(
ChunkDemuxerStream* stream = track_id_to_demux_stream_map_[id];
DCHECK(stream);
DCHECK_EQ(DemuxerStream::AUDIO, stream->type());
+ // TODO(servolk): Remove after multiple enabled audio tracks are supported
+ // by the media::RendererImpl.
+ if (!enabled_streams.empty()) {
+ MEDIA_LOG(INFO, media_log_)
+ << "Only one enabled audio track is supported, ignoring track " << id;
+ continue;
+ }
enabled_streams.insert(stream);
}
@@ -1224,6 +1231,7 @@ ChunkDemuxerStream* ChunkDemuxer::CreateDemuxerStream(
track_id_to_demux_stream_map_.end());
track_id_to_demux_stream_map_[media_track_id] = stream.get();
id_to_streams_map_[source_id].push_back(stream.get());
+ stream->set_enabled(owning_vector->empty(), base::TimeDelta());
owning_vector->push_back(std::move(stream));
return owning_vector->back().get();
}

Powered by Google App Engine
This is Rietveld 408576698