Index: media/filters/ffmpeg_demuxer.cc |
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc |
index dd80dfccfbd0bab8a83371d31e92141ee18c4279..fca8b566dff45bb684c04d327023c1b8f9ab6ae7 100644 |
--- a/media/filters/ffmpeg_demuxer.cc |
+++ b/media/filters/ffmpeg_demuxer.cc |
@@ -1026,9 +1026,14 @@ base::Time FFmpegDemuxer::GetTimelineOffset() const { |
return timeline_offset_; |
} |
-DemuxerStream* FFmpegDemuxer::GetStream(DemuxerStream::Type type) { |
+std::vector<DemuxerStream*> FFmpegDemuxer::GetStreams() { |
DCHECK(task_runner_->BelongsToCurrentThread()); |
- return GetFFmpegStream(type); |
+ std::vector<DemuxerStream*> result; |
+ for (const auto& stream : streams_) { |
+ if (stream) |
tguilbert
2017/01/24 23:24:40
Can there ever be null streams?
servolk
2017/01/25 00:57:32
Yes. Streams with unsupported audio/video codecs o
|
+ result.push_back(stream.get()); |
+ } |
+ return result; |
} |
FFmpegDemuxerStream* FFmpegDemuxer::GetFFmpegStream( |
tguilbert
2017/01/24 23:24:40
Should this be renamed to "GetFirstEnabledStream"?
servolk
2017/01/25 00:57:32
Thanks for drawing my attention to this. I've fixe
tguilbert
2017/01/25 02:36:46
That name seems good to me.
|