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

Unified Diff: media/audio/audio_output_device.cc

Issue 1856673002: Mojofication of the Chrome Audio Rendering Prototype Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « media/audio/audio_output_device.h ('k') | media/audio/audio_output_ipc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_device.cc
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index 1468123ac4510765a53fa0547480de1ab40a483e..e2e5efdea3a02a1b5a8800cca9b6c4efd5ad27c2 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -16,6 +16,9 @@
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
+#include "content/browser/media/audio_output_impl.h"
+#include "content/browser/mojo/mojo_application_host.h"
+#include "content/renderer/media/audio_output_client.h"
#include "media/audio/audio_output_controller.h"
#include "media/base/limits.h"
@@ -310,6 +313,7 @@ void AudioOutputDevice::OnDeviceAuthorized(
}
void AudioOutputDevice::OnStreamCreated(
+ content::mojom::AudioOutputStreamPtr* stream,
base::SharedMemoryHandle handle,
base::SyncSocket::Handle socket_handle,
int length) {
@@ -322,6 +326,8 @@ void AudioOutputDevice::OnStreamCreated(
#endif
DCHECK_GT(length, 0);
+ stream_ = stream;
+
if (state_ != CREATING_STREAM)
return;
@@ -370,6 +376,9 @@ void AudioOutputDevice::WillDestroyCurrentMessageLoop() {
ShutDownOnIOThread();
}
+AudioOutputIPC* AudioOutputDevice::getIPC() {
+ return ipc_.get();
+}
// AudioOutputDevice::AudioThreadCallback
AudioOutputDevice::AudioThreadCallback::AudioThreadCallback(
« no previous file with comments | « media/audio/audio_output_device.h ('k') | media/audio/audio_output_ipc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698