Implement MojoAudioRendererSink and use it in UtilityMojoMediaClient

media/mojo/clients/mojo_renderer.cc

 // Copyright 2014 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.
 
 #include "media/mojo/clients/mojo_renderer.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
+#include "media/base/audio_renderer_sink.h"
 #include "media/base/demuxer_stream_provider.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/renderer_client.h"
 #include "media/base/video_renderer_sink.h"
+#include "media/mojo/clients/mojo_audio_renderer_sink_impl.h"
 #include "media/mojo/clients/mojo_demuxer_stream_impl.h"
 #include "media/mojo/clients/mojo_video_renderer_sink_impl.h"
 #include "media/mojo/interfaces/video_renderer_sink.mojom.h"
 #include "media/renderers/video_overlay_factory.h"
 
 namespace media {
 
 MojoRenderer::MojoRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     std::unique_ptr<VideoOverlayFactory> video_overlay_factory,
+    AudioRendererSink* audio_renderer_sink,
     VideoRendererSink* video_renderer_sink,
     mojom::RendererPtr remote_renderer)
     : task_runner_(task_runner),
       video_overlay_factory_(std::move(video_overlay_factory)),
+      audio_renderer_sink_(audio_renderer_sink),
       video_renderer_sink_(video_renderer_sink),
       remote_renderer_info_(remote_renderer.PassInterface()),
       client_binding_(this),
       media_time_interpolator_(&media_clock_),
+      mojo_audio_renderer_sink_(nullptr),
       mojo_video_renderer_sink_(nullptr) {
   DVLOG(1) << __func__;
 }
 
 MojoRenderer::~MojoRenderer() {
   DVLOG(1) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   CancelPendingCallbacks();
 }
@@ skipping 53 matching lines @@
     video_stream_.reset(
         new MojoDemuxerStreamImpl(video, MakeRequest(&video_stream)));
     // Using base::Unretained(this) is safe because |this| owns
     // |video_stream_|, and the error handler can't be invoked once
     // |video_stream_| is destroyed.
     video_stream_->set_connection_error_handler(
         base::Bind(&MojoRenderer::OnDemuxerStreamConnectionError,
                    base::Unretained(this), DemuxerStream::VIDEO));
   }
 
+  mojom::AudioRendererSinkPtr audio_renderer_sink_ptr;
+  mojo_audio_renderer_sink_.reset(
+      new MojoAudioRendererSinkImpl(task_runner_, audio_renderer_sink_,
+                                    MakeRequest(&audio_renderer_sink_ptr)));
+  mojo_audio_renderer_sink_->set_connection_error_handler(
+      base::Bind(&MojoRenderer::OnAudioRendererSinkConnectionError,
+                 base::Unretained(this)));
+
   mojom::VideoRendererSinkPtr video_renderer_sink_ptr;
   mojo_video_renderer_sink_.reset(
       new MojoVideoRendererSinkImpl(task_runner_, video_renderer_sink_,
                                     MakeRequest(&video_renderer_sink_ptr)));
   // Using base::Unretained(this) is safe because |this| owns
   // |mojo_video_renderer_sink|, and the error handler can't be invoked once
   // |mojo_video_renderer_sink| is destroyed.
   mojo_video_renderer_sink_->set_connection_error_handler(
       base::Bind(&MojoRenderer::OnVideoRendererSinkConnectionError,
                  base::Unretained(this)));
 
   BindRemoteRendererIfNeeded();
 
   mojom::RendererClientAssociatedPtrInfo client_ptr_info;
   client_binding_.Bind(&client_ptr_info, remote_renderer_.associated_group());
 
   // Using base::Unretained(this) is safe because |this| owns
   // |remote_renderer_|, and the callback won't be dispatched if
   // |remote_renderer_| is destroyed.
   remote_renderer_->Initialize(
       std::move(client_ptr_info), std::move(audio_stream),
-      std::move(video_stream), std::move(video_renderer_sink_ptr),
-      base::nullopt, base::nullopt,
+      std::move(video_stream), std::move(audio_renderer_sink_ptr),
+      std::move(video_renderer_sink_ptr), base::nullopt, base::nullopt,
       base::Bind(&MojoRenderer::OnInitialized, base::Unretained(this), client));
 }
 
 void MojoRenderer::InitializeRendererFromUrl(media::RendererClient* client) {
   DVLOG(2) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   BindRemoteRendererIfNeeded();
 
   mojom::RendererClientAssociatedPtrInfo client_ptr_info;
   client_binding_.Bind(&client_ptr_info, remote_renderer_.associated_group());
 
   MediaUrlParams url_params = demuxer_stream_provider_->GetMediaUrlParams();
 
   // Using base::Unretained(this) is safe because |this| owns
   // |remote_renderer_|, and the callback won't be dispatched if
   // |remote_renderer_| is destroyed.
   remote_renderer_->Initialize(
       std::move(client_ptr_info), mojom::DemuxerStreamPtr(),
-      mojom::DemuxerStreamPtr(), mojom::VideoRendererSinkPtr(),
-      url_params.media_url, url_params.first_party_for_cookies,
+      mojom::DemuxerStreamPtr(), mojom::AudioRendererSinkPtr(),
+      mojom::VideoRendererSinkPtr(), url_params.media_url,
+      url_params.first_party_for_cookies,
       base::Bind(&MojoRenderer::OnInitialized, base::Unretained(this), client));
 }
 
 void MojoRenderer::SetCdm(CdmContext* cdm_context,
                           const CdmAttachedCB& cdm_attached_cb) {
   DVLOG(1) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(cdm_context);
   DCHECK(!cdm_attached_cb.is_null());
   DCHECK(cdm_attached_cb_.is_null());
@@ skipping 174 matching lines @@
 
   if (type == DemuxerStream::AUDIO) {
     audio_stream_.reset();
   } else if (type == DemuxerStream::VIDEO) {
     video_stream_.reset();
   } else {
     NOTREACHED() << "Unexpected demuxer stream type: " << type;
   }
 }
 
+void MojoRenderer::OnAudioRendererSinkConnectionError() {
+  DVLOG(1) << __func__;
+  CHECK(task_runner_->BelongsToCurrentThread());
+
+  mojo_audio_renderer_sink_.reset();
+}
+
 void MojoRenderer::OnVideoRendererSinkConnectionError() {
   DVLOG(1) << __func__;
   CHECK(task_runner_->BelongsToCurrentThread());
 
   mojo_video_renderer_sink_.reset();
 }
 
 void MojoRenderer::BindRemoteRendererIfNeeded() {
   DVLOG(2) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
@@ skipping 53 matching lines @@
     base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_INITIALIZATION_FAILED);
 
   if (!flush_cb_.is_null())
     base::ResetAndReturn(&flush_cb_).Run();
 
   if (!cdm_attached_cb_.is_null())
     base::ResetAndReturn(&cdm_attached_cb_).Run(false);
 }
 
 }  // namespace media