summaryrefslogtreecommitdiff
path: root/chromium/media/remoting/fake_media_resource.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/remoting/fake_media_resource.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/remoting/fake_media_resource.cc')
-rw-r--r--chromium/media/remoting/fake_media_resource.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/media/remoting/fake_media_resource.cc b/chromium/media/remoting/fake_media_resource.cc
index e77cf87e10c..710b84a8931 100644
--- a/chromium/media/remoting/fake_media_resource.cc
+++ b/chromium/media/remoting/fake_media_resource.cc
@@ -101,13 +101,15 @@ void FakeDemuxerStream::CreateFakeFrame(size_t size,
}
FakeMediaResource::FakeMediaResource()
- : demuxer_stream_(new FakeDemuxerStream(true)) {}
+ : audio_stream_(new FakeDemuxerStream(true)),
+ video_stream_(new FakeDemuxerStream(false)) {}
FakeMediaResource::~FakeMediaResource() = default;
std::vector<DemuxerStream*> FakeMediaResource::GetAllStreams() {
std::vector<DemuxerStream*> streams;
- streams.push_back(demuxer_stream_.get());
+ streams.push_back(audio_stream_.get());
+ streams.push_back(video_stream_.get());
return streams;
}