commit 1e0c671e14660588410560a55c34718bb8af3b22
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 15 03:27:24 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 15 03:27:24 2017 +0000
tree f9491edc940dfa0de110487074797b2e61d1165e
parent 82d6adc7a04ff8ccdf1064ba061f361e15ae9343
parent 1bd7de205b11a7fa8b575beb8170d37bff99e76a

Merge "Fix error handling for unknown codecs" into oc-mr1-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index c9394bb..c44e868 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -6356,12 +6356,14 @@
             ALOGE("Unable to obtain MediaCodecList while "
                     "attempting to create codec \"%s\"",
                     componentName.c_str());
+            mCodec->signalError(OMX_ErrorUndefined, NO_INIT);
             return false;
         }
         ssize_t index = list->findCodecByName(componentName.c_str());
         if (index < 0) {
             ALOGE("Unable to find codec \"%s\"",
                     componentName.c_str());
+            mCodec->signalError(OMX_ErrorInvalidComponent, NAME_NOT_FOUND);
             return false;
         }
         sp<MediaCodecInfo> info = list->getCodecInfo(index);
@@ -6369,6 +6371,7 @@
             ALOGE("Unexpected error (index out-of-bound) while "
                     "retrieving information for codec \"%s\"",
                     componentName.c_str());
+            mCodec->signalError(OMX_ErrorUndefined, UNKNOWN_ERROR);
             return false;
         }
         matchingCodecs.add(info->getCodecName());