Allow muting/unmuting audio through media track API

media/base/media_tracks.h

Index: media/base/media_tracks.h
diff --git a/media/base/media_tracks.h b/media/base/media_tracks.h
index 4e0fbb0fc1f88195ce14cc05d14a424924be4d5d..65cf0362a4b5251c2e1c12830c88048e43c447b4 100644
--- a/media/base/media_tracks.h
+++ b/media/base/media_tracks.h
@@ -17,30 +17,38 @@
 namespace media {
 
 class AudioDecoderConfig;
+class DemuxerStream;
 class VideoDecoderConfig;
 
 class MEDIA_EXPORT MediaTracks {
  public:
   typedef std::vector<scoped_ptr<MediaTrack>> MediaTracksCollection;
+  typedef std::map<const MediaTrack*, const DemuxerStream*>
+      TrackToDemuxStreamMap;
 
   MediaTracks();
   ~MediaTracks();
 
   // Callers need to ensure that track id is unique.
-  void AddAudioTrack(const AudioDecoderConfig& config,
-                     const std::string& id,
-                     const std::string& kind,
-                     const std::string& label,
-                     const std::string& language);
+  const MediaTrack* AddAudioTrack(const AudioDecoderConfig& config,
+                                  const std::string& id,
+                                  const std::string& kind,
+                                  const std::string& label,
+                                  const std::string& language);
   // Callers need to ensure that track id is unique.
-  void AddVideoTrack(const VideoDecoderConfig& config,
-                     const std::string& id,
-                     const std::string& kind,
-                     const std::string& label,
-                     const std::string& language);
+  const MediaTrack* AddVideoTrack(const VideoDecoderConfig& config,
+                                  const std::string& id,
+                                  const std::string& kind,
+                                  const std::string& label,
+                                  const std::string& language);
 
   const MediaTracksCollection& tracks() const { return tracks_; }
 
+  const TrackToDemuxStreamMap& track_to_demux_stream_map() const {
+    return track_to_demux_stream_map_;
+  }
+  void set_track_to_demux_stream_map(const TrackToDemuxStreamMap& m);

[wolenetz, 2016/04/08 23:32:31]

Hmm. Is this for testing only? It seems a bit extreme.

[servolk, 2016/04/08 23:47:20]

No. This needs to be called before reporting media tracks to the clients, so
that clients (which interact with blink) can figure out how to map
blink-assigned track ids to media tracks to DemuxerStreams.  This is currently
done in MediaSourceState::OnNewConfigs and FFmpegDemuxer::OnFindStreamInfoDone
just before MediaTrackUpdatedCB is called. But now this map has the same
lifetime as MediaTracks and therefore we are guaranteed to have no dangling
MediaTrack* pointers.

[wolenetz, 2016/04/14 20:43:39]

I see. Since MediaTracks effectively owns the map, what do you think about a
refactor of this CL to make MediaTracks have more control over how the map is
maintained? e.g. make the method that constructs the map something internal to
MediaTracks. Is that feasible? It seems a bit strange to require the user of the
API to ensure that |m| is consistent with |tracks_|, for one thing.
Alternatively, and perhaps even better, would be to make TrackToDemuxStreamMap
(perhaps named differently) be the owner of MediaTracks, and use that
TrackToDemuxStreamMap object API commonly from OnNewConfigs() and
OnFindStreamInfoDone() to centralize the map maintenance ownership. WDYT?

[servolk, 2016/04/15 02:23:24]

Ok, I've refactored this code a bit, to make it simpler for MediaTrack users.
Instead of exposing the TrackToDemuxStreamMap, we can hide it (and manipulations
with it) inside the MediaTracks class, and allow demuxers to use the shared
logic for building a map for translating blink track ids into DemuxerStream*
ptrs.

[servolk, 2016/04/15 02:32:59]

To expand a bit on this: I think we probably don't need to introduce a separate
class, since all we really need  in the demuxers is a map from blink track id to
DemuxStream*, so  we can just build the map here in MediaTracks and pass it to
demuxers to use.

+
   const AudioDecoderConfig& getAudioConfig(const std::string& id) const;
   const VideoDecoderConfig& getVideoConfig(const std::string& id) const;
 
@@ -51,6 +59,7 @@ class MEDIA_EXPORT MediaTracks {
 
  private:
   MediaTracksCollection tracks_;
+  TrackToDemuxStreamMap track_to_demux_stream_map_;
   std::map<std::string, AudioDecoderConfig> audio_configs_;
   std::map<std::string, VideoDecoderConfig> video_configs_;