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

Unified Diff: media/base/android/java/src/org/chromium/media/MediaCodecBridge.java

Issue 1422643002: Pass DecryptConfig parameters over IPC and use it in AVDA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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: media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
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 b4213977e4cc1b0128bbf05afc4c6f03bbff7ed4..a0749e061f17b6a889eab31010ac1a3e09d90dfd 100644
--- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
@@ -32,7 +32,7 @@ import java.util.Map;
*/
@JNINamespace("media")
class MediaCodecBridge {
- private static final String TAG = "cr.media";
+ private static final String TAG = "cr_media";
// Error code for MediaCodecBridge. Keep this value in sync with
// MediaCodecStatus in media_codec_bridge.h.
@@ -537,8 +537,11 @@ class MediaCodecBridge {
}
Log.e(TAG, "MediaCodec.CryptoException with error code " + e.getErrorCode());
return MEDIA_CODEC_ERROR;
+ } catch (MediaCodec.CodecException e) {
+ Log.e(TAG, "Failed to queue secure input buffer, MediaCodec.CodecException " + e);
+ return MEDIA_CODEC_ERROR;
} catch (IllegalStateException e) {
- Log.e(TAG, "Failed to queue secure input buffer", e);
+ Log.e(TAG, "Failed to queue secure input buffer, IllegalStateException " + e);
return MEDIA_CODEC_ERROR;
}
return MEDIA_CODEC_OK;

Powered by Google App Engine
This is Rietveld 408576698