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

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

Issue 1721273002: MediaStream audio object graph untangling and clean-ups. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE 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 (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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/thread_task_runner_handle.h" 15 #include "base/thread_task_runner_handle.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "content/child/child_process.h" 17 #include "content/child/child_process.h"
18 #include "content/renderer/media/media_stream.h" 18 #include "content/renderer/media/media_stream.h"
19 #include "content/renderer/media/media_stream_audio_source.h" 19 #include "content/renderer/media/media_stream_audio_source.h"
20 #include "content/renderer/media/media_stream_source.h" 20 #include "content/renderer/media/media_stream_source.h"
21 #include "content/renderer/media/media_stream_video_track.h" 21 #include "content/renderer/media/media_stream_video_track.h"
22 #include "content/renderer/media/mock_data_channel_impl.h" 22 #include "content/renderer/media/mock_data_channel_impl.h"
23 #include "content/renderer/media/mock_media_constraint_factory.h"
24 #include "content/renderer/media/mock_media_stream_video_source.h" 23 #include "content/renderer/media/mock_media_stream_video_source.h"
25 #include "content/renderer/media/mock_peer_connection_impl.h" 24 #include "content/renderer/media/mock_peer_connection_impl.h"
26 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h" 25 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
27 #include "content/renderer/media/peer_connection_tracker.h" 26 #include "content/renderer/media/peer_connection_tracker.h"
28 #include "content/renderer/media/rtc_media_constraints.h" 27 #include "content/renderer/media/rtc_media_constraints.h"
29 #include "content/renderer/media/rtc_peer_connection_handler.h" 28 #include "content/renderer/media/rtc_peer_connection_handler.h"
30 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h" 29 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h"
31 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h" 30 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
32 #include "content/renderer/media/webrtc_local_audio_track.h" 31 #include "content/renderer/media/webrtc_local_audio_track.h"
33 #include "testing/gmock/include/gmock/gmock.h" 32 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 blink::WebMediaStreamSource::TypeVideo, 260 blink::WebMediaStreamSource::TypeVideo,
262 blink::WebString::fromUTF8("video_track"), 261 blink::WebString::fromUTF8("video_track"),
263 false /* remote */, true /* readonly */); 262 false /* remote */, true /* readonly */);
264 MockMediaStreamVideoSource* native_video_source = 263 MockMediaStreamVideoSource* native_video_source =
265 new MockMediaStreamVideoSource(false); 264 new MockMediaStreamVideoSource(false);
266 video_source.setExtraData(native_video_source); 265 video_source.setExtraData(native_video_source);
267 266
268 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks( 267 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks(
269 static_cast<size_t>(1)); 268 static_cast<size_t>(1));
270 audio_tracks[0].initialize(audio_source.id(), audio_source); 269 audio_tracks[0].initialize(audio_source.id(), audio_source);
271 StreamDeviceInfo device_info(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock device",
272 "mock_device_id");
273 MockMediaConstraintFactory constraint_factory;
274 const blink::WebMediaConstraints constraints =
275 constraint_factory.CreateWebMediaConstraints();
276 scoped_refptr<WebRtcAudioCapturer> capturer(
277 WebRtcAudioCapturer::CreateCapturer(-1, device_info, constraints,
278 nullptr, nullptr));
279 scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter( 270 scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter(
280 WebRtcLocalAudioTrackAdapter::Create(audio_track_label, nullptr)); 271 WebRtcLocalAudioTrackAdapter::Create(audio_track_label, nullptr));
281 scoped_ptr<WebRtcLocalAudioTrack> native_track( 272 scoped_ptr<WebRtcLocalAudioTrack> native_track(
282 new WebRtcLocalAudioTrack(adapter.get(), capturer, nullptr)); 273 new WebRtcLocalAudioTrack(adapter.get()));
283 audio_tracks[0].setExtraData(native_track.release()); 274 audio_tracks[0].setExtraData(native_track.release());
284 blink::WebVector<blink::WebMediaStreamTrack> video_tracks( 275 blink::WebVector<blink::WebMediaStreamTrack> video_tracks(
285 static_cast<size_t>(1)); 276 static_cast<size_t>(1));
286 blink::WebMediaConstraints video_constraints; 277 blink::WebMediaConstraints video_constraints;
287 video_constraints.initialize(); 278 video_constraints.initialize();
288 video_tracks[0] = MediaStreamVideoTrack::CreateVideoTrack( 279 video_tracks[0] = MediaStreamVideoTrack::CreateVideoTrack(
289 native_video_source, video_constraints, 280 native_video_source, video_constraints,
290 MediaStreamVideoSource::ConstraintsCallback(), true); 281 MediaStreamVideoSource::ConstraintsCallback(), true);
291 282
292 blink::WebMediaStream local_stream; 283 blink::WebMediaStream local_stream;
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 505
515 TEST_F(RTCPeerConnectionHandlerTest, addStreamWithStoppedAudioAndVideoTrack) { 506 TEST_F(RTCPeerConnectionHandlerTest, addStreamWithStoppedAudioAndVideoTrack) {
516 std::string stream_label = "local_stream"; 507 std::string stream_label = "local_stream";
517 blink::WebMediaStream local_stream( 508 blink::WebMediaStream local_stream(
518 CreateLocalMediaStream(stream_label)); 509 CreateLocalMediaStream(stream_label));
519 blink::WebMediaConstraints constraints; 510 blink::WebMediaConstraints constraints;
520 511
521 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; 512 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
522 local_stream.audioTracks(audio_tracks); 513 local_stream.audioTracks(audio_tracks);
523 MediaStreamAudioSource* native_audio_source = 514 MediaStreamAudioSource* native_audio_source =
524 static_cast<MediaStreamAudioSource*>( 515 MediaStreamAudioSource::From(audio_tracks[0].source());
525 audio_tracks[0].source().getExtraData());
526 native_audio_source->StopSource(); 516 native_audio_source->StopSource();
527 517
528 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; 518 blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
529 local_stream.videoTracks(video_tracks); 519 local_stream.videoTracks(video_tracks);
530 MediaStreamVideoSource* native_video_source = 520 MediaStreamVideoSource* native_video_source =
531 static_cast<MediaStreamVideoSource*>( 521 static_cast<MediaStreamVideoSource*>(
532 video_tracks[0].source().getExtraData()); 522 video_tracks[0].source().getExtraData());
533 native_video_source->StopSource(); 523 native_video_source->StopSource();
534 524
535 EXPECT_TRUE(pc_handler_->addStream(local_stream, constraints)); 525 EXPECT_TRUE(pc_handler_->addStream(local_stream, constraints));
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 EXPECT_CALL(*mock_tracker_.get(), 1028 EXPECT_CALL(*mock_tracker_.get(),
1039 TrackCreateDTMFSender(pc_handler_.get(), 1029 TrackCreateDTMFSender(pc_handler_.get(),
1040 testing::Ref(tracks[0]))); 1030 testing::Ref(tracks[0])));
1041 1031
1042 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( 1032 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender(
1043 pc_handler_->createDTMFSender(tracks[0])); 1033 pc_handler_->createDTMFSender(tracks[0]));
1044 EXPECT_TRUE(sender.get()); 1034 EXPECT_TRUE(sender.get());
1045 } 1035 }
1046 1036
1047 } // namespace content 1037 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | content/renderer/media/speech_recognition_audio_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698