Add support for unmixed audio from remote WebRTC remote tracks.

content/renderer/media/media_stream_track.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_H_
 
 #include "base/compiler_specific.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
+#include "media/audio/audio_parameters.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 
 namespace webrtc {
 class AudioTrackInterface;
 }  // namespace webrtc
 
 namespace content {
 
+class MediaStreamAudioSink;
+
 // MediaStreamTrack is a Chrome representation of blink::WebMediaStreamTrack.
 // It is owned by blink::WebMediaStreamTrack as
 // blink::WebMediaStreamTrack::ExtraData.
 class CONTENT_EXPORT MediaStreamTrack
     : NON_EXPORTED_BASE(public blink::WebMediaStreamTrack::ExtraData) {
  public:
   explicit MediaStreamTrack(bool is_local_track);
   ~MediaStreamTrack() override;
 
   static MediaStreamTrack* GetTrack(const blink::WebMediaStreamTrack& track);
 
   virtual void SetEnabled(bool enabled) = 0;
 
   virtual void Stop() = 0;
 
-  // TODO(tommi, xians): Remove this method.
-  virtual webrtc::AudioTrackInterface* GetAudioAdapter();
-
   bool is_local_track() const { return is_local_track_; }
 
  protected:
   const bool is_local_track_;
 
   // Used to DCHECK that we are called on Render main Thread.
   base::ThreadChecker main_render_thread_checker_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(MediaStreamTrack);
 };
 
+class CONTENT_EXPORT MediaStreamAudioTrack : public MediaStreamTrack {

[perkj_chrome, 2015/12/11 12:31:38]

please move to separate file. See MediaStreamVideoTrack

[tommi (sloooow) - chröme, 2015/12/11 15:36:51]

Done.

+ public:
+  explicit MediaStreamAudioTrack(bool is_local_track);
+  ~MediaStreamAudioTrack() override;
+
+  static MediaStreamAudioTrack* GetTrack(
+      const blink::WebMediaStreamTrack& track);
+
+  // Add a sink to the track. This function will trigger a OnSetFormat()
+  // call on the |sink|.
+  // Called on the main render thread.
+  virtual void AddSink(MediaStreamAudioSink* sink) = 0;
+
+  // Remove a sink from the track.
+  // Called on the main render thread.
+  virtual void RemoveSink(MediaStreamAudioSink* sink) = 0;
+
+  // TODO(tommi, xians): Remove this method.
+  virtual webrtc::AudioTrackInterface* GetAudioAdapter();
+
+  // Returns the output format of the capture source. May return an invalid
+  // AudioParameters if the format is not yet available.
+  // Called on the main render thread.
+  virtual media::AudioParameters GetOutputFormat() const = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioTrack);
+};
+
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_H_