diff options
| author | James Dong <jdong@google.com> | 2012-02-08 14:18:50 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-02-10 12:01:27 -0800 |
| commit | 6b035cd4c491166451987164fe6f18782ab0ae62 (patch) | |
| tree | 9eae3c54038523f24ba77b1f6c4fcb3792b8298a /libstagefrighthw | |
| parent | 057f4fd59ec05ded909e9eb9a3363d9ea345b0ca (diff) | |
| download | hardware_ti_omap4xxx-6b035cd4c491166451987164fe6f18782ab0ae62.zip hardware_ti_omap4xxx-6b035cd4c491166451987164fe6f18782ab0ae62.tar.gz hardware_ti_omap4xxx-6b035cd4c491166451987164fe6f18782ab0ae62.tar.bz2 | |
Do not use macros from MediaDebug
Change-Id: I7aa0b1ed0655a4b2c9474f78fc85ead9d8802446
Diffstat (limited to 'libstagefrighthw')
| -rw-r--r-- | libstagefrighthw/TIOMXPlugin.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libstagefrighthw/TIOMXPlugin.cpp b/libstagefrighthw/TIOMXPlugin.cpp index cff5e90..b04c7b9 100644 --- a/libstagefrighthw/TIOMXPlugin.cpp +++ b/libstagefrighthw/TIOMXPlugin.cpp @@ -19,7 +19,6 @@ #include <dlfcn.h> #include <media/stagefright/HardwareAPI.h> -#include <media/stagefright/MediaDebug.h> namespace android { @@ -132,11 +131,11 @@ OMX_ERRORTYPE TIOMXPlugin::getRolesOfComponent( err = (*mGetRolesOfComponentHandle)( const_cast<OMX_STRING>(name), &numRoles, array); - CHECK_EQ(err, OMX_ErrorNone); - for (OMX_U32 i = 0; i < numRoles; ++i) { - String8 s((const char *)array[i]); - roles->push(s); + if (err == OMX_ErrorNone) { + String8 s((const char *)array[i]); + roles->push(s); + } delete[] array[i]; array[i] = NULL; @@ -146,7 +145,7 @@ OMX_ERRORTYPE TIOMXPlugin::getRolesOfComponent( array = NULL; } - return OMX_ErrorNone; + return err; } } // namespace android |