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 | 068c76bc609bb8e71110c208bfe373f05c073f2a (patch) | |
| tree | f8b7c6055df2a89966fa4ebf636457d61ecfc1a3 /libstagefrighthw | |
| parent | 1ec22866752ed94071f2d8ed2ca2a4bd724bd36c (diff) | |
| download | hardware_ti_omap4-068c76bc609bb8e71110c208bfe373f05c073f2a.zip hardware_ti_omap4-068c76bc609bb8e71110c208bfe373f05c073f2a.tar.gz hardware_ti_omap4-068c76bc609bb8e71110c208bfe373f05c073f2a.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 |