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

Unified Diff: content/renderer/media/audio_message_filter.cc

Issue 1896883002: Mojo interfaces needed for switching audio rendering stream creation and closing from IPC to Mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: content/renderer/media/audio_message_filter.cc
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc
index 9e7322d128e65f0d5f9507a544c8cf01943e7d16..4d034742ff9ded7f62fde7027d3f9c7c872008bf 100644
--- a/content/renderer/media/audio_message_filter.cc
+++ b/content/renderer/media/audio_message_filter.cc
@@ -10,6 +10,7 @@
#include "base/single_thread_task_runner.h"
#include "base/strings/stringprintf.h"
#include "content/common/media/audio_messages.h"
+#include "content/renderer/media/audio_output_client.h"
#include "content/renderer/media/webrtc_logging.h"
#include "content/renderer/render_thread_impl.h"
#include "ipc/ipc_logging.h"
@@ -77,6 +78,7 @@ AudioMessageFilter::AudioOutputIPCImpl::~AudioOutputIPCImpl() {}
std::unique_ptr<media::AudioOutputIPC> AudioMessageFilter::CreateAudioOutputIPC(
int render_frame_id) {
+
DCHECK_GT(render_frame_id, 0);
return std::unique_ptr<media::AudioOutputIPC>(
new AudioOutputIPCImpl(this, render_frame_id));
@@ -106,8 +108,8 @@ void AudioMessageFilter::AudioOutputIPCImpl::CreateStream(
if (stream_id_ == kStreamIDNotSet)
stream_id_ = filter_->delegates_.Add(delegate);
- filter_->Send(
- new AudioHostMsg_CreateStream(stream_id_, render_frame_id_, params));
+ filter_->audio_output_client_->CreateStream(stream_id_, render_frame_id_,
+ params);
stream_created_ = true;
}
@@ -124,7 +126,8 @@ void AudioMessageFilter::AudioOutputIPCImpl::PauseStream() {
void AudioMessageFilter::AudioOutputIPCImpl::CloseStream() {
DCHECK(filter_->io_task_runner_->BelongsToCurrentThread());
DCHECK_NE(stream_id_, kStreamIDNotSet);
- filter_->Send(new AudioHostMsg_CloseStream(stream_id_));
+ filter_->audio_output_client_->CloseStream(stream_id_);
+
filter_->delegates_.Remove(stream_id_);
stream_id_ = kStreamIDNotSet;
stream_created_ = false;
@@ -149,7 +152,6 @@ bool AudioMessageFilter::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(AudioMessageFilter, message)
IPC_MESSAGE_HANDLER(AudioMsg_NotifyDeviceAuthorized, OnDeviceAuthorized)
- IPC_MESSAGE_HANDLER(AudioMsg_NotifyStreamCreated, OnStreamCreated)
IPC_MESSAGE_HANDLER(AudioMsg_NotifyStreamStateChanged, OnStreamStateChanged)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
@@ -203,7 +205,6 @@ void AudioMessageFilter::OnStreamCreated(
base::SyncSocket::TransitDescriptor socket_descriptor,
uint32_t length) {
DCHECK(io_task_runner_->BelongsToCurrentThread());
-
WebRtcLogMessage(base::StringPrintf(
"AMF::OnStreamCreated. stream_id=%d",
stream_id));

Powered by Google App Engine
This is Rietveld 408576698