Add audio_device_id in mojo media ServiceFactory CreateRenderer api.

media/mojo/services/service_factory_impl.cc

 // Copyright 2015 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/services/service_factory_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
+#include "media/audio/audio_device_description.h"
 #include "media/base/media_log.h"
 #include "media/mojo/services/mojo_media_client.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 
 #if defined(ENABLE_MOJO_AUDIO_DECODER)
 #include "media/mojo/services/mojo_audio_decoder_service.h"
 #endif  // defined(ENABLE_MOJO_AUDIO_DECODER)
 
 #if defined(ENABLE_MOJO_VIDEO_DECODER)
 #include "media/mojo/services/mojo_video_decoder_service.h"
@@ skipping 55 matching lines @@
 }
 
 void ServiceFactoryImpl::CreateVideoDecoder(
     mojom::VideoDecoderRequest request) {
 #if defined(ENABLE_MOJO_VIDEO_DECODER)
   new MojoVideoDecoderService(std::move(request), mojo_media_client_);
 #endif  // defined(ENABLE_MOJO_VIDEO_DECODER)
 }
 
 void ServiceFactoryImpl::CreateRenderer(
-    mojo::InterfaceRequest<mojom::Renderer> request) {
+    mojo::InterfaceRequest<mojom::Renderer> request,
+    const mojo::String& audio_device_id) {
 #if defined(ENABLE_MOJO_RENDERER)
   // The created object is owned by the pipe.
   // The audio and video sinks are owned by the client.
+  std::string device_id = audio_device_id.get();

[alokp, 2016/06/02 04:47:55]

nit: device_id = audio_device_id.is_null() ?
AudioDeviceDescription::kDefaultDeviceId : audio_device_id.get();

[tianyuwang1, 2016/06/02 05:18:39]

Done.

+  if (audio_device_id.is_null())
+    device_id = AudioDeviceDescription::kDefaultDeviceId;
+
   scoped_refptr<base::SingleThreadTaskRunner> task_runner(
       base::MessageLoop::current()->task_runner());
-  AudioRendererSink* audio_renderer_sink =
-      mojo_media_client_->CreateAudioRendererSink();
-  VideoRendererSink* video_renderer_sink =
-      mojo_media_client_->CreateVideoRendererSink(task_runner);
 
-  RendererFactory* renderer_factory = GetRendererFactory();
-  if (!renderer_factory)
-    return;
-
-  std::unique_ptr<Renderer> renderer = renderer_factory->CreateRenderer(
-      task_runner, task_runner, audio_renderer_sink, video_renderer_sink,
-      RequestSurfaceCB());
+  std::unique_ptr<Renderer> renderer =
+      mojo_media_client_->CreateRenderer(task_runner, media_log_, device_id);
   if (!renderer) {
     LOG(ERROR) << "Renderer creation failed.";
     return;
   }
 
   new MojoRendererService(cdm_service_context_.GetWeakPtr(),
                           std::move(renderer), std::move(request));
 #endif  // defined(ENABLE_MOJO_RENDERER)
 }
 
 void ServiceFactoryImpl::CreateCdm(
     mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) {
 #if defined(ENABLE_MOJO_CDM)
   CdmFactory* cdm_factory = GetCdmFactory();
   if (!cdm_factory)
     return;
 
   // The created object is owned by the pipe.
   new MojoCdmService(cdm_service_context_.GetWeakPtr(), cdm_factory,
                      std::move(request));
 #endif  // defined(ENABLE_MOJO_CDM)
 }
 
-#if defined(ENABLE_MOJO_RENDERER)
-RendererFactory* ServiceFactoryImpl::GetRendererFactory() {
-  if (!renderer_factory_) {
-    renderer_factory_ = mojo_media_client_->CreateRendererFactory(media_log_);
-    LOG_IF(ERROR, !renderer_factory_) << "RendererFactory not available.";
-  }
-  return renderer_factory_.get();
-}
-#endif  // defined(ENABLE_MOJO_RENDERER)
-
 #if defined(ENABLE_MOJO_CDM)
 CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
   if (!cdm_factory_) {
     cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_);
     LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available.";
   }
   return cdm_factory_.get();
 }
 #endif  // defined(ENABLE_MOJO_CDM)
 
 }  // namespace media