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

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

Issue 2425703002: Remove |remote| and |readonly| members of MediaStreamTrack (Closed)
Patch Set: Fixed webkit_tests Created 3 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/webrtc_media_stream_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 29 matching lines...) Expand all
40 void TearDown() override { 40 void TearDown() override {
41 adapter_.reset(); 41 adapter_.reset();
42 blink::WebHeap::collectAllGarbageForTesting(); 42 blink::WebHeap::collectAllGarbageForTesting();
43 } 43 }
44 44
45 blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) { 45 blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) {
46 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector( 46 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector(
47 audio ? static_cast<size_t>(1) : 0); 47 audio ? static_cast<size_t>(1) : 0);
48 if (audio) { 48 if (audio) {
49 blink::WebMediaStreamSource audio_source; 49 blink::WebMediaStreamSource audio_source;
50 audio_source.initialize("audio", 50 audio_source.initialize("audio", blink::WebMediaStreamSource::TypeAudio,
51 blink::WebMediaStreamSource::TypeAudio, 51 "audio");
52 "audio",
53 false /* remote */);
54 ProcessedLocalAudioSource* const source = new ProcessedLocalAudioSource( 52 ProcessedLocalAudioSource* const source = new ProcessedLocalAudioSource(
55 -1 /* consumer_render_frame_id is N/A for non-browser tests */, 53 -1 /* consumer_render_frame_id is N/A for non-browser tests */,
56 StreamDeviceInfo(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device", 54 StreamDeviceInfo(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device",
57 "mock_audio_device_id", 55 "mock_audio_device_id",
58 media::AudioParameters::kAudioCDSampleRate, 56 media::AudioParameters::kAudioCDSampleRate,
59 media::CHANNEL_LAYOUT_STEREO, 57 media::CHANNEL_LAYOUT_STEREO,
60 media::AudioParameters::kAudioCDSampleRate / 50), 58 media::AudioParameters::kAudioCDSampleRate / 50),
61 MockConstraintFactory().CreateWebMediaConstraints(), 59 MockConstraintFactory().CreateWebMediaConstraints(),
62 base::Bind(&WebRtcMediaStreamAdapterTest::OnAudioSourceStarted), 60 base::Bind(&WebRtcMediaStreamAdapterTest::OnAudioSourceStarted),
63 dependency_factory_.get()); 61 dependency_factory_.get());
64 source->SetAllowInvalidRenderFrameIdForTesting(true); 62 source->SetAllowInvalidRenderFrameIdForTesting(true);
65 audio_source.setExtraData(source); // Takes ownership. 63 audio_source.setExtraData(source); // Takes ownership.
66 audio_track_vector[0].initialize(audio_source); 64 audio_track_vector[0].initialize(audio_source);
67 EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(), 65 EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(),
68 Initialize(_, _, -1)); 66 Initialize(_, _, -1));
69 EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(), 67 EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(),
70 SetAutomaticGainControl(true)); 68 SetAutomaticGainControl(true));
71 EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(), Start()); 69 EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(), Start());
72 EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(), Stop()); 70 EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(), Stop());
73 CHECK(source->ConnectToTrack(audio_track_vector[0])); 71 CHECK(source->ConnectToTrack(audio_track_vector[0]));
74 } 72 }
75 73
76 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( 74 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector(
77 video ? static_cast<size_t>(1) : 0); 75 video ? static_cast<size_t>(1) : 0);
78 MediaStreamSource::SourceStoppedCallback dummy_callback; 76 MediaStreamSource::SourceStoppedCallback dummy_callback;
79 if (video) { 77 if (video) {
80 blink::WebMediaStreamSource video_source; 78 blink::WebMediaStreamSource video_source;
81 video_source.initialize("video", 79 video_source.initialize("video", blink::WebMediaStreamSource::TypeVideo,
82 blink::WebMediaStreamSource::TypeVideo, 80 "video");
83 "video",
84 false /* remote */);
85 MediaStreamVideoSource* native_source = 81 MediaStreamVideoSource* native_source =
86 new MockMediaStreamVideoSource(false); 82 new MockMediaStreamVideoSource(false);
87 video_source.setExtraData(native_source); 83 video_source.setExtraData(native_source);
88 blink::WebMediaConstraints constraints; 84 blink::WebMediaConstraints constraints;
89 constraints.initialize(); 85 constraints.initialize();
90 video_track_vector[0] = MediaStreamVideoTrack::CreateVideoTrack( 86 video_track_vector[0] = MediaStreamVideoTrack::CreateVideoTrack(
91 native_source, constraints, 87 native_source, constraints,
92 MediaStreamVideoSource::ConstraintsCallback(), true); 88 MediaStreamVideoSource::ConstraintsCallback(), true);
93 } 89 }
94 90
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 } 132 }
137 133
138 // Test that we don't crash if a MediaStream is created in Blink with an unknown 134 // Test that we don't crash if a MediaStream is created in Blink with an unknown
139 // audio sources. This can happen if a MediaStream is created with 135 // audio sources. This can happen if a MediaStream is created with
140 // remote audio track. 136 // remote audio track.
141 TEST_F(WebRtcMediaStreamAdapterTest, 137 TEST_F(WebRtcMediaStreamAdapterTest,
142 CreateWebRtcMediaStreamWithoutAudioSource) { 138 CreateWebRtcMediaStreamWithoutAudioSource) {
143 // Create a blink MediaStream description. 139 // Create a blink MediaStream description.
144 blink::WebMediaStreamSource audio_source; 140 blink::WebMediaStreamSource audio_source;
145 audio_source.initialize("audio source", 141 audio_source.initialize("audio source",
146 blink::WebMediaStreamSource::TypeAudio, 142 blink::WebMediaStreamSource::TypeAudio, "something");
147 "something",
148 false /* remote */);
149 143
150 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks( 144 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks(
151 static_cast<size_t>(1)); 145 static_cast<size_t>(1));
152 audio_tracks[0].initialize(audio_source.id(), audio_source); 146 audio_tracks[0].initialize(audio_source.id(), audio_source);
153 blink::WebVector<blink::WebMediaStreamTrack> video_tracks( 147 blink::WebVector<blink::WebMediaStreamTrack> video_tracks(
154 static_cast<size_t>(0)); 148 static_cast<size_t>(0));
155 149
156 blink::WebMediaStream blink_stream; 150 blink::WebMediaStream blink_stream;
157 blink_stream.initialize("new stream", audio_tracks, video_tracks); 151 blink_stream.initialize("new stream", audio_tracks, video_tracks);
158 blink_stream.setExtraData(new content::MediaStream()); 152 blink_stream.setExtraData(new content::MediaStream());
(...skipping 19 matching lines...) Expand all
178 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); 172 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());
179 173
180 native_stream->AddTrack(audio_tracks[0]); 174 native_stream->AddTrack(audio_tracks[0]);
181 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); 175 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());
182 176
183 native_stream->AddTrack(video_tracks[0]); 177 native_stream->AddTrack(video_tracks[0]);
184 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); 178 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());
185 } 179 }
186 180
187 } // namespace content 181 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698