media/base/android/java/src/org/chromium/media/MediaPlayerListener.java - Issue 1372203002: Throttle media decoding after excessive Android media server crashes

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: media/base/android/java/src/org/chromium/media/MediaPlayerListener.java

Issue 1372203002: Throttle media decoding after excessive Android media server crashes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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

« content/public/browser/web_contents_delegate.h ('K') | « content/public/browser/web_contents_delegate.cc ('k') | media/base/android/media_codec_player.h » ('j') | media/base/android/media_codec_player.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/java/src/org/chromium/media/MediaPlayerListener.java

diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java

index 469e049f44de51261e48ed3c8b37c2e3977eaffb..0cac2e072db42c6ec9c56cf833ca6f3a9224d90c 100644

--- a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java

+++ b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java

@@ -19,7 +19,7 @@ class MediaPlayerListener implements MediaPlayer.OnPreparedListener,

MediaPlayer.OnSeekCompleteListener,

MediaPlayer.OnVideoSizeChangedListener,

MediaPlayer.OnErrorListener {

- // These values are mirrored as enums in media/base/android/media_player_bridge.h.

+ // These values are mirrored as enums in media/base/android/media_player_android.h.

// Please ensure they stay in sync.

private static final int MEDIA_ERROR_FORMAT = 0;

private static final int MEDIA_ERROR_DECODE = 1;

@@ -56,9 +56,6 @@ class MediaPlayerListener implements MediaPlayer.OnPreparedListener,

break;

}

break;

- case MediaPlayer.MEDIA_ERROR_SERVER_DIED:

- errorType = MEDIA_ERROR_DECODE;

- break;

case MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK:

errorType = MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK;

break;