Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1526)

Unified Diff: content/renderer/media/webmediaplayer_ms.cc

Issue 1580493004: Plumb audio focus support for spitzer clients. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate_hookup
Patch Set: Fix crash, plumb. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index e302d9dcd93942855a9fcf649416c213952e3f51..0290e451ddf61c5582068d4e69a3ff6129a7f412 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -50,8 +50,7 @@ WebMediaPlayerMS::WebMediaPlayerMS(
media::GpuVideoAcceleratorFactories* gpu_factories,
const blink::WebString& sink_id,
const blink::WebSecurityOrigin& security_origin)
- : RenderFrameObserver(RenderFrame::FromWebFrame(frame)),
- frame_(frame),
+ : frame_(frame),
network_state_(WebMediaPlayer::NetworkStateEmpty),
ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
buffered_(static_cast<size_t>(0)),
@@ -72,6 +71,9 @@ WebMediaPlayerMS::WebMediaPlayerMS(
: url::Origin(security_origin)) {
DVLOG(1) << __FUNCTION__;
DCHECK(client);
+ if (delegate)
+ delegate->AddObserver(this);
+
media_log_->AddEvent(
media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
}
@@ -360,7 +362,11 @@ unsigned WebMediaPlayerMS::videoDecodedByteCount() const {
return 0;
}
-void WebMediaPlayerMS::WasHidden() {
+blink::WebMediaPlayer* WebMediaPlayerMS::GetPlayer() {
+ return this;
+}
+
+void WebMediaPlayerMS::OnHidden() {
#if defined(OS_ANDROID)
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!render_frame_suspended_);
@@ -374,7 +380,7 @@ void WebMediaPlayerMS::WasHidden() {
#endif // defined(OS_ANDROID)
}
-void WebMediaPlayerMS::WasShown() {
+void WebMediaPlayerMS::OnShown() {
#if defined(OS_ANDROID)
DCHECK(thread_checker_.CalledOnValidThread());
@@ -382,6 +388,16 @@ void WebMediaPlayerMS::WasShown() {
#endif // defined(OS_ANDROID)
}
+void WebMediaPlayerMS::OnPlay() {
+ play();
+ client_->playbackStateChanged();
+}
+
+void WebMediaPlayerMS::OnPause() {
+ pause();
+ client_->playbackStateChanged();
+}
+
bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture(
blink::WebGraphicsContext3D* web_graphics_context,
unsigned int texture,

Powered by Google App Engine
This is Rietveld 408576698