Tuning WebRTC audio focus type

content/renderer/media/webmediaplayer_ms.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 "content/renderer/media/webmediaplayer_ms.h"
 
 #include <stddef.h>
 #include <limits>
 #include <string>
 #include <utility>
@@ skipping 163 matching lines @@
 
   if (video_frame_provider_)
     video_frame_provider_->Resume();
 
   compositor_->StartRendering();
 
   if (audio_renderer_)
     audio_renderer_->Play();
 
   if (delegate_) {
-    // TODO(perkj, magjed): We send a duration of 1 second here to avoid
-    // creating an interactive media session on Android. We'd like to use zero
-    // here, but that is treated as an unknown duration and assumed to be
-    // interactive. See http://crbug.com/595297 for more details.
+    // TODO(perkj, magjed): We use Uncontrollable type here to avoid creating an
+    // interactive media session on Android. See http://crbug.com/596516 for
+    // more details.
+#if defined(OS_ANDROID)
     delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false,
                        media::MediaContentType::Uncontrollable);
+#else  // defined(OS_ANDROID)
+    delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false,
+                       media::MediaContentType::Persistent);
+#endif  // defined(OS_ANDROID)
   }
 
   paused_ = false;
 }
 
 void WebMediaPlayerMS::pause() {
   DVLOG(1) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   should_play_upon_shown_ = false;
@@ skipping 239 matching lines @@
 #endif
 }
 
 void WebMediaPlayerMS::OnPlay() {
   // TODO(perkj, magjed): It's not clear how WebRTC should work with an
   // MediaSession, until these issues are resolved, disable session controls.
   // http://crbug.com/595297.
 }
 
 void WebMediaPlayerMS::OnPause() {
-  // TODO(perkj, magjed): See TODO in Onplay().
+  // TODO(perkj, magjed): See TODO in OnPlay().
 }
 
 void WebMediaPlayerMS::OnVolumeMultiplierUpdate(double multiplier) {
-  volume_multiplier_ = multiplier;
-  setVolume(volume_);
+  // TODO(perkj, magjed): See TODO in OnPlay().
 }
 
 bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture(
     gpu::gles2::GLES2Interface* gl,
     unsigned int texture,
     unsigned int internal_format,
     unsigned int type,
     bool premultiply_alpha,
     bool flip_y) {
   TRACE_EVENT0("media", "WebMediaPlayerMS:copyVideoTextureToPlatformTexture");
@@ skipping 97 matching lines @@
 void WebMediaPlayerMS::ResetCanvasCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_renderer_.ResetCache();
 }
 
 void WebMediaPlayerMS::TriggerResize() {
   get_client()->sizeChanged();
 }
 
 }  // namespace content