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 32 matching lines @@
 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
 #include "third_party/WebKit/public/platform/WebMediaSource.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using blink::WebCanvas;
 using blink::WebMediaPlayer;
 using blink::WebRect;
 using blink::WebSize;
 using blink::WebString;
 using gpu::gles2::GLES2Interface;
 
 #define STATIC_ASSERT_ENUM(a, b)                            \
@@ skipping 488 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);
+    enabledAudioStreams.push_back(s);
+    trackIdsStr << trackId << " ";
+  }
+  DVLOG(5) << "WMPI::enabledAudioTracksChanged enabledTrackIds="

[wolenetz, 2016/03/30 00:31:32]

This seems appropriate for a MEDIA_LOG(INFO,...) entry.

[servolk, 2016/03/30 01:13:12]

Done.

+           << 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) {
+    DVLOG(5) << "WMPI::selectedVideoTrackChanged selectedTrackId="

[wolenetz, 2016/03/30 00:31:32]

ditto

[servolk, 2016/03/30 01:13:12]

Done.

+             << *selectedTrackId;
+    demuxer_->GetDemuxerStreamByTrackId(*selectedTrackId);
+  } else {
+    DVLOG(5) << "WMPI::selectedVideoTrackChanged selectedTrackId=<none>";

[wolenetz, 2016/03/30 00:31:32]

ditto

[servolk, 2016/03/30 01:13:13]

Done.

+  }
+  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 236 matching lines @@
       base::saturated_cast<unsigned int>(init_data.size()));
 }
 
 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_);
 
+  if (!blink::WebRuntimeFeatures::audioVideoTracksEnabled())
+    return;
+
   // Report the media track information to blink.
   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;
+      demuxer_->OnTrackIdAssigned(track_id, track.get());
     } 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;
+      demuxer_->OnTrackIdAssigned(track_id, track.get());
     } else {
       // Text tracks are not supported through this code path yet.
       NOTREACHED();
     }
   }
 }
 
 void WebMediaPlayerImpl::OnWaitingForDecryptionKey() {
   encrypted_client_->didBlockPlaybackWaitingForKey();
 
@@ skipping 698 matching lines @@
 bool WebMediaPlayerImpl::IsAutomaticResumeAllowed() {
 #if defined(OS_ANDROID)
   return !hasVideo() || (delegate_ && !delegate_->IsHidden());
 #else
   // On non-Android platforms Resume() is always allowed.
   return true;
 #endif
 }
 
 }  // namespace media