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

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler_unittest.cc

Issue 23691038: Switch LiveAudio to source provider solution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed the android bot Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 246
247 scoped_refptr<webrtc::MediaStreamInterface> native_stream( 247 scoped_refptr<webrtc::MediaStreamInterface> native_stream(
248 mock_dependency_factory_->CreateLocalMediaStream(stream_label)); 248 mock_dependency_factory_->CreateLocalMediaStream(stream_label));
249 249
250 local_stream.audioTracks(audio_tracks); 250 local_stream.audioTracks(audio_tracks);
251 const std::string audio_track_id = UTF16ToUTF8(audio_tracks[0].id()); 251 const std::string audio_track_id = UTF16ToUTF8(audio_tracks[0].id());
252 scoped_refptr<WebRtcAudioCapturer> capturer; 252 scoped_refptr<WebRtcAudioCapturer> capturer;
253 RTCMediaConstraints audio_constraints(audio_source.constraints()); 253 RTCMediaConstraints audio_constraints(audio_source.constraints());
254 scoped_refptr<webrtc::AudioTrackInterface> audio_track( 254 scoped_refptr<webrtc::AudioTrackInterface> audio_track(
255 mock_dependency_factory_->CreateLocalAudioTrack( 255 mock_dependency_factory_->CreateLocalAudioTrack(
256 audio_track_id, capturer, NULL, 256 audio_track_id, capturer, NULL, NULL,
257 &audio_constraints)); 257 &audio_constraints));
258 native_stream->AddTrack(audio_track.get()); 258 native_stream->AddTrack(audio_track.get());
259 259
260 local_stream.videoTracks(video_tracks); 260 local_stream.videoTracks(video_tracks);
261 const std::string video_track_id = UTF16ToUTF8(video_tracks[0].id()); 261 const std::string video_track_id = UTF16ToUTF8(video_tracks[0].id());
262 webrtc::VideoSourceInterface* source = NULL; 262 webrtc::VideoSourceInterface* source = NULL;
263 scoped_refptr<webrtc::VideoTrackInterface> video_track( 263 scoped_refptr<webrtc::VideoTrackInterface> video_track(
264 mock_dependency_factory_->CreateLocalVideoTrack( 264 mock_dependency_factory_->CreateLocalVideoTrack(
265 video_track_id, source)); 265 video_track_id, source));
266 native_stream->AddTrack(video_track.get()); 266 native_stream->AddTrack(video_track.get());
(...skipping 17 matching lines...) Expand all
284 mock_dependency_factory_->CreateLocalVideoTrack( 284 mock_dependency_factory_->CreateLocalVideoTrack(
285 video_track_label, source)); 285 video_track_label, source));
286 stream->AddTrack(video_track.get()); 286 stream->AddTrack(video_track.get());
287 } 287 }
288 if (!audio_track_label.empty()) { 288 if (!audio_track_label.empty()) {
289 scoped_refptr<WebRtcAudioCapturer> capturer; 289 scoped_refptr<WebRtcAudioCapturer> capturer;
290 scoped_refptr<webrtc::AudioTrackInterface> audio_track( 290 scoped_refptr<webrtc::AudioTrackInterface> audio_track(
291 mock_dependency_factory_->CreateLocalAudioTrack(audio_track_label, 291 mock_dependency_factory_->CreateLocalAudioTrack(audio_track_label,
292 capturer, 292 capturer,
293 NULL, 293 NULL,
294 NULL,
294 NULL)); 295 NULL));
295 stream->AddTrack(audio_track.get()); 296 stream->AddTrack(audio_track.get());
296 } 297 }
297 mock_peer_connection_->AddRemoteStream(stream.get()); 298 mock_peer_connection_->AddRemoteStream(stream.get());
298 return stream; 299 return stream;
299 } 300 }
300 301
301 scoped_ptr<MockWebRTCPeerConnectionHandlerClient> mock_client_; 302 scoped_ptr<MockWebRTCPeerConnectionHandlerClient> mock_client_;
302 scoped_ptr<MockMediaStreamDependencyFactory> mock_dependency_factory_; 303 scoped_ptr<MockMediaStreamDependencyFactory> mock_dependency_factory_;
303 scoped_ptr<NiceMock<MockPeerConnectionTracker> > mock_tracker_; 304 scoped_ptr<NiceMock<MockPeerConnectionTracker> > mock_tracker_;
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 EXPECT_CALL(*mock_tracker_.get(), 822 EXPECT_CALL(*mock_tracker_.get(),
822 TrackCreateDTMFSender(pc_handler_.get(), 823 TrackCreateDTMFSender(pc_handler_.get(),
823 testing::Ref(tracks[0]))); 824 testing::Ref(tracks[0])));
824 825
825 scoped_ptr<WebKit::WebRTCDTMFSenderHandler> sender( 826 scoped_ptr<WebKit::WebRTCDTMFSenderHandler> sender(
826 pc_handler_->createDTMFSender(tracks[0])); 827 pc_handler_->createDTMFSender(tracks[0]));
827 EXPECT_TRUE(sender.get()); 828 EXPECT_TRUE(sender.get());
828 } 829 }
829 830
830 } // namespace content 831 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | content/renderer/media/webaudio_capturer_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698