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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1666363005: Switching audio clients to using RestartableAudioRendererSink interface as a sink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing RestartableAudioOutputDevice interface Created 4 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 #include "content/renderer/external_popup_menu.h" 87 #include "content/renderer/external_popup_menu.h"
88 #include "content/renderer/geolocation_dispatcher.h" 88 #include "content/renderer/geolocation_dispatcher.h"
89 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 89 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
90 #include "content/renderer/history_controller.h" 90 #include "content/renderer/history_controller.h"
91 #include "content/renderer/history_serialization.h" 91 #include "content/renderer/history_serialization.h"
92 #include "content/renderer/image_downloader/image_downloader_impl.h" 92 #include "content/renderer/image_downloader/image_downloader_impl.h"
93 #include "content/renderer/ime_event_guard.h" 93 #include "content/renderer/ime_event_guard.h"
94 #include "content/renderer/internal_document_state_data.h" 94 #include "content/renderer/internal_document_state_data.h"
95 #include "content/renderer/manifest/manifest_manager.h" 95 #include "content/renderer/manifest/manifest_manager.h"
96 #include "content/renderer/media/audio_device_factory.h" 96 #include "content/renderer/media/audio_device_factory.h"
97 #include "content/renderer/media/audio_renderer_mixer_manager.h"
98 #include "content/renderer/media/cdm/render_cdm_factory.h" 97 #include "content/renderer/media/cdm/render_cdm_factory.h"
99 #include "content/renderer/media/media_permission_dispatcher.h" 98 #include "content/renderer/media/media_permission_dispatcher.h"
100 #include "content/renderer/media/media_stream_dispatcher.h" 99 #include "content/renderer/media/media_stream_dispatcher.h"
101 #include "content/renderer/media/media_stream_renderer_factory_impl.h" 100 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
102 #include "content/renderer/media/midi_dispatcher.h" 101 #include "content/renderer/media/midi_dispatcher.h"
103 #include "content/renderer/media/render_media_log.h" 102 #include "content/renderer/media/render_media_log.h"
104 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" 103 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
104 #include "content/renderer/media/restartable_audio_output_device_factory.h"
105 #include "content/renderer/media/user_media_client_impl.h" 105 #include "content/renderer/media/user_media_client_impl.h"
106 #include "content/renderer/media/webmediaplayer_ms.h" 106 #include "content/renderer/media/webmediaplayer_ms.h"
107 #include "content/renderer/mojo/service_registry_js_wrapper.h" 107 #include "content/renderer/mojo/service_registry_js_wrapper.h"
108 #include "content/renderer/mojo_bindings_controller.h" 108 #include "content/renderer/mojo_bindings_controller.h"
109 #include "content/renderer/navigation_state_impl.h" 109 #include "content/renderer/navigation_state_impl.h"
110 #include "content/renderer/notification_permission_dispatcher.h" 110 #include "content/renderer/notification_permission_dispatcher.h"
111 #include "content/renderer/npapi/plugin_channel_host.h" 111 #include "content/renderer/npapi/plugin_channel_host.h"
112 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 112 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
113 #include "content/renderer/presentation/presentation_dispatcher.h" 113 #include "content/renderer/presentation/presentation_dispatcher.h"
114 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" 114 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
(...skipping 2329 matching lines...) Expand 10 before | Expand all | Expand 10 after
2444 2444
2445 blink::WebMediaStream web_stream( 2445 blink::WebMediaStream web_stream(
2446 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); 2446 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
2447 if (!web_stream.isNull()) 2447 if (!web_stream.isNull())
2448 return CreateWebMediaPlayerForMediaStream(client, sink_id, 2448 return CreateWebMediaPlayerForMediaStream(client, sink_id,
2449 frame->securityOrigin()); 2449 frame->securityOrigin());
2450 2450
2451 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 2451 RenderThreadImpl* render_thread = RenderThreadImpl::current();
2452 2452
2453 scoped_refptr<media::RestartableAudioRendererSink> audio_renderer_sink = 2453 scoped_refptr<media::RestartableAudioRendererSink> audio_renderer_sink =
2454 render_thread->GetAudioRendererMixerManager()->CreateInput( 2454 RestartableAudioOutputDeviceFactory::NewOutputDevice(
2455 routing_id_, sink_id.utf8(), frame->securityOrigin()); 2455 RestartableAudioOutputDeviceFactory::kSourceHighLatency, routing_id_,
2456 0, sink_id.utf8(), frame->securityOrigin());
2456 media::WebMediaPlayerParams::Context3DCB context_3d_cb = 2457 media::WebMediaPlayerParams::Context3DCB context_3d_cb =
2457 base::Bind(&GetSharedMainThreadContext3D); 2458 base::Bind(&GetSharedMainThreadContext3D);
2458 2459
2459 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog()); 2460 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog());
2460 media::WebMediaPlayerParams params( 2461 media::WebMediaPlayerParams params(
2461 base::Bind(&ContentRendererClient::DeferMediaLoad, 2462 base::Bind(&ContentRendererClient::DeferMediaLoad,
2462 base::Unretained(GetContentClient()->renderer()), 2463 base::Unretained(GetContentClient()->renderer()),
2463 static_cast<RenderFrame*>(this), 2464 static_cast<RenderFrame*>(this),
2464 GetWebMediaPlayerDelegate()->has_played_media()), 2465 GetWebMediaPlayerDelegate()->has_played_media()),
2465 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), 2466 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(),
(...skipping 3642 matching lines...) Expand 10 before | Expand all | Expand 10 after
6108 int match_count, 6109 int match_count,
6109 int ordinal, 6110 int ordinal,
6110 const WebRect& selection_rect, 6111 const WebRect& selection_rect,
6111 bool final_status_update) { 6112 bool final_status_update) {
6112 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6113 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6113 selection_rect, ordinal, 6114 selection_rect, ordinal,
6114 final_status_update)); 6115 final_status_update));
6115 } 6116 }
6116 6117
6117 } // namespace content 6118 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698