Unmute Tab Audio For Desktop Share

content/browser/media/capture/web_contents_audio_input_stream.cc

 // Copyright (c) 2013 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 "content/browser/media/capture/web_contents_audio_input_stream.h"
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 68 matching lines @@
   // successful audio capture.
   void UnmuteWebContentsAudio();
 
   // AudioMirroringManager::MirroringDestination implementation
   void QueryForMatches(const std::set<SourceFrameRef>& candidates,
                        const MatchesCallback& results_callback) override;
   void QueryForMatchesOnUIThread(const std::set<SourceFrameRef>& candidates,
                                  const MatchesCallback& results_callback);
   media::AudioOutputStream* AddInput(
       const media::AudioParameters& params) override;
+  media::AudioPushSink* AddPushInput(
+      const media::AudioParameters& params) override;
 
   // Callback which is run when |stream| is closed.  Deletes |stream|.
   void ReleaseInput(media::VirtualAudioOutputStream* stream);
+  void ReleasePushInput(media::VirtualAudioSink* sink);
 
   // Called by WebContentsTracker when the target of the audio mirroring has
   // changed.
   void OnTargetChanged(bool had_target);
 
   // Injected dependencies.
   const int initial_render_process_id_;
   const int initial_main_render_frame_id_;
   AudioMirroringManager* const mirroring_manager_;
   const scoped_refptr<WebContentsTracker> tracker_;
@@ skipping 174 matching lines @@
     for (std::set<SourceFrameRef>::const_iterator i = candidates.begin();
          i != candidates.end(); ++i) {
       WebContents* const contents_containing_frame =
           WebContents::FromRenderFrameHost(
               RenderFrameHost::FromID(i->first, i->second));
       if (contents_containing_frame == contents)
         matches.insert(*i);
     }
   }
 
-  results_callback.Run(matches);
+  // TODO(qiangchen): Plug in true for the case of Tab Typed Desktop Share.
+  results_callback.Run(matches, true);

[miu, 2016/05/02 20:06:13]

The 2nd argument here should be false, to maintain the current behavior, until
you finish the implementation.

[qiangchen, 2016/05/03 16:58:23]

Done.

Ha, that's my testing code. Forgot to change it back.

 }
 
 media::AudioOutputStream* WebContentsAudioInputStream::Impl::AddInput(
     const media::AudioParameters& params) {
   // Note: The closure created here holds a reference to "this," which will
   // guarantee the VirtualAudioInputStream (mixer_stream_) outlives the
   // VirtualAudioOutputStream.
   return new media::VirtualAudioOutputStream(
       params,
       mixer_stream_.get(),
       base::Bind(&Impl::ReleaseInput, this));
 }
 
 void WebContentsAudioInputStream::Impl::ReleaseInput(
     media::VirtualAudioOutputStream* stream) {
   delete stream;
 }
 
+media::AudioPushSink* WebContentsAudioInputStream::Impl::AddPushInput(
+    const media::AudioParameters& params) {
+  // Note: The closure created here holds a reference to "this," which will
+  // guarantee the VirtualAudioInputStream (mixer_stream_) outlives the
+  // VirtualAudioSink.
+  return new media::VirtualAudioSink(params, mixer_stream_.get(),
+                                     base::Bind(&Impl::ReleasePushInput, this));
+}
+
+void WebContentsAudioInputStream::Impl::ReleasePushInput(
+    media::VirtualAudioSink* stream) {
+  delete stream;
+}
+
 void WebContentsAudioInputStream::Impl::OnTargetChanged(bool had_target) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   is_target_lost_ = !had_target;
 
   if (state_ == MIRRORING) {
     if (is_target_lost_) {
       ReportError();
       Stop();
     } else {
@@ skipping 69 matching lines @@
 
 bool WebContentsAudioInputStream::GetAutomaticGainControl() {
   return impl_->mixer_stream()->GetAutomaticGainControl();
 }
 
 bool WebContentsAudioInputStream::IsMuted() {
   return false;
 }
 
 }  // namespace content