android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java - Issue 714643002: Pause EME player whose external surface is stolen by another player

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java

Issue 714643002: Pause EME player whose external surface is stolen by another player (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: player->Release() instead of player->Pause() Created 6 years, 1 month 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

« no previous file with comments | « no previous file | chromecast/browser/android/apk/src/org/chromium/chromecast/shell/ExternalVideoSurfaceContainer.java » ('j') | content/browser/media/android/browser_media_player_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java

diff --git a/android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java b/android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java

index e0e1f6657bf19d9a7d1826b210ce17cb8a36e9c5..3829ef7ada1206c72700bab128d184e582056121 100644

--- a/android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java

+++ b/android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java

@@ -40,6 +40,7 @@ import java.lang.ref.WeakReference;

@JNINamespace("android_webview")

public class ExternalVideoSurfaceContainer implements SurfaceHolder.Callback {

protected static final int INVALID_PLAYER_ID = -1;

+ protected static final int ANY_PLAYER_ID = -2;

// Because WebView does hole-punching by itself, instead, the hole-punching logic

// in SurfaceView can clear out some web elements like media control or subtitle.

@@ -132,11 +133,12 @@ public class ExternalVideoSurfaceContainer implements SurfaceHolder.Callback {

@CalledByNative

protected void releaseExternalVideoSurface(int playerId) {

- if (mPlayerId != playerId) return;

+ if (playerId == ANY_PLAYER_ID || playerId == mPlayerId) {

- releaseIfActiveContainer(this);

+ releaseIfActiveContainer(this);

- mPlayerId = INVALID_PLAYER_ID;

+ mPlayerId = INVALID_PLAYER_ID;

+ }

}

@CalledByNative