Revert of Allow muting/unmuting audio through media track API

media/filters/ffmpeg_demuxer.cc

 // 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.
 
 #include "media/filters/ffmpeg_demuxer.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/base64.h"
@@ skipping 1203 matching lines @@
     if (strstr(format_context->iformat->name, "webm") ||
         strstr(format_context->iformat->name, "matroska")) {
       // TODO(servolk): FFmpeg doesn't set stream->id correctly for webm files.
       // Need to fix that and use it as track id. crbug.com/323183
       track_id = base::UintToString(media_tracks->tracks().size() + 1);
       track_label = streams_[i]->GetMetadata("title");
     }
 
     // Note when we find our audio/video stream (we only want one of each) and
     // record src= playback UMA stats for the stream's decoder config.
-    const MediaTrack* media_track = nullptr;
     if (codec_type == AVMEDIA_TYPE_AUDIO) {
       CHECK(!audio_stream);
       audio_stream = stream;
       audio_config = streams_[i]->audio_decoder_config();
       RecordAudioCodecStats(audio_config);
 
-      media_track = media_tracks->AddAudioTrack(audio_config, track_id, "main",
-                                                track_label, track_language);
-      media_tracks->SetDemuxerStreamForMediaTrack(media_track, streams_[i]);
+      media_tracks->AddAudioTrack(audio_config, track_id, "main", track_label,
+                                  track_language);
     } else if (codec_type == AVMEDIA_TYPE_VIDEO) {
       CHECK(!video_stream);
       video_stream = stream;
       video_config = streams_[i]->video_decoder_config();
       RecordVideoCodecStats(video_config, stream->codec->color_range);
 
-      media_track = media_tracks->AddVideoTrack(video_config, track_id, "main",
-                                                track_label, track_language);
-      media_tracks->SetDemuxerStreamForMediaTrack(media_track, streams_[i]);
+      media_tracks->AddVideoTrack(video_config, track_id, "main", track_label,
+                                  track_language);
     }
 
     max_duration = std::max(max_duration, streams_[i]->duration());
 
     const base::TimeDelta start_time =
         ExtractStartTime(stream, start_time_estimates[i]);
     const bool has_start_time = start_time != kNoTimestamp();
 
     // Always prefer the video stream for seeking.  If none exists, we'll swap
     // the fallback stream with the preferred stream below.
@@ skipping 338 matching lines @@
 }
 
 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   for (const auto& stream : streams_) {  // |stream| is a ref to a pointer.
     if (stream)
       stream->SetLiveness(liveness);
   }
 }
 
-void FFmpegDemuxer::OnTrackIdsAssigned(const MediaTracks& tracks,
-                                       const std::vector<unsigned>& track_ids) {
-  track_id_to_demux_stream_ = tracks.OnTrackIdsAssigned(track_ids);
-}
-
-const DemuxerStream* FFmpegDemuxer::GetDemuxerStreamByTrackId(
-    unsigned track_id) const {
-  const auto& it = track_id_to_demux_stream_.find(track_id);
-  CHECK(it != track_id_to_demux_stream_.end());
-  return it->second;
-}
-
 }  // namespace media