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/OMXNodeInstance.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/OMXNodeInstance.cpp')
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 5bc1972..04293d6 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -220,13 +220,15 @@ OMX::node_id OMXNodeInstance::nodeID() { return mNodeID; } -static status_t StatusFromOMXError(OMX_ERRORTYPE err) { +status_t StatusFromOMXError(OMX_ERRORTYPE err) { switch (err) { case OMX_ErrorNone: return OK; case OMX_ErrorUnsupportedSetting: case OMX_ErrorUnsupportedIndex: return ERROR_UNSUPPORTED; + case OMX_ErrorInsufficientResources: + return NO_MEMORY; default: return UNKNOWN_ERROR; } |