From 75f744ae4077baa10ab3e1170ed330319739905c Mon Sep 17 00:00:00 2001 From: sofijajvc Date: Fri, 23 Aug 2019 10:53:03 +0100 Subject: [PATCH] Fix VpxDecoder error codes to match the ones in vpx_jni.cc PiperOrigin-RevId: 265018783 --- .../com/google/android/exoplayer2/ext/vp9/VpxDecoder.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java index 462e6ea044..5630058712 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java @@ -30,9 +30,11 @@ import java.nio.ByteBuffer; /* package */ final class VpxDecoder extends SimpleDecoder { + // These constants should match the codes returned from vpxDecode and vpxSecureDecode functions in + // https://github.com/google/ExoPlayer/blob/release-v2/extensions/vp9/src/main/jni/vpx_jni.cc. private static final int NO_ERROR = 0; - private static final int DECODE_ERROR = 1; - private static final int DRM_ERROR = 2; + private static final int DECODE_ERROR = -1; + private static final int DRM_ERROR = -2; @Nullable private final ExoMediaCrypto exoMediaCrypto; private final long vpxDecContext;