Revert of Allow muting/unmuting audio through media track API

media/renderers/renderer_impl.cc

 // 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.
 
 #include "media/renderers/renderer_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 187 matching lines @@
   if (old_rate == 0 && playback_rate > 0)
     video_renderer_->OnTimeStateChanged(true);
   else if (old_rate > 0 && playback_rate == 0)
     video_renderer_->OnTimeStateChanged(false);
 }
 
 void RendererImpl::SetVolume(float volume) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
-  audio_volume_ = volume;
-  if (!audio_renderer_)
-    return;
-
-  if (audio_stream_currently_disabled_) {
-    DVLOG(1) << "SetVolume ignored since audio stream is currently disabled.";
-    return;
-  }
-
-  audio_renderer_->SetVolume(volume);
+  if (audio_renderer_)
+    audio_renderer_->SetVolume(volume);
 }
 
 base::TimeDelta RendererImpl::GetMediaTime() {
   // No BelongsToCurrentThread() checking because this can be called from other
   // threads.
   return time_source_->CurrentMediaTime();
 }
 
 bool RendererImpl::HasAudio() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   return audio_renderer_ != NULL;
 }
 
 bool RendererImpl::HasVideo() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   return video_renderer_ != NULL;
 }
 
-void RendererImpl::OnEnabledAudioStreamsChanged(
-    const std::vector<const DemuxerStream*>& enabledAudioStreams) {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  DemuxerStream* audio_stream =
-      demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO);
-
-  bool audio_stream_enabled = false;
-  for (const DemuxerStream* demuxer_stream : enabledAudioStreams) {
-    DCHECK_EQ(demuxer_stream->type(), DemuxerStream::AUDIO);
-    DCHECK_EQ(demuxer_stream, audio_stream);
-    audio_stream_enabled = true;
-  }
-
-  // TODO(servolk,wolenetz): Need to find a way to completely disable audio
-  // (i.e. stop audio decoder and switch video to wall clock) when audio stream
-  // is disabled, but for now just set volume to 0. crbug.com/599709
-  if (audio_renderer_) {
-    if (audio_stream_enabled && audio_stream_currently_disabled_) {
-      DVLOG(3) << __FUNCTION__ << " enabled audio. SetVolume=" << audio_volume_;
-      audio_stream_currently_disabled_ = false;
-      audio_renderer_->SetVolume(audio_volume_);
-    } else if (!audio_stream_enabled) {
-      DVLOG(3) << __FUNCTION__ << " disabled audio. SetVolume=0";
-      DCHECK(!audio_stream_currently_disabled_);
-      audio_stream_currently_disabled_ = true;
-      audio_renderer_->SetVolume(0);
-    }
-  }
-}
-
-void RendererImpl::OnSelectedVideoStreamChanged(
-    const DemuxerStream* selectedVideoStream) {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  DemuxerStream* video_stream =
-      demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO);
-  if (selectedVideoStream) {
-    DVLOG(3) << __FUNCTION__ << " selectedVideoStream=" << selectedVideoStream;
-    DCHECK_EQ(selectedVideoStream->type(), DemuxerStream::VIDEO);
-    CHECK_EQ(selectedVideoStream, video_stream);
-  } else {
-    DVLOG(3) << __FUNCTION__ << " selectedVideoStream=none";
-    // TODO(servolk,wolenetz): Need to find a way to stop video decoding and
-    // rendering when the video stream is deselected. crbug.com/599709
-  }
-}
-
 void RendererImpl::DisableUnderflowForTesting() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
 
   underflow_disabled_for_testing_ = true;
 }
 
 void RendererImpl::EnableClocklessVideoPlaybackForTesting() {
   DVLOG(1) << __FUNCTION__;
@@ skipping 422 matching lines @@
   }
 
   // After OnError() returns, the pipeline may destroy |this|.
   base::ResetAndReturn(&error_cb_).Run(error);
 
   if (!flush_cb_.is_null())
     base::ResetAndReturn(&flush_cb_).Run();
 }
 
 }  // namespace media