commit eb9aca6a5c4570b297138757cf66aa3be9f7f2a4
author Chong Zhang <chz@google.com> Wed Sep 16 12:49:41 2020 -0700
committer Chong Zhang <chz@google.com> Wed Sep 16 20:32:48 2020 +0000
tree 4a5be1445ec73ede9471d77dd2b3b9c1c6aa16ae
parent ffebb80bd127ecebfc4af02fe481d048d0c9a29c

Translate resource related errors in NdkMediaCodec

NdkMediaCodec is not reporting resource lost errors properly.
Translate the error codes to match that in MediaCodec JNI.

bug: 168307955
bug: 154733526
Change-Id: I4b3d0eecb55a31e4cd83407ff71ff16fb0557935

media/ndk/NdkMediaCodec.cpp

diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp
index af21a99..d771095 100644
--- a/media/ndk/NdkMediaCodec.cpp
+++ b/media/ndk/NdkMediaCodec.cpp
@@ -45,6 +45,10 @@
         return AMEDIA_OK;
     } else if (err == -EAGAIN) {
         return (media_status_t) AMEDIACODEC_INFO_TRY_AGAIN_LATER;
+    } else if (err == NO_MEMORY) {
+        return AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE;
+    } else if (err == DEAD_OBJECT) {
+        return AMEDIACODEC_ERROR_RECLAIMED;
     }
     ALOGE("sf error code: %d", err);
     return AMEDIA_ERROR_UNKNOWN;
@@ -255,7 +259,7 @@
                          break;
                      }
                      msg->findString("detail", &detail);
-                     ALOGE("Decoder reported error(0x%x), actionCode(%d), detail(%s)",
+                     ALOGE("Codec reported error(0x%x), actionCode(%d), detail(%s)",
                            err, actionCode, detail.c_str());
 
                      Mutex::Autolock _l(mCodec->mAsyncCallbackLock);