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

Unified Diff: media/base/fake_demuxer_stream.cc

Issue 2667283002: Refactor MediaResource to be multi-stream capable (Closed)
Patch Set: Created 3 years, 11 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/base/fake_demuxer_stream.h ('k') | media/base/fake_text_track_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/fake_demuxer_stream.cc
diff --git a/media/base/fake_demuxer_stream.cc b/media/base/fake_demuxer_stream.cc
index 01bfe777fb5487f002b5225abf29b176a81716e8..c1454b489c56c5da4da22c961be467fe6e8e4b66 100644
--- a/media/base/fake_demuxer_stream.cc
+++ b/media/base/fake_demuxer_stream.cc
@@ -111,11 +111,6 @@ void FakeDemuxerStream::set_enabled(bool enabled, base::TimeDelta timestamp) {
NOTIMPLEMENTED();
}
-void FakeDemuxerStream::SetStreamStatusChangeCB(
- const StreamStatusChangeCB& cb) {
- NOTIMPLEMENTED();
-}
-
void FakeDemuxerStream::HoldNextRead() {
DCHECK(task_runner_->BelongsToCurrentThread());
read_to_hold_ = next_read_num_;
@@ -224,10 +219,15 @@ FakeMediaResource::FakeMediaResource(int num_video_configs,
FakeMediaResource::~FakeMediaResource() {}
-DemuxerStream* FakeMediaResource::GetStream(DemuxerStream::Type type) {
- if (type == DemuxerStream::Type::AUDIO)
- return nullptr;
- return &fake_video_stream_;
-};
+std::vector<DemuxerStream*> FakeMediaResource::GetStreams() {
+ std::vector<DemuxerStream*> result;
+ result.push_back(&fake_video_stream_);
+ return result;
+}
+
+void FakeMediaResource::SetStreamStatusChangeCB(
+ const StreamStatusChangeCB& cb) {
+ NOTIMPLEMENTED();
+}
} // namespace media
« no previous file with comments | « media/base/fake_demuxer_stream.h ('k') | media/base/fake_text_track_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698