diff options
| author | James Dong <jdong@google.com> | 2012-02-08 14:20:26 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-02-10 14:09:35 -0800 |
| commit | 6c5d832a6967e45bf742e1e612328d0fdccb3031 (patch) | |
| tree | 829b206c11babc522ce768abbff1cb5911a13295 /libstagefrighthw | |
| parent | 6de494aa87e55850f2bfba52305e426a83686b40 (diff) | |
| download | media-6c5d832a6967e45bf742e1e612328d0fdccb3031.tar.gz | |
Don't use MediaDebug in libstagefrighthw
Change-Id: I61b0911e79e11f9d4d27a867fc86462034171f1b
Diffstat (limited to 'libstagefrighthw')
| -rw-r--r-- | libstagefrighthw/QComOMXPlugin.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/libstagefrighthw/QComOMXPlugin.cpp b/libstagefrighthw/QComOMXPlugin.cpp index 68d39d7d..3e3206f4 100644 --- a/libstagefrighthw/QComOMXPlugin.cpp +++ b/libstagefrighthw/QComOMXPlugin.cpp @@ -19,18 +19,20 @@ #include <dlfcn.h> #include <media/stagefright/HardwareAPI.h> -#include <media/stagefright/MediaDebug.h> namespace android { static const char kPrefix[] = "7x30."; -static void AddPrefix(char *name) { - CHECK(!strncmp("OMX.qcom.", name, 9)); +static OMX_ERRORTYPE AddPrefix(char *name) { + if (strncmp("OMX.qcom.", name, 9)) { + return OMX_ErrorUndefined; + } String8 tmp(name, 9); tmp.append(kPrefix); tmp.append(&name[9]); strcpy(name, tmp.string()); + return OMX_ErrorNone; } static void RemovePrefix(const char *name, String8 *out) { @@ -119,9 +121,7 @@ OMX_ERRORTYPE QComOMXPlugin::enumerateComponents( return res; } - AddPrefix(name); - - return OMX_ErrorNone; + return AddPrefix(name); } OMX_ERRORTYPE QComOMXPlugin::getRolesOfComponent( @@ -155,12 +155,15 @@ OMX_ERRORTYPE QComOMXPlugin::getRolesOfComponent( err = (*mGetRolesOfComponentHandle)( const_cast<OMX_STRING>(name), &numRoles2, array); - CHECK_EQ(err, OMX_ErrorNone); - CHECK_EQ(numRoles, numRoles2); + if (err == OMX_ErrorNone && numRoles != numRoles2) { + err = OMX_ErrorUndefined; + } 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; @@ -170,7 +173,7 @@ OMX_ERRORTYPE QComOMXPlugin::getRolesOfComponent( array = NULL; } - return OMX_ErrorNone; + return err; } } // namespace android |