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

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

Issue 11783059: Ensures that WebRTC works for device selection using a different sample rate than default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix after review from Chris Created 7 years, 11 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_extra_data.h" 7 #include "content/renderer/media/media_stream_extra_data.h"
8 #include "content/renderer/media/media_stream_source_extra_data.h" 8 #include "content/renderer/media/media_stream_source_extra_data.h"
9 #include "content/renderer/media/mock_media_stream_dependency_factory.h" 9 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
10 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h" 10 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 bool video) { 53 bool video) {
54 WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources( 54 WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources(
55 audio ? static_cast<size_t>(1) : 0); 55 audio ? static_cast<size_t>(1) : 0);
56 WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources( 56 WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources(
57 video ? static_cast<size_t>(1) : 0); 57 video ? static_cast<size_t>(1) : 0);
58 58
59 if (audio) { 59 if (audio) {
60 StreamDeviceInfo info; 60 StreamDeviceInfo info;
61 info.device.type = content::MEDIA_DEVICE_AUDIO_CAPTURE; 61 info.device.type = content::MEDIA_DEVICE_AUDIO_CAPTURE;
62 info.device.name = "audio"; 62 info.device.name = "audio";
63 info.device.sample_rate = 0;
64 info.device.channel_layout = 0;
63 info.session_id = 99; 65 info.session_id = 99;
64 audio_sources[0].initialize("audio", 66 audio_sources[0].initialize("audio",
65 WebKit::WebMediaStreamSource::TypeAudio, 67 WebKit::WebMediaStreamSource::TypeAudio,
66 "audio"); 68 "audio");
67 audio_sources[0].setExtraData( 69 audio_sources[0].setExtraData(
68 new MediaStreamSourceExtraData(info)); 70 new MediaStreamSourceExtraData(info));
69 } 71 }
70 if (video) { 72 if (video) {
71 StreamDeviceInfo info; 73 StreamDeviceInfo info;
72 info.device.type = content::MEDIA_DEVICE_VIDEO_CAPTURE; 74 info.device.type = content::MEDIA_DEVICE_VIDEO_CAPTURE;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 EXPECT_TRUE(dependency_factory_->EnsurePeerConnectionFactory()); 152 EXPECT_TRUE(dependency_factory_->EnsurePeerConnectionFactory());
151 dependency_factory_->CreateNativeLocalMediaStream(&stream_desc); 153 dependency_factory_->CreateNativeLocalMediaStream(&stream_desc);
152 MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>( 154 MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>(
153 stream_desc.extraData()); 155 stream_desc.extraData());
154 ASSERT_TRUE(extra_data && extra_data->local_stream()); 156 ASSERT_TRUE(extra_data && extra_data->local_stream());
155 EXPECT_EQ(0u, extra_data->local_stream()->video_tracks()->count()); 157 EXPECT_EQ(0u, extra_data->local_stream()->video_tracks()->count());
156 EXPECT_EQ(0u, extra_data->local_stream()->audio_tracks()->count()); 158 EXPECT_EQ(0u, extra_data->local_stream()->audio_tracks()->count());
157 } 159 }
158 160
159 } // namespace content 161 } // 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