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

Unified Diff: media/filters/ffmpeg_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/filters/chunk_demuxer.cc ('k') | media/renderers/audio_renderer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index c686aa9de4c933cbde609efbce9d3c2891c8e694..5f37c6eac83c2db9ea5408714e3a1d5c3c4bec89 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -1338,6 +1338,14 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb,
track_label = streams_[i]->GetMetadata("title");
}
+ if (codec_type == AVMEDIA_TYPE_AUDIO) {
+ streams_[i]->set_enabled(detected_audio_track_count == 1,
+ base::TimeDelta());
+ } else if (codec_type == AVMEDIA_TYPE_VIDEO) {
+ streams_[i]->set_enabled(detected_video_track_count == 1,
+ base::TimeDelta());
+ }
+
if ((codec_type == AVMEDIA_TYPE_AUDIO &&
media_tracks->getAudioConfig(track_id).IsValidConfig()) ||
(codec_type == AVMEDIA_TYPE_VIDEO &&
@@ -1656,6 +1664,13 @@ void FFmpegDemuxer::OnEnabledAudioTracksChanged(
FFmpegDemuxerStream* 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);
}
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/renderers/audio_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698