loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Gradle Lint with @RequiresApi and SDK version

Browse Source 
Gradle Lint doesn't recognise `checkState` assertion and TargetApi should only ever be used for suppressing a bug in Android Lint. Hence, we keep @RequiresApi and add an if-statement explicitly. Also, fixes >26 to >=26 for the version check.

#minor-release

PiperOrigin-RevId: 555144577
This commit is contained in:
jbibik 2023-08-09 13:31:48 +00:00 committed by Tianyi Feng
parent 2a645ac2b6
commit f7c31bd3ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java
View File

@ -16,17 +16,16 @@
package androidx.media3.test.utils; package androidx.media3.test.utils;
import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Assertions.checkStateNotNull; import static androidx.media3.common.util.Assertions.checkStateNotNull;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.Build;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.media3.common.GlTextureInfo; import androidx.media3.common.GlTextureInfo;
import androidx.media3.common.VideoFrameProcessingException; import androidx.media3.common.VideoFrameProcessingException;
import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.GlUtil;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -40,7 +39,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@UnstableApi @UnstableApi
public final class TextureBitmapReader implements VideoFrameProcessorTestRunner.BitmapReader { public final class TextureBitmapReader implements VideoFrameProcessorTestRunner.BitmapReader {
// TODO(b/239172735): This outputs an incorrect black output image on emulators.
private final Map<Long, Bitmap> outputTimestampsToBitmaps; private final Map<Long, Bitmap> outputTimestampsToBitmaps;
private boolean useHighPrecisionColorComponents; private boolean useHighPrecisionColorComponents;
private @MonotonicNonNull Bitmap outputBitmap; private @MonotonicNonNull Bitmap outputBitmap;
@ -98,7 +96,9 @@ public final class TextureBitmapReader implements VideoFrameProcessorTestRunner.
if (!useHighPrecisionColorComponents) { if (!useHighPrecisionColorComponents) {
return BitmapPixelTestUtil.createArgb8888BitmapFromFocusedGlFramebuffer(width, height); return BitmapPixelTestUtil.createArgb8888BitmapFromFocusedGlFramebuffer(width, height);
} }
checkState(Util.SDK_INT > 26, "useHighPrecisionColorComponents only supported on API 26+"); if (Build.VERSION.SDK_INT < 26) {
throw new IllegalStateException("useHighPrecisionColorComponents only supported on API 26+");
}
return BitmapPixelTestUtil.createFp16BitmapFromFocusedGlFramebuffer(width, height); return BitmapPixelTestUtil.createFp16BitmapFromFocusedGlFramebuffer(width, height);
} }
} }