Unmute Tab Audio For Desktop Share

content/browser/media/capture/audio_mirroring_manager.h

 // 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.
 //
 // AudioMirroringManager is a singleton object that maintains a set of active
 // audio mirroring destinations and auto-connects/disconnects audio streams
 // to/from those destinations.  It is meant to be used exclusively on the IO
 // thread.
 //
 // How it works:
@@ skipping 14 matching lines @@
 //       request a "refresh" query on a MirroringDestination, and this will
 //       result in AudioMirroringManager starting/stopping only those Diverters
 //       that are not correctly routed to the destination.
 //   3c. When a mirroring session is stopped, the remaining destinations will be
 //       queried to determine whether diverting should continue to a different
 //       destination.
 
 #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_AUDIO_MIRRORING_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_CAPTURE_AUDIO_MIRRORING_MANAGER_H_
 
+#include <map>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "media/audio/audio_source_diverter.h"
+#include "media/audio/virtual_audio_sink.h"
 
 namespace media {
 class AudioOutputStream;
 }
 
 namespace content {
 
 class CONTENT_EXPORT AudioMirroringManager {
  public:
   // Interface for diverting audio data to an alternative AudioOutputStream.
@@ skipping 18 matching lines @@
         const std::set<SourceFrameRef>& candidates,
         const MatchesCallback& results_callback) = 0;
 
     // Create a consumer of audio data in the format specified by |params|, and
     // connect it as an input to mirroring.  When Close() is called on the
     // returned AudioOutputStream, the input is disconnected and the object
     // becomes invalid.
     virtual media::AudioOutputStream* AddInput(
         const media::AudioParameters& params) = 0;
 
+    virtual media::AudioPushSink* AddPushInput(
+        const media::AudioParameters& params) = 0;
+
+    virtual bool IsDuplication() = 0;

[miu, 2016/04/21 00:15:24]

I was looking at how AudioMirroringManager uses this.  I think a lot of the
changes you made in the amm.cc could be made much simpler if you get rid of
this.  Instead, have the MatchesCallback (see line 71 above) include a second
boolean parameter that is true/false depending on whether it wants duplicated
audio.

The AudioMirroringManager is already rather complex.  In general, whenever
possible, try to limit its operations to one code path/sequence that works for
both the duplication vs. not duplication cases.

[qiangchen, 2016/04/28 00:00:56]

Done.

+
    protected:
     virtual ~MirroringDestination() {}
   };
 
   // Note: Use GetInstance() for non-test code.
   AudioMirroringManager();
   virtual ~AudioMirroringManager();
 
   // Returns the global instance.
   static AudioMirroringManager* GetInstance();
@@ skipping 21 matching lines @@
     // The source render frame associated with the audio stream.
     SourceFrameRef source_render_frame;
 
     // The diverter for re-routing the audio stream.
     Diverter* diverter;
 
     // If not NULL, the audio stream is currently being diverted to this
     // destination.
     MirroringDestination* destination;
 
+    // The destinations to which audio stream is duplicated.
+    std::map<MirroringDestination*, media::AudioPushSink*> dup_destinations;
+
     StreamRoutingState(const SourceFrameRef& source_frame,
                        Diverter* stream_diverter);
     StreamRoutingState(const StreamRoutingState& other);
     ~StreamRoutingState();
   };
 
   typedef std::vector<StreamRoutingState> StreamRoutes;
   typedef std::vector<MirroringDestination*> Destinations;
 
   // Helper to find a destination other than |old_destination| for the given
   // |candidates| to be diverted to.
   void InitiateQueriesToFindNewDestination(
       MirroringDestination* old_destination,
       const std::set<SourceFrameRef>& candidates);
 
   // MirroringDestination query callback.  |matches| contains all RenderFrame
   // sources that will be diverted to |destination|.  If |add_only| is false,
   // then any Diverters currently routed to |destination| but not found in
   // |matches| will be stopped.
   void UpdateRoutesToDestination(MirroringDestination* destination,
                                  bool add_only,
                                  const std::set<SourceFrameRef>& matches);
 
+  // MirroringDestination query callback.  |matches| contains all RenderFrame
+  // sources that will be duplicated to |destination|.  If |add_only| is false,
+  // then any Diverters currently duplicating to |destination| but not found in
+  // |matches| will be stopped.
+  void UpdateRoutesToDupDestination(MirroringDestination* destination,
+                                    bool add_only,
+                                    const std::set<SourceFrameRef>& matches);
+
   // Starts diverting audio to the |new_destination|, if not NULL.  Otherwise,
   // stops diverting audio.
   static void ChangeRoute(StreamRoutingState* route,
                           MirroringDestination* new_destination);
 
   // Routing table.  Contains one entry for each Diverter.
   StreamRoutes routes_;
 
   // All active mirroring sessions.
   Destinations sessions_;
 
   // Used to check that all AudioMirroringManager code runs on the same thread.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioMirroringManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_CAPTURE_AUDIO_MIRRORING_MANAGER_H_