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

Side by Side Diff: content/renderer/media/mock_media_stream_registry.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/mock_media_stream_registry.h" 5 #include "content/renderer/media/mock_media_stream_registry.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.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_track.h" 12 #include "content/renderer/media/media_stream_video_track.h"
13 #include "content/renderer/media/mock_media_constraint_factory.h"
13 #include "content/renderer/media/mock_media_stream_video_source.h" 14 #include "content/renderer/media/mock_media_stream_video_source.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_local_audio_track.h" 16 #include "content/renderer/media/webrtc_local_audio_track.h"
16 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 17 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
17 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 18 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
18 #include "third_party/WebKit/public/platform/WebString.h" 19 #include "third_party/WebKit/public/platform/WebString.h"
19 #include "third_party/WebKit/public/platform/WebVector.h" 20 #include "third_party/WebKit/public/platform/WebVector.h"
20 21
21 namespace content { 22 namespace content {
22 23
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 56 }
56 57
57 void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) { 58 void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) {
58 blink::WebMediaStreamSource audio_source; 59 blink::WebMediaStreamSource audio_source;
59 audio_source.initialize( 60 audio_source.initialize(
60 "mock audio source id", blink::WebMediaStreamSource::TypeAudio, 61 "mock audio source id", blink::WebMediaStreamSource::TypeAudio,
61 "mock audio source name", false /* remote */, true /* readonly */); 62 "mock audio source name", false /* remote */, true /* readonly */);
62 audio_source.setExtraData(new MediaStreamAudioSource()); 63 audio_source.setExtraData(new MediaStreamAudioSource());
63 blink::WebMediaStreamTrack blink_track; 64 blink::WebMediaStreamTrack blink_track;
64 blink_track.initialize(audio_source); 65 blink_track.initialize(audio_source);
66 const StreamDeviceInfo device_info(
67 MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device", "mock_audio_device_id");
68 const MockMediaConstraintFactory constraint_factory;
69 const blink::WebMediaConstraints constraints =
70 constraint_factory.CreateWebMediaConstraints();
71 const scoped_refptr<WebRtcAudioCapturer> capturer(
72 WebRtcAudioCapturer::CreateCapturer(-1, /* render frame id */
73 device_info, constraints,
74 nullptr, /* audio device */
75 nullptr /* audio source */));
65 const scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter( 76 const scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter(
66 WebRtcLocalAudioTrackAdapter::Create(track_id, 77 WebRtcLocalAudioTrackAdapter::Create(track_id,
67 nullptr /* track source */)); 78 nullptr /* track source */));
68 scoped_ptr<WebRtcLocalAudioTrack> native_track( 79 scoped_ptr<WebRtcLocalAudioTrack> native_track(new WebRtcLocalAudioTrack(
69 new WebRtcLocalAudioTrack(adapter.get())); 80 adapter.get(), capturer, nullptr /* webaudio source */));
70 blink_track.setExtraData(native_track.release()); 81 blink_track.setExtraData(native_track.release());
71 test_stream_.addTrack(blink_track); 82 test_stream_.addTrack(blink_track);
72 } 83 }
73 84
74 blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream( 85 blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream(
75 const std::string& url) { 86 const std::string& url) {
76 return (url != stream_url_) ? blink::WebMediaStream() : test_stream_; 87 return (url != stream_url_) ? blink::WebMediaStream() : test_stream_;
77 } 88 }
78 89
79 } // namespace content 90 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_renderer_factory_impl.cc ('k') | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698