Looking up device id by session id for AudioRendererMixerInput

media/audio/audio_output_device.h

 // Copyright (c) 2012 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.
 //
 // Audio rendering unit utilizing audio output stream provided by browser
 // process through IPC.
 //
 // Relationship of classes.
 //
 //  AudioOutputController                AudioOutputDevice
@@ skipping 55 matching lines @@
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/audio/audio_device_thread.h"
 #include "media/audio/audio_output_ipc.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/scoped_task_runner_observer.h"
-#include "media/base/audio_renderer_sink.h"
+#include "media/base/audio_renderer_mixer_sink.h"
 #include "media/base/media_export.h"
 #include "media/base/output_device.h"
 
 namespace media {
 
 class MEDIA_EXPORT AudioOutputDevice
-    : NON_EXPORTED_BASE(public AudioRendererSink),
+    : NON_EXPORTED_BASE(public AudioRendererMixerSink),
       NON_EXPORTED_BASE(public AudioOutputIPCDelegate),
       NON_EXPORTED_BASE(public OutputDevice),
       NON_EXPORTED_BASE(public ScopedTaskRunnerObserver) {
  public:
   // NOTE: Clients must call Initialize() before using.
   AudioOutputDevice(
       scoped_ptr<AudioOutputIPC> ipc,
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
       int session_id,
       const std::string& device_id,
@@ skipping 13 matching lines @@
   OutputDevice* GetOutputDevice() override;
 
   // OutputDevice implementation
   AudioParameters GetOutputParameters() override;
   OutputDeviceStatus GetDeviceStatus() override;
 
   // Methods called on IO thread ----------------------------------------------
   // AudioOutputIPCDelegate methods.
   void OnStateChanged(AudioOutputIPCDelegateState state) override;
   void OnDeviceAuthorized(OutputDeviceStatus device_status,
-                          const media::AudioParameters& output_params) override;
+                          const media::AudioParameters& output_params,
+                          const std::string& matched_device_id) override;
   void OnStreamCreated(base::SharedMemoryHandle handle,
                        base::SyncSocket::Handle socket_handle,
                        int length) override;
   void OnIPCClosed() override;
 
+  std::string GetDeviceId() override;

[Henrik Grunell, 2016/03/08 21:09:57]

Add comment with description.

[o1ka, 2016/04/05 15:13:38]

Acknowledged.

+
  protected:
   // Magic required by ref_counted.h to avoid any code deleting the object
   // accidentally while there are references to it.
   friend class base::RefCountedThreadSafe<AudioOutputDevice>;
   ~AudioOutputDevice() override;
 
  private:
   // Note: The ordering of members in this enum is critical to correct behavior!
   enum State {
     IPC_CLOSED,       // No more IPCs can take place.
@@ skipping 45 matching lines @@
   bool play_on_start_;
 
   // The media session ID used to identify which input device to be started.
   // Only used by Unified IO.
   int session_id_;
 
   // ID of hardware output device to be used (provided session_id_ is zero)
   const std::string device_id_;
   const url::Origin security_origin_;
 
+  // If |device_id_| is empty and |session_id_| is not, |matched_device_id_| is
+  // received in OnDeviceAuthorized().
+  std::string matched_device_id_;
+
   // Our audio thread callback class.  See source file for details.
   class AudioThreadCallback;
 
   // In order to avoid a race between OnStreamCreated and Stop(), we use this
   // guard to control stopping and starting the audio thread.
   base::Lock audio_thread_lock_;
   AudioDeviceThread audio_thread_;
   scoped_ptr<AudioOutputDevice::AudioThreadCallback> audio_callback_;
 
   // Temporary hack to ignore OnStreamCreated() due to the user calling Stop()
   // so we don't start the audio thread pointing to a potentially freed
   // |callback_|.
   //
   // TODO(scherkus): Replace this by changing AudioRendererSink to either accept
   // the callback via Start(). See http://crbug.com/151051 for details.
   bool stopping_hack_;
 
   base::WaitableEvent did_receive_auth_;
   media::AudioParameters output_params_;
   OutputDeviceStatus device_status_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputDevice);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_DEVICE_H_