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

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

Issue 1780653002: Revert of MediaStream audio object graph untangling and clean-ups. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/child/child_process.h" 9 #include "content/child/child_process.h"
10 #include "content/renderer/media/media_stream.h" 10 #include "content/renderer/media/media_stream.h"
11 #include "content/renderer/media/media_stream_audio_source.h" 11 #include "content/renderer/media/media_stream_audio_source.h"
12 #include "content/renderer/media/media_stream_video_source.h" 12 #include "content/renderer/media/media_stream_video_source.h"
13 #include "content/renderer/media/media_stream_video_track.h" 13 #include "content/renderer/media/media_stream_video_track.h"
14 #include "content/renderer/media/mock_media_constraint_factory.h"
14 #include "content/renderer/media/mock_media_stream_video_source.h" 15 #include "content/renderer/media/mock_media_stream_video_source.h"
15 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h" 16 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h"
16 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h" 17 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
17 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h" 18 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
18 #include "content/renderer/media/webrtc_local_audio_track.h" 19 #include "content/renderer/media/webrtc_local_audio_track.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
20 #include "third_party/WebKit/public/platform/WebMediaStream.h" 21 #include "third_party/WebKit/public/platform/WebMediaStream.h"
21 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 22 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
22 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 23 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
23 #include "third_party/WebKit/public/platform/WebVector.h" 24 #include "third_party/WebKit/public/platform/WebVector.h"
(...skipping 18 matching lines...) Expand all
42 audio ? static_cast<size_t>(1) : 0); 43 audio ? static_cast<size_t>(1) : 0);
43 if (audio) { 44 if (audio) {
44 blink::WebMediaStreamSource audio_source; 45 blink::WebMediaStreamSource audio_source;
45 audio_source.initialize("audio", 46 audio_source.initialize("audio",
46 blink::WebMediaStreamSource::TypeAudio, 47 blink::WebMediaStreamSource::TypeAudio,
47 "audio", 48 "audio",
48 false /* remote */, true /* readonly */); 49 false /* remote */, true /* readonly */);
49 audio_source.setExtraData(new MediaStreamAudioSource()); 50 audio_source.setExtraData(new MediaStreamAudioSource());
50 51
51 audio_track_vector[0].initialize(audio_source); 52 audio_track_vector[0].initialize(audio_source);
53 StreamDeviceInfo device_info(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock device",
54 "mock_device_id");
55 MockMediaConstraintFactory constraint_factory;
56 const blink::WebMediaConstraints constraints =
57 constraint_factory.CreateWebMediaConstraints();
58 scoped_refptr<WebRtcAudioCapturer> capturer(
59 WebRtcAudioCapturer::CreateCapturer(-1, device_info, constraints,
60 nullptr, nullptr));
52 scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter( 61 scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter(
53 WebRtcLocalAudioTrackAdapter::Create( 62 WebRtcLocalAudioTrackAdapter::Create(
54 audio_track_vector[0].id().utf8(), nullptr)); 63 audio_track_vector[0].id().utf8(), nullptr));
55 scoped_ptr<WebRtcLocalAudioTrack> native_track( 64 scoped_ptr<WebRtcLocalAudioTrack> native_track(
56 new WebRtcLocalAudioTrack(adapter.get())); 65 new WebRtcLocalAudioTrack(adapter.get(), capturer, nullptr));
57 audio_track_vector[0].setExtraData(native_track.release()); 66 audio_track_vector[0].setExtraData(native_track.release());
58 } 67 }
59 68
60 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( 69 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector(
61 video ? static_cast<size_t>(1) : 0); 70 video ? static_cast<size_t>(1) : 0);
62 MediaStreamSource::SourceStoppedCallback dummy_callback; 71 MediaStreamSource::SourceStoppedCallback dummy_callback;
63 if (video) { 72 if (video) {
64 blink::WebMediaStreamSource video_source; 73 blink::WebMediaStreamSource video_source;
65 video_source.initialize("video", 74 video_source.initialize("video",
66 blink::WebMediaStreamSource::TypeVideo, 75 blink::WebMediaStreamSource::TypeVideo,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); 166 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());
158 167
159 native_stream->AddTrack(audio_tracks[0]); 168 native_stream->AddTrack(audio_tracks[0]);
160 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); 169 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());
161 170
162 native_stream->AddTrack(video_tracks[0]); 171 native_stream->AddTrack(video_tracks[0]);
163 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); 172 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());
164 } 173 }
165 174
166 } // namespace content 175 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc/webrtc_media_stream_adapter.cc ('k') | content/renderer/media/webrtc_audio_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698