Looking up device id by session id for AudioRendererMixerInput

content/renderer/media/audio_device_factory.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.
 
 #ifndef CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_FACTORY_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 61 matching lines @@
   // Basing on |source_type| and build configuration, audio played out through
   // the sink goes to AOD directly or can be mixed with other audio before that.
   static scoped_refptr<media::SwitchableAudioRendererSink>
   NewSwitchableAudioRendererSink(SourceType source_type,
                                  int render_frame_id,
                                  int session_id,
                                  const std::string& device_id,
                                  const url::Origin& security_origin);
 
   // A helper to get device info in the absence of AudioOutputDevice.
-  static media::OutputDeviceInfo GetOutputDeviceInfo(
+  static const media::OutputDeviceInfo GetOutputDeviceInfo(

[tommi (sloooow) - chröme, 2016/04/08 13:47:47]

why this change?  the caller can make the variable const if required, right?
...or did you mean to return by const ref?

[o1ka, 2016/04/08 19:07:25]

No-no, no ref. Removing const to avoid confusion.

       int render_frame_id,
       int session_id,
       const std::string& device_id,
       const url::Origin& security_origin);
 
   // Creates an AudioCapturerSource using the currently registered factory.
   // |render_frame_id| refers to the RenderFrame containing the entity
   // consuming the audio.
   static scoped_refptr<media::AudioCapturerSource> NewAudioCapturerSource(
       int render_frame_id);
 
  protected:
   AudioDeviceFactory();
   virtual ~AudioDeviceFactory();
 
   // You can derive from this class and specify an implementation for these
   // functions to provide alternate audio device implementations.
   // If the return value of either of these function is NULL, we fall back
   // on the default implementation.
-  virtual scoped_refptr<media::AudioRendererSink> CreateAudioRendererMixerSink(
+
+  // Creates a final sink in the rendering pipeline, which represents the actual
+  // output device.
+  virtual scoped_refptr<media::AudioRendererSink> CreateFinalAudioRendererSink(
       int render_frame_id,
       int sesssion_id,
       const std::string& device_id,
       const url::Origin& security_origin) = 0;
 
   virtual scoped_refptr<media::AudioRendererSink> CreateAudioRendererSink(
       SourceType source_type,
       int render_frame_id,
       int sesssion_id,
       const std::string& device_id,
       const url::Origin& security_origin) = 0;
 
   virtual scoped_refptr<media::SwitchableAudioRendererSink>
   CreateSwitchableAudioRendererSink(SourceType source_type,
                                     int render_frame_id,
                                     int sesssion_id,
                                     const std::string& device_id,
                                     const url::Origin& security_origin) = 0;
 
   virtual scoped_refptr<media::AudioCapturerSource> CreateAudioCapturerSource(
       int render_frame_id) = 0;
 
  private:
   // The current globally registered factory. This is NULL when we should
   // create the default AudioRendererSinks.
   static AudioDeviceFactory* factory_;
 
+  static scoped_refptr<media::AudioRendererSink> NewFinalAudioRendererSink(
+      int render_frame_id,
+      int session_id,
+      const std::string& device_id,
+      const url::Origin& security_origin);
+
   DISALLOW_COPY_AND_ASSIGN(AudioDeviceFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_FACTORY_H_