diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-05-05 17:53:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 17:53:24 +0000 |
| commit | ebea5e7d0697c024c1ddf6001dcd33036e9bd95f (patch) | |
| tree | 7ea222cc326292376cfac6331793a1186d7bdddb /media/libstagefright/omx/OMX.cpp | |
| parent | 48d41f651f4ef761a7477eac404e195a7fac0c8f (diff) | |
| parent | fafcc219184223ab584eac3b03ee807e2798207a (diff) | |
| download | frameworks_av-ebea5e7d0697c024c1ddf6001dcd33036e9bd95f.zip frameworks_av-ebea5e7d0697c024c1ddf6001dcd33036e9bd95f.tar.gz frameworks_av-ebea5e7d0697c024c1ddf6001dcd33036e9bd95f.tar.bz2 | |
Merge "Stagefright: propagate InsufficientResources error" into mnc-dev
Diffstat (limited to 'media/libstagefright/omx/OMX.cpp')
| -rw-r--r-- | media/libstagefright/omx/OMX.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index b9e2f9c..876abb8 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -32,6 +32,7 @@ #include "OMXMaster.h" +#include <OMX_AsString.h> #include <OMX_Component.h> namespace android { @@ -233,11 +234,11 @@ status_t OMX::allocateNode( instance, &handle); if (err != OMX_ErrorNone) { - ALOGE("FAILED to allocate omx component '%s'", name); + ALOGE("FAILED to allocate omx component '%s' err=%s(%#x)", name, asString(err), err); instance->onGetHandleFailed(); - return UNKNOWN_ERROR; + return StatusFromOMXError(err); } *node = makeNodeID(instance); |