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

Side by Side Diff: media/remoting/fake_media_resource.cc

Issue 2668393002: Rename DemuxerStreamProvider into MediaResource (Closed)
Patch Set: rebase Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/remoting/fake_demuxer_stream_provider.h" 5 #include "media/remoting/fake_media_resource.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "media/base/decoder_buffer.h" 10 #include "media/base/decoder_buffer.h"
11 #include "media/base/media_util.h" 11 #include "media/base/media_util.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 using testing::_; 14 using testing::_;
15 using testing::Invoke; 15 using testing::Invoke;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 // Sends frame out if there is pending read callback. Otherwise, stores it 95 // Sends frame out if there is pending read callback. Otherwise, stores it
96 // in the buffer queue. 96 // in the buffer queue.
97 if (pending_read_cb_.is_null()) { 97 if (pending_read_cb_.is_null()) {
98 buffer_queue_.push_back(input_buffer); 98 buffer_queue_.push_back(input_buffer);
99 } else { 99 } else {
100 base::ResetAndReturn(&pending_read_cb_).Run(kOk, input_buffer); 100 base::ResetAndReturn(&pending_read_cb_).Run(kOk, input_buffer);
101 } 101 }
102 } 102 }
103 103
104 FakeDemuxerStreamProvider::FakeDemuxerStreamProvider() 104 FakeMediaResource::FakeMediaResource()
105 : demuxer_stream_(new FakeDemuxerStream(true)) {} 105 : demuxer_stream_(new FakeDemuxerStream(true)) {}
106 106
107 FakeDemuxerStreamProvider::~FakeDemuxerStreamProvider() {} 107 FakeMediaResource::~FakeMediaResource() {}
108 108
109 DemuxerStream* FakeDemuxerStreamProvider::GetStream(DemuxerStream::Type type) { 109 DemuxerStream* FakeMediaResource::GetStream(DemuxerStream::Type type) {
110 if (type == DemuxerStream::AUDIO) 110 if (type == DemuxerStream::AUDIO)
111 return reinterpret_cast<DemuxerStream*>(demuxer_stream_.get()); 111 return reinterpret_cast<DemuxerStream*>(demuxer_stream_.get());
112 return nullptr; 112 return nullptr;
113 } 113 }
114 114
115 } // namespace remoting 115 } // namespace remoting
116 } // namespace media 116 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698