Allow muting/unmuting audio through media track API

media/blink/webmediaplayer_impl.cc

 // Copyright 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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <sstream>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/debug/crash_logging.h"
@@ skipping 532 matching lines @@
 
   return pipeline_metadata_.has_video;
 }
 
 bool WebMediaPlayerImpl::hasAudio() const {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   return pipeline_metadata_.has_audio;
 }
 
+void WebMediaPlayerImpl::enabledAudioTracksChanged(
+    const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
+  DCHECK(main_task_runner_->BelongsToCurrentThread());
+  CHECK(demuxer_.get());
+
+  std::vector<const DemuxerStream*> enabledAudioStreams;
+  std::stringstream trackIdsStr;
+  for (const auto& trackId : enabledTrackIds) {
+    const DemuxerStream* s = demuxer_->GetDemuxerStreamByTrackId(trackId);
+    DCHECK(s);

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

nit: I prefer CHECK here. Perhaps also DCHECK that s is an audio demuxer stream.

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

Done.

+    enabledAudioStreams.push_back(s);
+    trackIdsStr << trackId << " ";
+  }
+  MEDIA_LOG(INFO, media_log_)
+      << "WebMediaPlayerImpl::enabledAudioTracksChanged enabledTrackIds="
+      << trackIdsStr.str();
+  pipeline_.OnEnabledAudioStreamsChanged(enabledAudioStreams);
+}
+
+void WebMediaPlayerImpl::selectedVideoTrackChanged(
+    blink::WebMediaPlayer::TrackId* selectedTrackId) {
+  DCHECK(main_task_runner_->BelongsToCurrentThread());
+  CHECK(demuxer_.get());
+
+  const DemuxerStream* selectedVideoStream = nullptr;
+  if (selectedTrackId) {
+    selectedVideoStream = demuxer_->GetDemuxerStreamByTrackId(*selectedTrackId);
+    DCHECK(selectedVideoStream);

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

nit ditto CHECK. Perhaps also DCHECK that selectedVideoStream is a video demuxer
stream.

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

Done.

+    MEDIA_LOG(INFO, media_log_)
+        << "WebMediaPlayerImpl::selectedVideoTrackChanged selectedTrackId="
+        << *selectedTrackId << " selectedVideoStream=" << selectedVideoStream;
+  } else {
+    MEDIA_LOG(INFO, media_log_) << "WebMediaPlayerImpl::"
+                                   "selectedVideoTrackChanged "
+                                   "selectedTrackId=none";
+  }
+  pipeline_.OnSelectedVideoStreamChanged(selectedVideoStream);
+}
+
 blink::WebSize WebMediaPlayerImpl::naturalSize() const {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   return blink::WebSize(pipeline_metadata_.natural_size);
 }
 
 bool WebMediaPlayerImpl::paused() const {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
 #if defined(OS_ANDROID)  // WMPI_CAST
@@ skipping 243 matching lines @@
 }
 
 void WebMediaPlayerImpl::OnFFmpegMediaTracksUpdated(
     scoped_ptr<MediaTracks> tracks) {
   // For MSE/chunk_demuxer case the media track updates are handled by
   // WebSourceBufferImpl.
   DCHECK(demuxer_.get());
   DCHECK(!chunk_demuxer_);
 
   // Report the media track information to blink.
+  std::vector<blink::WebMediaPlayer::TrackId> blinkTrackIds;
   for (const auto& track : tracks->tracks()) {
     if (track->type() == MediaTrack::Audio) {
       auto track_id = client_->addAudioTrack(
           blink::WebString::fromUTF8(track->id()),
           blink::WebMediaPlayerClient::AudioTrackKindMain,
           blink::WebString::fromUTF8(track->label()),
           blink::WebString::fromUTF8(track->language()),
           /*enabled*/ true);
-      (void)track_id;
+      blinkTrackIds.push_back(track_id);
     } else if (track->type() == MediaTrack::Video) {
       auto track_id = client_->addVideoTrack(
           blink::WebString::fromUTF8(track->id()),
           blink::WebMediaPlayerClient::VideoTrackKindMain,
           blink::WebString::fromUTF8(track->label()),
           blink::WebString::fromUTF8(track->language()),
           /*selected*/ true);
-      (void)track_id;
+      blinkTrackIds.push_back(track_id);
     } else {
       // Text tracks are not supported through this code path yet.
       NOTREACHED();
     }
   }
+
+  demuxer_->OnTrackIdsAssigned(*tracks.get(), blinkTrackIds);
 }
 
 void WebMediaPlayerImpl::OnWaitingForDecryptionKey() {
   encrypted_client_->didBlockPlaybackWaitingForKey();
 
   // TODO(jrummell): didResumePlaybackBlockedForKey() should only be called
   // when a key has been successfully added (e.g. OnSessionKeysChange() with
   // |has_additional_usable_key| = true). http://crbug.com/461903
   encrypted_client_->didResumePlaybackBlockedForKey();
 }
@@ skipping 730 matching lines @@
            << ", Video: " << stats.video_memory_usage << ", DataSource: "
            << (data_source_ ? data_source_->GetMemoryUsage() : 0)
            << ", Demuxer: " << demuxer_memory_usage;
 
   const int64_t delta = current_memory_usage - last_reported_memory_usage_;
   last_reported_memory_usage_ = current_memory_usage;
   adjust_allocated_memory_cb_.Run(delta);
 }
 
 }  // namespace media