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

Unified Diff: media/remoting/fake_remoting_media_resource.cc

Issue 2491043003: MediaResource refactoring to support multiple streams (Closed)
Patch Set: rebase 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
Index: media/remoting/fake_remoting_media_resource.cc
diff --git a/media/remoting/fake_remoting_demuxer_stream_provider.cc b/media/remoting/fake_remoting_media_resource.cc
similarity index 87%
rename from media/remoting/fake_remoting_demuxer_stream_provider.cc
rename to media/remoting/fake_remoting_media_resource.cc
index dcd57776458a945beb15f9ebcf27fbf275f3b633..3ad8915aa2dbde19f2e499758a8f705427cfb992 100644
--- a/media/remoting/fake_remoting_demuxer_stream_provider.cc
+++ b/media/remoting/fake_remoting_media_resource.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/remoting/fake_remoting_demuxer_stream_provider.h"
+#include "media/remoting/fake_remoting_media_resource.h"
#include <vector>
@@ -72,7 +72,7 @@ VideoRotation DummyDemuxerStream::video_rotation() {
}
bool DummyDemuxerStream::enabled() const {
- return false;
+ return true;
}
void DummyDemuxerStream::CreateFakeFrame(size_t size,
@@ -100,16 +100,15 @@ void DummyDemuxerStream::CreateFakeFrame(size_t size,
}
}
-FakeRemotingDemuxerStreamProvider::FakeRemotingDemuxerStreamProvider()
+FakeRemotingMediaResource::FakeRemotingMediaResource()
: demuxer_stream_(new DummyDemuxerStream(true)) {}
-FakeRemotingDemuxerStreamProvider::~FakeRemotingDemuxerStreamProvider() {}
+FakeRemotingMediaResource::~FakeRemotingMediaResource() {}
-DemuxerStream* FakeRemotingDemuxerStreamProvider::GetStream(
- DemuxerStream::Type type) {
- if (type == DemuxerStream::AUDIO)
- return reinterpret_cast<DemuxerStream*>(demuxer_stream_.get());
- return nullptr;
+std::vector<DemuxerStream*> FakeRemotingMediaResource::GetStreams() {
+ std::vector<DemuxerStream*> streams;
+ streams.push_back(demuxer_stream_.get());
+ return streams;
}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698