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

Side by Side Diff: content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc

Issue 1809623002: Replace all uses of webrtc::VideoRendererInterface by rtc::VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nit. Created 4 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h" 5 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "content/renderer/media/mock_peer_connection_impl.h" 11 #include "content/renderer/media/mock_peer_connection_impl.h"
12 #include "content/renderer/media/webaudio_capturer_source.h" 12 #include "content/renderer/media/webaudio_capturer_source.h"
13 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h" 13 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
14 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h" 14 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
15 #include "content/renderer/media/webrtc_audio_capturer.h" 15 #include "content/renderer/media/webrtc_audio_capturer.h"
16 #include "content/renderer/media/webrtc_local_audio_track.h" 16 #include "content/renderer/media/webrtc_local_audio_track.h"
17 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 17 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
18 #include "third_party/webrtc/api/mediastreaminterface.h" 18 #include "third_party/webrtc/api/mediastreaminterface.h"
19 #include "third_party/webrtc/base/scoped_ref_ptr.h" 19 #include "third_party/webrtc/base/scoped_ref_ptr.h"
20 #include "third_party/webrtc/media/base/videocapturer.h" 20 #include "third_party/webrtc/media/base/videocapturer.h"
21 21
22 using webrtc::AudioSourceInterface; 22 using webrtc::AudioSourceInterface;
23 using webrtc::AudioTrackInterface; 23 using webrtc::AudioTrackInterface;
24 using webrtc::AudioTrackVector; 24 using webrtc::AudioTrackVector;
25 using webrtc::IceCandidateCollection; 25 using webrtc::IceCandidateCollection;
26 using webrtc::IceCandidateInterface; 26 using webrtc::IceCandidateInterface;
27 using webrtc::MediaStreamInterface; 27 using webrtc::MediaStreamInterface;
28 using webrtc::ObserverInterface; 28 using webrtc::ObserverInterface;
29 using webrtc::SessionDescriptionInterface; 29 using webrtc::SessionDescriptionInterface;
30 using webrtc::VideoRendererInterface;
31 using webrtc::VideoTrackSourceInterface; 30 using webrtc::VideoTrackSourceInterface;
32 using webrtc::VideoTrackInterface; 31 using webrtc::VideoTrackInterface;
33 using webrtc::VideoTrackVector; 32 using webrtc::VideoTrackVector;
34 33
35 namespace content { 34 namespace content {
36 35
37 template <class V> 36 template <class V>
38 static typename V::iterator FindTrack(V* vector, 37 static typename V::iterator FindTrack(V* vector,
39 const std::string& track_id) { 38 const std::string& track_id) {
40 typename V::iterator it = vector->begin(); 39 typename V::iterator it = vector->begin();
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 return remote_; 193 return remote_;
195 } 194 }
196 195
197 MockWebRtcVideoTrack::MockWebRtcVideoTrack( 196 MockWebRtcVideoTrack::MockWebRtcVideoTrack(
198 const std::string& id, 197 const std::string& id,
199 webrtc::VideoTrackSourceInterface* source) 198 webrtc::VideoTrackSourceInterface* source)
200 : enabled_(false), 199 : enabled_(false),
201 id_(id), 200 id_(id),
202 state_(MediaStreamTrackInterface::kLive), 201 state_(MediaStreamTrackInterface::kLive),
203 source_(source), 202 source_(source),
204 renderer_(NULL) {} 203 sink_(NULL) {}
205 204
206 MockWebRtcVideoTrack::~MockWebRtcVideoTrack() {} 205 MockWebRtcVideoTrack::~MockWebRtcVideoTrack() {}
207 206
208 void MockWebRtcVideoTrack::AddRenderer(VideoRendererInterface* renderer) { 207 void MockWebRtcVideoTrack::AddOrUpdateSink(
209 DCHECK(!renderer_); 208 rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
210 renderer_ = renderer; 209 const rtc::VideoSinkWants& wants) {
210 DCHECK(!sink_);
211 sink_ = sink;
211 } 212 }
212 213
213 void MockWebRtcVideoTrack::RemoveRenderer(VideoRendererInterface* renderer) { 214 void MockWebRtcVideoTrack::RemoveSink(
214 DCHECK(renderer_ == renderer); 215 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
215 renderer_ = NULL; 216 DCHECK(sink_ == sink);
217 sink_ = NULL;
216 } 218 }
217 219
218 std::string MockWebRtcVideoTrack::kind() const { 220 std::string MockWebRtcVideoTrack::kind() const {
219 NOTIMPLEMENTED(); 221 NOTIMPLEMENTED();
220 return std::string(); 222 return std::string();
221 } 223 }
222 224
223 std::string MockWebRtcVideoTrack::id() const { return id_; } 225 std::string MockWebRtcVideoTrack::id() const { return id_; }
224 226
225 bool MockWebRtcVideoTrack::enabled() const { return enabled_; } 227 bool MockWebRtcVideoTrack::enabled() const { return enabled_; }
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 if (fail_to_create_next_audio_capturer_) { 423 if (fail_to_create_next_audio_capturer_) {
422 fail_to_create_next_audio_capturer_ = false; 424 fail_to_create_next_audio_capturer_ = false;
423 return NULL; 425 return NULL;
424 } 426 }
425 DCHECK(audio_source); 427 DCHECK(audio_source);
426 return WebRtcAudioCapturer::CreateCapturer(-1, device_info, constraints, NULL, 428 return WebRtcAudioCapturer::CreateCapturer(-1, device_info, constraints, NULL,
427 audio_source); 429 audio_source);
428 } 430 }
429 431
430 } // namespace content 432 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698