summaryrefslogtreecommitdiff
path: root/native/graphics
diff options
context:
space:
mode:
author Leon Scroggins III <scroggo@google.com> 2020-12-02 14:05:44 -0500
committer Leon Scroggins III <scroggo@google.com> 2021-01-08 09:37:22 -0500
commit946f8d41bc0eb69bd45f612b4875633eda203086 (patch)
tree44bb33dad54e579fa0d2a22ea5511e95f845c198 /native/graphics
parent0621313fe65f78359f5c3b604b324fb2fd8dba07 (diff)
Implement AImageDecoder_resultToString
Bug: 160984428 Test: I118eaa99cd65b70dbfb2c8a7731c714564911a34 Change-Id: Iac444b04521056ae6f08cf7bbf12a79a80698c4c
Diffstat (limited to 'native/graphics')
-rw-r--r--native/graphics/jni/imagedecoder.cpp31
-rw-r--r--native/graphics/jni/libjnigraphics.map.txt1
2 files changed, 32 insertions, 0 deletions
diff --git a/native/graphics/jni/imagedecoder.cpp b/native/graphics/jni/imagedecoder.cpp
index e3b575e066d6..0f6190722aa3 100644
--- a/native/graphics/jni/imagedecoder.cpp
+++ b/native/graphics/jni/imagedecoder.cpp
@@ -61,6 +61,37 @@ int ResultToErrorCode(SkCodec::Result result) {
}
}
+const char* AImageDecoder_resultToString(int result) {
+ switch (result) {
+ case ANDROID_IMAGE_DECODER_SUCCESS:
+ return "ANDROID_IMAGE_DECODER_SUCCESS";
+ case ANDROID_IMAGE_DECODER_INCOMPLETE:
+ return "ANDROID_IMAGE_DECODER_INCOMPLETE";
+ case ANDROID_IMAGE_DECODER_ERROR:
+ return "ANDROID_IMAGE_DECODER_ERROR";
+ case ANDROID_IMAGE_DECODER_INVALID_CONVERSION:
+ return "ANDROID_IMAGE_DECODER_INVALID_CONVERSION";
+ case ANDROID_IMAGE_DECODER_INVALID_SCALE:
+ return "ANDROID_IMAGE_DECODER_INVALID_SCALE";
+ case ANDROID_IMAGE_DECODER_BAD_PARAMETER:
+ return "ANDROID_IMAGE_DECODER_BAD_PARAMETER";
+ case ANDROID_IMAGE_DECODER_INVALID_INPUT:
+ return "ANDROID_IMAGE_DECODER_INVALID_INPUT";
+ case ANDROID_IMAGE_DECODER_SEEK_ERROR:
+ return "ANDROID_IMAGE_DECODER_SEEK_ERROR";
+ case ANDROID_IMAGE_DECODER_INTERNAL_ERROR:
+ return "ANDROID_IMAGE_DECODER_INTERNAL_ERROR";
+ case ANDROID_IMAGE_DECODER_UNSUPPORTED_FORMAT:
+ return "ANDROID_IMAGE_DECODER_UNSUPPORTED_FORMAT";
+ case ANDROID_IMAGE_DECODER_FINISHED:
+ return "ANDROID_IMAGE_DECODER_FINISHED";
+ case ANDROID_IMAGE_DECODER_INVALID_STATE:
+ return "ANDROID_IMAGE_DECODER_INVALID_STATE";
+ default:
+ return nullptr;
+ }
+}
+
static int createFromStream(std::unique_ptr<SkStreamRewindable> stream, AImageDecoder** outDecoder) {
SkCodec::Result result;
auto codec = SkCodec::MakeFromStream(std::move(stream), &result, nullptr,
diff --git a/native/graphics/jni/libjnigraphics.map.txt b/native/graphics/jni/libjnigraphics.map.txt
index c8f115178e23..d8c3cefd30ca 100644
--- a/native/graphics/jni/libjnigraphics.map.txt
+++ b/native/graphics/jni/libjnigraphics.map.txt
@@ -1,5 +1,6 @@
LIBJNIGRAPHICS {
global:
+ AImageDecoder_resultToString; # introduced=31
AImageDecoder_createFromAAsset; # introduced=30
AImageDecoder_createFromFd; # introduced=30
AImageDecoder_createFromBuffer; # introduced=30