From 9f8002f16a7cfa49607cff1c59e06df7d9016bb8 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Fri, 27 Sep 2019 19:56:29 +0100 Subject: [PATCH] Update LINT.IfChange for extension constants PiperOrigin-RevId: 271617996 --- extensions/vp9/src/main/jni/vpx_jni.cc | 4 ++++ .../android/exoplayer2/video/VideoDecoderOutputBuffer.java | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc index 9c4b6d4acf..823f9b8cab 100644 --- a/extensions/vp9/src/main/jni/vpx_jni.cc +++ b/extensions/vp9/src/main/jni/vpx_jni.cc @@ -532,15 +532,19 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) { return 1; } + // LINT.IfChange const int kOutputModeYuv = 0; const int kOutputModeSurfaceYuv = 1; + // LINT.ThenChange(../../../../../library/core/src/main/java/com/google/android/exoplayer2/C.java) int outputMode = env->GetIntField(jOutputBuffer, outputModeField); if (outputMode == kOutputModeYuv) { + // LINT.IfChange const int kColorspaceUnknown = 0; const int kColorspaceBT601 = 1; const int kColorspaceBT709 = 2; const int kColorspaceBT2020 = 3; + // LINT.ThenChange(../../../../../library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java) int colorspace = kColorspaceUnknown; switch (img->cs) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java index 299b5656b8..44ab168505 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java @@ -31,15 +31,13 @@ public class VideoDecoderOutputBuffer extends OutputBuffer { * * @param outputBuffer Output buffer. */ - public void releaseOutputBuffer(VideoDecoderOutputBuffer outputBuffer); + void releaseOutputBuffer(VideoDecoderOutputBuffer outputBuffer); } - // LINT.IfChange public static final int COLORSPACE_UNKNOWN = 0; public static final int COLORSPACE_BT601 = 1; public static final int COLORSPACE_BT709 = 2; public static final int COLORSPACE_BT2020 = 3; - // LINT.ThenChange(../../../../../../../../../../extensions/av1/src/main/jni/gav1_jni.cc) /** Decoder private data. */ public int decoderPrivate;