Plumb audio focus support for spitzer clients.

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 <string>
@@ skipping 186 matching lines @@
   }
 
   // TODO(xhwang): When we use an external Renderer, many methods won't work,
   // e.g. GetCurrentFrameFromCompositor(). See http://crbug.com/434861
 
   // Use the null sink if no sink was provided.
   audio_source_provider_ = new WebAudioSourceProviderImpl(
       params.audio_renderer_sink().get()
           ? params.audio_renderer_sink()
           : new NullAudioSink(media_task_runner_));
+#if defined(OS_ANDROID)
+  audio_source_provider_->enable_audio_focus();
+#endif
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
   client_->setWebLayer(NULL);
 
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
-  if (delegate_) {
-    delegate_->RemoveObserver(this);
+  if (delegate_)
     delegate_->PlayerGone(this);
-  }
 
   // Abort any pending IO so stopping the pipeline doesn't get blocked.
   if (data_source_)
     data_source_->Abort();
   if (chunk_demuxer_) {
     chunk_demuxer_->Shutdown();
     chunk_demuxer_ = NULL;
   }
 
   renderer_factory_.reset();
@@ skipping 799 matching lines @@
 
   scoped_ptr<WebInbandTextTrackImpl> web_inband_text_track(
       new WebInbandTextTrackImpl(web_kind, web_label, web_language, web_id));
 
   scoped_ptr<TextTrack> text_track(new TextTrackImpl(
       main_task_runner_, client_, std::move(web_inband_text_track)));
 
   done_cb.Run(std::move(text_track));
 }
 
+blink::WebMediaPlayer* WebMediaPlayerImpl::GetPlayer() {
+  return this;
+}
+
 void WebMediaPlayerImpl::OnHidden() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
 #if !defined(OS_ANDROID)
   // Suspend/Resume is enabled by default on Android.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableMediaSuspend)) {
     return;
   }
 #endif  // !defined(OS_ANDROID)
@@ skipping 58 matching lines @@
   }
 
   // We may not be suspended if we were not yet subscribed or the pipeline was
   // not yet started when OnHidden() fired.
   if (!suspended_)
     return;
 
   Resume();
 }
 
+void WebMediaPlayerImpl::OnPlay() {
+  // TODO(dalecurtis): All clients use the same code for OnPlay/OnPause... which
+  // suggests there's some cleanup worth doing.
+  play();
+  client_->playbackStateChanged();
+}
+
+void WebMediaPlayerImpl::OnPause() {
+  pause();
+  client_->playbackStateChanged();
+}
+
 void WebMediaPlayerImpl::Resume() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   CHECK(suspended_);
   CHECK(!resuming_);
 
   // If there was a time change pending when we suspended (which can happen when
   // we suspend immediately after a seek), surface it after resuming.
   bool time_changed = pending_time_change_;
   pending_time_change_ = false;
 
@@ skipping 248 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