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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 2684103005: Allow media track switching. (Closed)
Patch Set: Fixed comments Created 3 years, 8 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
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index d55b2deef680dcc1592176e63b1476dd26f7954b..9fb533e2efd2bca1659048d52bbdb5ee147e5765 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -715,6 +715,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);
}
@@ -1227,6 +1234,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();
}
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698