summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-26 08:00:46 +0000
committerqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-26 08:00:46 +0000
commite272282175ff952685c32820cc8e018907e543b8 (patch)
treec498c01d3d93b93cdcc1571934730e14f5d99c77 /media/base
parent68fbc918b7cf3ea40ab0e0408d8bfa6bda32cf27 (diff)
downloadchromium_src-e272282175ff952685c32820cc8e018907e543b8.zip
chromium_src-e272282175ff952685c32820cc8e018907e543b8.tar.gz
chromium_src-e272282175ff952685c32820cc8e018907e543b8.tar.bz2
Try catch a top crasher for MSE/EME
ReleaseOutputBuffer() often throws exceptions. However, most of the times those exceptions doesn't affect playback on my nexus 4. Just catch the exception for now. Review URL: https://codereview.chromium.org/212013002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/android/java/src/org/chromium/media/MediaCodecBridge.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
index 29181ff..3f15061 100644
--- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
@@ -398,7 +398,12 @@ class MediaCodecBridge {
@CalledByNative
private void releaseOutputBuffer(int index, boolean render) {
- mMediaCodec.releaseOutputBuffer(index, render);
+ try {
+ mMediaCodec.releaseOutputBuffer(index, render);
+ } catch(IllegalStateException e) {
+ // TODO(qinmin): May need to report the error to the caller. crbug.com/356498.
+ Log.e(TAG, "Failed to release output buffer", e);
+ }
}
@CalledByNative