Commit 184873e8 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Clean up old uses of AssistantAudioDecoderFactory

This CL replaces the last use of old Mojo type of
AssistantAudioDecoderFactory interface with
mojo::Remote.

Bug: 955171
Change-Id: I16778198e4dc1b7a7693dbbc0f7b85ae4a3d6bbc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1890454Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#711712}
parent e0a1dc44
...@@ -157,8 +157,8 @@ AudioOutputProviderImpl::AudioOutputProviderImpl( ...@@ -157,8 +157,8 @@ AudioOutputProviderImpl::AudioOutputProviderImpl(
device_id_(device_id), device_id_(device_id),
media_session_(media_session) { media_session_(media_session) {
client_->RequestAudioDecoderFactory( client_->RequestAudioDecoderFactory(
mojo::MakeRequest(&audio_decoder_factory_ptr_)); audio_decoder_factory_remote_.BindNewPipeAndPassReceiver()));
audio_decoder_factory_ = audio_decoder_factory_ptr_.get(); audio_decoder_factory_ = audio_decoder_factory_remote_.get();
} }
AudioOutputProviderImpl::~AudioOutputProviderImpl() = default; AudioOutputProviderImpl::~AudioOutputProviderImpl() = default;
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "libassistant/shared/public/platform_audio_output.h" #include "libassistant/shared/public/platform_audio_output.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/audio/public/mojom/stream_factory.mojom.h" #include "services/audio/public/mojom/stream_factory.mojom.h"
namespace chromeos { namespace chromeos {
...@@ -68,7 +69,8 @@ class AudioOutputProviderImpl : public assistant_client::AudioOutputProvider { ...@@ -68,7 +69,8 @@ class AudioOutputProviderImpl : public assistant_client::AudioOutputProvider {
VolumeControlImpl volume_control_impl_; VolumeControlImpl volume_control_impl_;
scoped_refptr<base::SequencedTaskRunner> main_task_runner_; scoped_refptr<base::SequencedTaskRunner> main_task_runner_;
scoped_refptr<base::SequencedTaskRunner> background_task_runner_; scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
mojom::AssistantAudioDecoderFactoryPtr audio_decoder_factory_ptr_; mojo::Remote<mojom::AssistantAudioDecoderFactory>
audio_decoder_factory_remote_;
mojom::AssistantAudioDecoderFactory* audio_decoder_factory_; mojom::AssistantAudioDecoderFactory* audio_decoder_factory_;
std::string device_id_; std::string device_id_;
AssistantMediaSession* media_session_; AssistantMediaSession* media_session_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment