| Index: media/filters/ffmpeg_demuxer.cc
|
| diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
|
| index e0abd230f12f91c5e57212c981f06c780086a630..27d1374a646831f84639885702900b76c181aaf7 100644
|
| --- a/media/filters/ffmpeg_demuxer.cc
|
| +++ b/media/filters/ffmpeg_demuxer.cc
|
| @@ -1333,6 +1333,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 &&
|
| @@ -1651,6 +1659,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);
|
| }
|
|
|
|
|