diff options
Diffstat (limited to 'libstagefrighthw')
| -rw-r--r-- | libstagefrighthw/Android.mk | 3 | ||||
| -rw-r--r-- | libstagefrighthw/SEC_OMX_Plugin.cpp | 18 | ||||
| -rw-r--r-- | libstagefrighthw/SEC_OMX_Plugin.h | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index c66ea66..a5ca416 100644 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -7,7 +7,8 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS += $(PV_CFLAGS_MINUS_VISIBILITY) LOCAL_C_INCLUDES:= \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ + $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/frameworks/native/include/media/hardware \ $(LOCAL_PATH)/../include \ LOCAL_SHARED_LIBRARIES := \ diff --git a/libstagefrighthw/SEC_OMX_Plugin.cpp b/libstagefrighthw/SEC_OMX_Plugin.cpp index 0bb70c5..cb91069 100644 --- a/libstagefrighthw/SEC_OMX_Plugin.cpp +++ b/libstagefrighthw/SEC_OMX_Plugin.cpp @@ -18,8 +18,7 @@ #include <dlfcn.h> -#include <media/stagefright/HardwareAPI.h> -#include <media/stagefright/MediaDebug.h> +#include <HardwareAPI.h> namespace android { @@ -37,7 +36,7 @@ SECOMXPlugin::SECOMXPlugin() mGetRolesOfComponentHandle(NULL) { if (mLibHandle != NULL) { mInit = (InitFunc)dlsym(mLibHandle, "SEC_OMX_Init"); - mDeinit = (DeinitFunc)dlsym(mLibHandle, "SEC_OMX_DeInit"); + mDeinit = (DeinitFunc)dlsym(mLibHandle, "SEC_OMX_Deinit"); mComponentNameEnum = (ComponentNameEnumFunc)dlsym(mLibHandle, "SEC_OMX_ComponentNameEnum"); @@ -125,12 +124,15 @@ OMX_ERRORTYPE SECOMXPlugin::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; @@ -140,7 +142,7 @@ OMX_ERRORTYPE SECOMXPlugin::getRolesOfComponent( array = NULL; } - return OMX_ErrorNone; + return err; } } // namespace android diff --git a/libstagefrighthw/SEC_OMX_Plugin.h b/libstagefrighthw/SEC_OMX_Plugin.h index 6df2d31..3d640db 100644 --- a/libstagefrighthw/SEC_OMX_Plugin.h +++ b/libstagefrighthw/SEC_OMX_Plugin.h @@ -18,7 +18,7 @@ #define SEC_OMX_PLUGIN -#include <media/stagefright/OMXPluginBase.h> +#include <OMXPluginBase.h> namespace android { |