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

Unified Diff: content/browser/media/audio_output_impl.cc

Issue 1930393002: Switch stream creation and closing in Chrome audio rendering from IPC to Mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/browser/media/audio_output_impl.cc
diff --git a/content/browser/media/audio_output_impl.cc b/content/browser/media/audio_output_impl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..60b6a4a4e33601eb0aab99bdc4efcc8d07ee23f8
--- /dev/null
+++ b/content/browser/media/audio_output_impl.cc
@@ -0,0 +1,222 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
+#include "base/memory/shared_memory.h"
+#include "content/browser/media/audio_output_impl.h"
+#include "content/browser/media/audio_output_stream_impl.h"
+#include "content/public/browser/render_frame_host.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/public/cpp/system/handle.h"
+
+namespace content {
+
+namespace {
+base::SyncSocket::TransitDescriptor DuplicateSocket(
+ base::SyncSocket::TransitDescriptor socket_descriptor) {
+ base::SyncSocket::TransitDescriptor socket_descriptor_dup;
+
+#if defined(OS_WIN)
+ socket_descriptor_dup = 0;
+ if (!::DuplicateHandle(GetCurrentProcess(), // hSourceProcessHandle
+ socket_descriptor,
+ GetCurrentProcess(), // hTargetProcessHandle
+ &socket_descriptor_dup,
+ 0, // dwDesiredAccess ignored due to SAME_ACCESS
+ FALSE, // !bInheritHandle
+ DUPLICATE_SAME_ACCESS)) {
+ LOG(ERROR) << "Unable to duplicate socket handle.";
+ }
+
+#else
+ socket_descriptor_dup.fd = dup(socket_descriptor.fd);
+#endif
+ return socket_descriptor_dup;
+}
+}
+
+AudioOutputImpl::AudioOutputImpl(RenderProcessHost* process,
+ int render_frame_id,
+ media::mojom::AudioOutputRequest request)
+ : process_(process), render_frame_id_(render_frame_id), binding_(this) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ binding_.Bind(std::move(request));
+ binding_.set_connection_error_handler(base::Bind(
+ &AudioOutputImpl::Disconnect, process->GetID(), render_frame_id));
+
+ LOG(ERROR) << "AudioOutputImpl";
+}
+
+AudioOutputImpl::~AudioOutputImpl() {
+ Disconnect(render_frame_id_, render_frame_id_);
+ for (auto it = create_stream_callbacks_.begin();
+ it != create_stream_callbacks_.end(); ++it)
+ it->second.reset();
+ create_stream_callbacks_.clear();
+ LOG(ERROR) << "~AudioOutputImpl";
+}
+
+// static
+void AudioOutputImpl::CreateService(RenderProcessHost* process,
+ int render_frame_id,
+ media::mojom::AudioOutputRequest request) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ base::Bind(&AudioOutputImpl::CreateServiceOnIOThread, process,
+ render_frame_id, base::Passed(&request)));
+}
+
+// static
+void AudioOutputImpl::CreateServiceOnIOThread(
+ RenderProcessHost* process,
+ int render_frame_id,
+ media::mojom::AudioOutputRequest request) {
+ if (request.is_pending()) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ }
+
+ new AudioOutputImpl(process, render_frame_id, std::move(request));
+}
+
+void AudioOutputImpl::CreateStream(int stream_id,
+ const media::AudioParameters& params,
+ const CreateStreamCallback& callback) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+ create_stream_callbacks_.insert(std::make_pair(stream_id, callback));
+ process_->audio_renderer_host()->CreateStream(stream_id, render_frame_id_,
+ params, this);
+}
+
+void AudioOutputImpl::StreamFactory(
+ int stream_id,
+ base::SharedMemory* shared_memory,
+ base::SyncSocket::TransitDescriptor socket_descriptor) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+ auto callback = create_stream_callbacks_.find(stream_id);
+ if (callback == create_stream_callbacks_.end()) {
+ return;
+ }
+
+ media::mojom::AudioOutputStreamPtr stream_ptr =
+ media::mojom::AudioOutputStreamPtr();
+ std::unique_ptr<AudioOutputStreamImpl> stream(new AudioOutputStreamImpl(
+ stream_id, render_frame_id_, this, mojo::GetProxy(&stream_ptr)));
+
+ DCHECK(stream_impls_.insert(std::make_pair(stream_id, std::move(stream)))
+ .second);
+
+ base::SharedMemoryHandle shared_memory_handle =
+ base::SharedMemory::DuplicateHandle(shared_memory->handle());
+
+ MojoHandle mojo_foreign_memory_handle;
+
+ MojoResult shared_buffer_result = mojo::edk::CreateSharedBufferWrapper(
+ shared_memory_handle, shared_memory->requested_size(), false,
+ &mojo_foreign_memory_handle);
+
+ if (shared_buffer_result != MOJO_RESULT_OK) {
+ DLOG(WARNING) << "Failed to wrap transit descriptor. Closing: "
+ << shared_buffer_result;
+ ReportErrorAndCloseStream(stream_id);
+ return;
+ }
+
+ mojo::ScopedSharedBufferHandle shared_buffer_handle =
+ mojo::ScopedSharedBufferHandle(
+ mojo::SharedBufferHandle(mojo_foreign_memory_handle));
+
+ MojoHandle socket_descriptor_handle;
+ MojoResult platform_handle_result;
+
+ // The socket handle is going to be closed when |mojo_application_host_| is
+ // reset. The renderer is going to need to close the socket handle
+ // too when the output steam is closed. This is going to cause an issue
+ // because both of them are going to close the same socket handle.
+ // This is why a duplicate of the socket handler is going to be created,
+ // stored in |socket_descriptor_dup| and sent through Mojo to the renderer so
+ // it can be used by AudioOutputIPCDelegate.
+
+ base::SyncSocket::TransitDescriptor socket_descriptor_dup =
+ DuplicateSocket(socket_descriptor);
+#if defined(OS_WIN)
+ platform_handle_result = mojo::edk::CreatePlatformHandleWrapper(
+ mojo::edk::ScopedPlatformHandle(
+ mojo::edk::PlatformHandle(socket_descriptor_dup),
+ &socket_descriptor_handle);
+#else
+ platform_handle_result = mojo::edk::CreatePlatformHandleWrapper(
+ mojo::edk::ScopedPlatformHandle(
+ mojo::edk::PlatformHandle(socket_descriptor_dup.fd)),
+ &socket_descriptor_handle);
+#endif
+
+ if (platform_handle_result != MOJO_RESULT_OK) {
+ DLOG(WARNING) << "Failed to wrap platform handle. Closing: "
+ << platform_handle_result;
+ ReportErrorAndCloseStream(stream_id);
+ return;
+ }
+
+ mojo::ScopedHandle socket_handle =
+ mojo::ScopedHandle(mojo::Handle(socket_descriptor_handle));
+ callback->second.Run(
+ stream_id, std::move(stream_ptr),
+ std::move(shared_buffer_handle), std::move(socket_handle));
+
+ callback->second.reset();
+ create_stream_callbacks_.erase(stream_id);
+}
+
+bool AudioOutputImpl::CloseStream(int stream_id) {
+ process_->audio_renderer_host()->CloseStream(stream_id);
+
+ auto stream = stream_impls_.find(stream_id);
+ if (stream == stream_impls_.end()) {
+ return false;
+ }
+ stream_impls_.erase(stream_id);
+
+ auto callback = create_stream_callbacks_.find(stream_id);
+
+ if (callback != create_stream_callbacks_.end()) {
+ callback->second.reset();
+ create_stream_callbacks_.erase(stream_id);
+ }
+ return true;
+}
+
+// static
+void AudioOutputImpl::Disconnect(int process_id, int render_frame_id) {
+ LOG(ERROR) << "Disconnect";
+}
+
+void AudioOutputImpl::ReportErrorAndCloseStream(int stream_id) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+ // Make sure this isn't a stray callback executing after the stream has been
+ // closed, so error notifications aren't sent after clients believe the stream
+ // is closed.
+ auto callback = create_stream_callbacks_.find(stream_id);
+
+ mojo::ScopedSharedBufferHandle shared_buffer_handle =
+ mojo::ScopedSharedBufferHandle(mojo::SharedBufferHandle());
+
+ mojo::ScopedHandle socket_handle = mojo::ScopedHandle(mojo::Handle());
+
+ callback->second.Run(stream_id, media::mojom::AudioOutputStreamPtr(),
+ std::move(shared_buffer_handle),
+ std::move(socket_handle));
+
+ process_->audio_renderer_host()->get_audio_log()->OnError(stream_id);
+ CloseStream(stream_id);
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698