diff options
Diffstat (limited to 'media_resource_manager')
6 files changed, 25 insertions, 12 deletions
diff --git a/media_resource_manager/arbitrator/Android.mk b/media_resource_manager/arbitrator/Android.mk index d665c24..044d2ac 100644 --- a/media_resource_manager/arbitrator/Android.mk +++ b/media_resource_manager/arbitrator/Android.mk @@ -11,7 +11,6 @@ LOCAL_SHARED_LIBRARIES := \ libexpat \ libdl \ - LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(call include-path-for, frameworks-native)/media/openmax @@ -21,6 +20,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libmrm_arbitrator -#LOCAL_CFLAGS += -Werror +LOCAL_CFLAGS += -Werror include $(BUILD_SHARED_LIBRARY) diff --git a/media_resource_manager/arbitrator/MediaResourceArbitrator.cpp b/media_resource_manager/arbitrator/MediaResourceArbitrator.cpp index e2f9501..b809281 100644 --- a/media_resource_manager/arbitrator/MediaResourceArbitrator.cpp +++ b/media_resource_manager/arbitrator/MediaResourceArbitrator.cpp @@ -47,7 +47,7 @@ ArbitratorErrorType MediaResourceArbitrator::Config(const char* configFilePath) fp = ::fopen(configFilePath, "r"); if (fp == NULL) { ALOGV("%s: can not open config xml file.\ - try to set up default codec limitation"); + try to set up default codec limitation", __FUNCTION__); SetupDefaultCodecLimitation(); return ArbitratorErrorNone; } diff --git a/media_resource_manager/omx_adaptor/Android.mk b/media_resource_manager/omx_adaptor/Android.mk index 63638db..c843d9b 100644 --- a/media_resource_manager/omx_adaptor/Android.mk +++ b/media_resource_manager/omx_adaptor/Android.mk @@ -23,6 +23,6 @@ LOCAL_C_INCLUDES := \ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libmrm_omx_adaptor -#LOCAL_CFLAGS += -Werror +LOCAL_CFLAGS += -Werror include $(BUILD_SHARED_LIBRARY) diff --git a/media_resource_manager/omx_adaptor/OMX_adaptor.cpp b/media_resource_manager/omx_adaptor/OMX_adaptor.cpp index 10c8293..55650b0 100644 --- a/media_resource_manager/omx_adaptor/OMX_adaptor.cpp +++ b/media_resource_manager/omx_adaptor/OMX_adaptor.cpp @@ -109,7 +109,7 @@ void MRM_OMX_Adaptor::MRM_OMX_SetComponent( OMX_STRING cComponentName) { ALOGV("MRM_OMX_SetComponent: %s", cComponentName); String8 sComponentName(cComponentName); - ALOGV("pComponentHandle = 0x%x, componentName = %s", pComponentHandle, sComponentName.string()); + ALOGV("pComponentHandle = %p, componentName = %s", pComponentHandle, sComponentName.string()); mComponentNameMap.add(pComponentHandle, sComponentName); } @@ -119,7 +119,7 @@ OMX_ERRORTYPE MRM_OMX_Adaptor::MRM_OMX_SetParameter( OMX_INDEXTYPE nIndex, OMX_PTR pComponentParameterStructure) { ALOGV("MRM_OMX_SetParameter"); - ALOGV("hComponent = 0x%x", hComponent); + ALOGV("hComponent = %p", hComponent); OMX_ERRORTYPE err = OMX_ErrorNone; Mutex::Autolock lock(sLock); @@ -131,7 +131,7 @@ OMX_ERRORTYPE MRM_OMX_Adaptor::MRM_OMX_SetParameter( if (def->nPortIndex == kPortIndexInput) { ALOGV("MRM_OMX_SetParameter for inport param def"); if (mComponentFramerateMap.indexOfKey(hComponent) >= 0) { - ALOGV("setParameter is called again for component 0x%x inport", hComponent); + ALOGV("setParameter is called again for component %p inport", hComponent); return OMX_ErrorNone; } @@ -147,7 +147,7 @@ OMX_ERRORTYPE MRM_OMX_Adaptor::MRM_OMX_SetParameter( // if setParameter is not first called to this component's outport // do not try to record its info for the second time if (mComponentInfoMap.indexOfKey(hComponent) >= 0) { - ALOGV("setParameter is called again for component 0x%x outport", hComponent); + ALOGV("setParameter is called again for component %p outport", hComponent); return OMX_ErrorNone; } @@ -161,7 +161,7 @@ OMX_ERRORTYPE MRM_OMX_Adaptor::MRM_OMX_SetParameter( return OMX_ErrorInsufficientResources; } - ResolutionType resolution; + ResolutionType resolution = Resolution_CIF; unsigned int height = video_def->nFrameHeight; ALOGV("video resulotion = %d x %d", video_def->nFrameWidth, video_def->nFrameHeight); if (height <= 480) { @@ -216,6 +216,18 @@ OMX_ERRORTYPE MRM_OMX_Adaptor::MRM_OMX_UseBuffer( OMX_U32 nSizeBytes, OMX_U8 *pBuffer) { ALOGV("MRM_OMX_UseBuffer"); + if(pBuffer == 0 || ppBufferHdr == 0) { + ALOGV("%s: Null buffer. hComponent:%p, ppBufferHdr:%p, " + "nPortIndex:%d, pAppPrivate:%p, nSizeBytes:%d, pBuffer:%p", + __FUNCTION__, + hComponent, + ppBufferHdr, + nPortIndex, + pAppPrivate, + nSizeBytes, + pBuffer); + } + OMX_ERRORTYPE err = OMX_ErrorNone; return err; } @@ -223,11 +235,11 @@ OMX_ERRORTYPE MRM_OMX_Adaptor::MRM_OMX_UseBuffer( OMX_ERRORTYPE MRM_OMX_Adaptor::MRM_OMX_RemoveComponent( OMX_HANDLETYPE pComponentHandle) { - ALOGV("MRM_OMX_RemoveComponent 0x%x", pComponentHandle); + ALOGV("MRM_OMX_RemoveComponent %p", pComponentHandle); OMX_ERRORTYPE err = OMX_ErrorNone; if (mComponentInfoMap.indexOfKey(pComponentHandle) < 0) { - ALOGE("component 0x%x was not added by setParameter before! something is wrong?",pComponentHandle); + ALOGE("component %p was not added by setParameter before! something is wrong?", pComponentHandle); return OMX_ErrorNone; // TODO: change to specific error. } diff --git a/media_resource_manager/test/Android.mk b/media_resource_manager/test/Android.mk index 7703265..70984f2 100644 --- a/media_resource_manager/test/Android.mk +++ b/media_resource_manager/test/Android.mk @@ -19,5 +19,7 @@ LOCAL_C_INCLUDES := \ #LOCAL_32_BIT_ONLY := true +LOCAL_CFLAGS += -Werror + include $(BUILD_NATIVE_TEST) diff --git a/media_resource_manager/test/MediaResourceManager_test.cpp b/media_resource_manager/test/MediaResourceManager_test.cpp index 4531d8c..72171e5 100644 --- a/media_resource_manager/test/MediaResourceManager_test.cpp +++ b/media_resource_manager/test/MediaResourceManager_test.cpp @@ -53,7 +53,7 @@ protected: Resolution_1080, 30); if (err == ArbitratorErrorInsufficientResources) { - ALOGE("%dth codec can not be added anymore."); + ALOGE("%dth codec can not be added anymore.", i); return; } } |