Merge "AImageDecoder: only support animation for F16 and 8888 (impl)" into sc-dev

2021-04-27 19:22:23 +00:00
parent 33866688e6 df33b95e68
commit bc4e5c6c66
1 changed files with 9 additions and 0 deletions
--- a/native/graphics/jni/imagedecoder.cpp
+++ b/native/graphics/jni/imagedecoder.cpp
@@ -442,6 +442,15 @@ int AImageDecoder_advanceFrame(AImageDecoder* decoder) {
        return ANDROID_IMAGE_DECODER_BAD_PARAMETER;
    }

+    const auto colorType = imageDecoder->getOutputInfo().colorType();
+    switch (colorType) {
+        case kN32_SkColorType:
+        case kRGBA_F16_SkColorType:
+            break;
+        default:
+            return ANDROID_IMAGE_DECODER_INVALID_STATE;
+    }
+
    if (imageDecoder->advanceFrame()) {
        return ANDROID_IMAGE_DECODER_SUCCESS;
    }