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

Unified 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: export fix 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 1d26e5940b95c7e048e0c00402c46f46e2753403..12be35938578327c7e163067acea0019854c7118 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -94,7 +94,6 @@
#include "content/renderer/internal_document_state_data.h"
#include "content/renderer/manifest/manifest_manager.h"
#include "content/renderer/media/audio_device_factory.h"
-#include "content/renderer/media/audio_renderer_mixer_manager.h"
#include "content/renderer/media/cdm/render_cdm_factory.h"
#include "content/renderer/media/media_permission_dispatcher.h"
#include "content/renderer/media/media_stream_dispatcher.h"
@@ -2451,8 +2450,9 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
RenderThreadImpl* render_thread = RenderThreadImpl::current();
scoped_refptr<media::RestartableAudioRendererSink> audio_renderer_sink =
- render_thread->GetAudioRendererMixerManager()->CreateInput(
- routing_id_, sink_id.utf8(), frame->securityOrigin());
+ AudioDeviceFactory::NewRestartableOutputDevice(
+ AudioDeviceFactory::kSourceHighLatency, routing_id_, 0,
+ sink_id.utf8(), frame->securityOrigin());
media::WebMediaPlayerParams::Context3DCB context_3d_cb =
base::Bind(&GetSharedMainThreadContext3D);
@@ -6081,12 +6081,8 @@ void RenderFrameImpl::checkIfAudioSinkExistsAndIsAuthorized(
blink::WebSetSinkIdCallbacks* web_callbacks) {
media::SwitchOutputDeviceCB callback =
media::ConvertToSwitchOutputDeviceCB(web_callbacks);
- scoped_refptr<media::AudioOutputDevice> device =
- AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
- security_origin);
- media::OutputDeviceStatus status = device->GetDeviceStatus();
- device->Stop();
- callback.Run(status);
+ callback.Run(AudioDeviceFactory::GetOutputDeviceStatus(
+ routing_id_, 0, sink_id.utf8(), security_origin));
}
blink::WebPlugin* RenderFrameImpl::GetWebPluginForFind() {

Powered by Google App Engine
This is Rietveld 408576698