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

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

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Created 6 years, 8 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "content/common/media/media_stream_options.h" 6 #include "content/common/media/media_stream_options.h"
7 #include "content/renderer/media/media_stream.h" 7 #include "content/renderer/media/media_stream.h"
8 #include "content/renderer/media/media_stream_audio_source.h" 8 #include "content/renderer/media/media_stream_audio_source.h"
9 #include "content/renderer/media/media_stream_video_source.h" 9 #include "content/renderer/media/media_stream_video_source.h"
10 #include "content/renderer/media/media_stream_video_track.h" 10 #include "content/renderer/media/media_stream_video_track.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 video_track_vector[i] = MediaStreamVideoTrack::CreateVideoTrack( 110 video_track_vector[i] = MediaStreamVideoTrack::CreateVideoTrack(
111 native_source, constraints, 111 native_source, constraints,
112 MediaStreamVideoSource::ConstraintsCallback(), true, 112 MediaStreamVideoSource::ConstraintsCallback(), true,
113 dependency_factory_.get()); 113 dependency_factory_.get());
114 } 114 }
115 115
116 stream_desc.initialize("media stream", audio_track_vector, 116 stream_desc.initialize("media stream", audio_track_vector,
117 video_track_vector); 117 video_track_vector);
118 stream_desc.setExtraData( 118 stream_desc.setExtraData(
119 new content::MediaStream(dependency_factory_.get(), 119 new content::MediaStream(dependency_factory_.get(),
120 content::MediaStream::StreamStopCallback(),
121 stream_desc)); 120 stream_desc));
122 return stream_desc; 121 return stream_desc;
123 } 122 }
124 123
125 void VerifyMediaStream(const blink::WebMediaStream& stream_desc, 124 void VerifyMediaStream(const blink::WebMediaStream& stream_desc,
126 size_t num_audio_tracks, 125 size_t num_audio_tracks,
127 size_t num_video_tracks) { 126 size_t num_video_tracks) {
128 content::MediaStream* native_stream = 127 content::MediaStream* native_stream =
129 content::MediaStream::GetMediaStream(stream_desc); 128 content::MediaStream::GetMediaStream(stream_desc);
130 ASSERT_TRUE(native_stream); 129 ASSERT_TRUE(native_stream);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 static_cast<size_t>(1)); 173 static_cast<size_t>(1));
175 audio_tracks[0].initialize(audio_source.id(), audio_source); 174 audio_tracks[0].initialize(audio_source.id(), audio_source);
176 blink::WebVector<blink::WebMediaStreamTrack> video_tracks( 175 blink::WebVector<blink::WebMediaStreamTrack> video_tracks(
177 static_cast<size_t>(1)); 176 static_cast<size_t>(1));
178 video_tracks[0].initialize(video_source.id(), video_source); 177 video_tracks[0].initialize(video_source.id(), video_source);
179 178
180 blink::WebMediaStream stream_desc; 179 blink::WebMediaStream stream_desc;
181 stream_desc.initialize("new stream", audio_tracks, video_tracks); 180 stream_desc.initialize("new stream", audio_tracks, video_tracks);
182 stream_desc.setExtraData( 181 stream_desc.setExtraData(
183 new content::MediaStream(dependency_factory_.get(), 182 new content::MediaStream(dependency_factory_.get(),
184 content::MediaStream::StreamStopCallback(),
185 stream_desc)); 183 stream_desc));
186 184
187 VerifyMediaStream(stream_desc, 0, 0); 185 VerifyMediaStream(stream_desc, 0, 0);
188 } 186 }
189 187
190 TEST_F(MediaStreamDependencyFactoryTest, AddAndRemoveNativeTrack) { 188 TEST_F(MediaStreamDependencyFactoryTest, AddAndRemoveNativeTrack) {
191 blink::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true); 189 blink::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true);
192 190
193 VerifyMediaStream(stream_desc, 1, 1); 191 VerifyMediaStream(stream_desc, 1, 1);
194 192
(...skipping 12 matching lines...) Expand all
207 EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack( 205 EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack(
208 stream_desc, video_tracks[0])); 206 stream_desc, video_tracks[0]));
209 VerifyMediaStream(stream_desc, 1, 0); 207 VerifyMediaStream(stream_desc, 1, 0);
210 208
211 EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack( 209 EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack(
212 stream_desc, video_tracks[0])); 210 stream_desc, video_tracks[0]));
213 VerifyMediaStream(stream_desc, 1, 1); 211 VerifyMediaStream(stream_desc, 1, 1);
214 } 212 }
215 213
216 } // namespace content 214 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.cc ('k') | content/renderer/media/media_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698