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

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

Issue 675013005: Split libjingle's signaling thread from the UI thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update tests, remove circular dependency Created 6 years, 1 month 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "content/child/child_process.h" 7 #include "content/child/child_process.h"
8 #include "content/renderer/media/media_stream.h" 8 #include "content/renderer/media/media_stream.h"
9 #include "content/renderer/media/media_stream_audio_source.h" 9 #include "content/renderer/media/media_stream_audio_source.h"
10 #include "content/renderer/media/media_stream_video_source.h" 10 #include "content/renderer/media/media_stream_video_source.h"
11 #include "content/renderer/media/media_stream_video_track.h" 11 #include "content/renderer/media/media_stream_video_track.h"
12 #include "content/renderer/media/mock_media_constraint_factory.h"
12 #include "content/renderer/media/mock_media_stream_video_source.h" 13 #include "content/renderer/media/mock_media_stream_video_source.h"
13 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h" 14 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h"
14 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h" 15 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
15 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h" 16 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
17 #include "content/renderer/media/webrtc_local_audio_track.h"
16 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
17 #include "third_party/WebKit/public/platform/WebMediaStream.h" 19 #include "third_party/WebKit/public/platform/WebMediaStream.h"
18 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 20 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
19 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 21 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
20 #include "third_party/WebKit/public/platform/WebVector.h" 22 #include "third_party/WebKit/public/platform/WebVector.h"
21 #include "third_party/WebKit/public/web/WebHeap.h" 23 #include "third_party/WebKit/public/web/WebHeap.h"
22 24
23 namespace content { 25 namespace content {
24 26
25 class WebRtcMediaStreamAdapterTest : public ::testing::Test { 27 class WebRtcMediaStreamAdapterTest : public ::testing::Test {
(...skipping 12 matching lines...) Expand all
38 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector( 40 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector(
39 audio ? static_cast<size_t>(1) : 0); 41 audio ? static_cast<size_t>(1) : 0);
40 if (audio) { 42 if (audio) {
41 blink::WebMediaStreamSource audio_source; 43 blink::WebMediaStreamSource audio_source;
42 audio_source.initialize("audio", 44 audio_source.initialize("audio",
43 blink::WebMediaStreamSource::TypeAudio, 45 blink::WebMediaStreamSource::TypeAudio,
44 "audio"); 46 "audio");
45 audio_source.setExtraData(new MediaStreamAudioSource()); 47 audio_source.setExtraData(new MediaStreamAudioSource());
46 48
47 audio_track_vector[0].initialize(audio_source); 49 audio_track_vector[0].initialize(audio_source);
48 MediaStreamTrack* native_track = 50 StreamDeviceInfo device_info(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock device",
49 new MediaStreamTrack( 51 "mock_device_id");
50 WebRtcLocalAudioTrackAdapter::Create( 52 MockMediaConstraintFactory constraint_factory;
51 audio_track_vector[0].id().utf8(), nullptr), 53 const blink::WebMediaConstraints constraints =
52 true); 54 constraint_factory.CreateWebMediaConstraints();
53 audio_track_vector[0].setExtraData(native_track); 55 scoped_refptr<WebRtcAudioCapturer> capturer(
56 WebRtcAudioCapturer::CreateCapturer(
57 -1, device_info, constraints, nullptr, nullptr));
58 scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter(
59 WebRtcLocalAudioTrackAdapter::Create(
60 audio_track_vector[0].id().utf8(), nullptr));
61 scoped_ptr<WebRtcLocalAudioTrack> native_track(
62 new WebRtcLocalAudioTrack(adapter.get(), capturer, nullptr));
63 audio_track_vector[0].setExtraData(native_track.release());
54 } 64 }
55 65
56 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( 66 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector(
57 video ? static_cast<size_t>(1) : 0); 67 video ? static_cast<size_t>(1) : 0);
58 MediaStreamSource::SourceStoppedCallback dummy_callback; 68 MediaStreamSource::SourceStoppedCallback dummy_callback;
59 if (video) { 69 if (video) {
60 blink::WebMediaStreamSource video_source; 70 blink::WebMediaStreamSource video_source;
61 video_source.initialize("video", 71 video_source.initialize("video",
62 blink::WebMediaStreamSource::TypeVideo, 72 blink::WebMediaStreamSource::TypeVideo,
63 "video"); 73 "video");
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); 162 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());
153 163
154 native_stream->AddTrack(audio_tracks[0]); 164 native_stream->AddTrack(audio_tracks[0]);
155 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); 165 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());
156 166
157 native_stream->AddTrack(video_tracks[0]); 167 native_stream->AddTrack(video_tracks[0]);
158 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); 168 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());
159 } 169 }
160 170
161 } // namespace content 171 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc ('k') | content/renderer/media/webrtc_audio_device_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698