content/renderer/media/media_stream_renderer_factory_impl.cc - Issue 2120273004: Getting rid of AudioHardwareConfig and its synchronous IPC.

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

Issue 2120273004: Getting rid of AudioHardwareConfig and its synchronous IPC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased to guidou@ changes, dropped unknown frame id and default param caching Created 4 years, 5 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

« content/browser/renderer_host/render_message_filter.cc ('K') | « content/renderer/media/audio_renderer_sink_cache_impl.cc ('k') | content/renderer/pepper/pepper_platform_audio_output.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/media_stream_renderer_factory_impl.h"	5 #include "content/renderer/media/media_stream_renderer_factory_impl.h"

6	6

7 #include "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "content/renderer/media/media_stream.h"	8 #include "content/renderer/media/media_stream.h"

9 #include "content/renderer/media/media_stream_audio_track.h"	9 #include "content/renderer/media/media_stream_audio_track.h"

10 #include "content/renderer/media/media_stream_video_renderer_sink.h"	10 #include "content/renderer/media/media_stream_video_renderer_sink.h"

11 #include "content/renderer/media/media_stream_video_track.h"	11 #include "content/renderer/media/media_stream_video_track.h"

12 #include "content/renderer/media/track_audio_renderer.h"	12 #include "content/renderer/media/track_audio_renderer.h"

13 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"	13 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"

14 #include "content/renderer/media/webrtc/peer_connection_remote_audio_source.h"	14 #include "content/renderer/media/webrtc/peer_connection_remote_audio_source.h"

15 #include "content/renderer/media/webrtc_audio_renderer.h"	15 #include "content/renderer/media/webrtc_audio_renderer.h"

16 #include "content/renderer/render_thread_impl.h"	16 #include "content/renderer/render_thread_impl.h"

17 #include "media/base/audio_hardware_config.h"

18 #include "third_party/WebKit/public/platform/WebMediaStream.h"	17 #include "third_party/WebKit/public/platform/WebMediaStream.h"

19 #include "third_party/webrtc/api/mediastreaminterface.h"	18 #include "third_party/webrtc/api/mediastreaminterface.h"

20	19

21 namespace content {	20 namespace content {

22	21

23 namespace {	22 namespace {

24	23

25 PeerConnectionDependencyFactory* GetPeerConnectionDependencyFactory() {	24 PeerConnectionDependencyFactory* GetPeerConnectionDependencyFactory() {

26 return RenderThreadImpl::current()->GetPeerConnectionDependencyFactory();	25 return RenderThreadImpl::current()->GetPeerConnectionDependencyFactory();

27 }	26 }

(...skipping 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
143 device_id, security_origin);	142 device_id, security_origin);

144	143

145 if (!audio_device->SetAudioRenderer(renderer.get()))	144 if (!audio_device->SetAudioRenderer(renderer.get()))

146 return nullptr;	145 return nullptr;

147 }	146 }

148	147

149 return renderer->CreateSharedAudioRendererProxy(web_stream);	148 return renderer->CreateSharedAudioRendererProxy(web_stream);

150 }	149 }

151	150

152 } // namespace content	151 } // namespace content

OLD	NEW