diff options
Diffstat (limited to 'domx')
76 files changed, 0 insertions, 25165 deletions
diff --git a/domx/Android.mk b/domx/Android.mk deleted file mode 100644 index 6571161..0000000 --- a/domx/Android.mk +++ /dev/null @@ -1 +0,0 @@ -include $(all-subdir-makefiles) diff --git a/domx/Makefile b/domx/Makefile deleted file mode 100644 index f6fb3f0..0000000 --- a/domx/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -# -# Copyright 2001-2008 Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# SEP xx,2002 REF=ORG Swamy MC -# Original version. -# ---------------------------------------------------------------------------- - -#PROJROOT = $(ROOTDIR)/src - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = DEBUG - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. -#TARGETTYPE = ST_LIB -TARGETTYPE = - -# For shared object library, soname is filename.so.maj_ver -SH_SONAME = - -# Folders in which gmake will run before building current target - -SUBMODULES = \ -mm_osal \ -omx_core \ -domx \ -omx_proxy_component \ - -#video/omx_proxy_component/test - -# Filename must not begin with '.', '/' or '\' - -SOURCES = - -# Search path for include files - -INCLUDES = - -# Libraries needed for linking. - -ST_LIBS = -SH_LIBS = - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk - diff --git a/domx/domx/Android.mk b/domx/domx/Android.mk deleted file mode 100644 index 036b479..0000000 --- a/domx/domx/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - omx_rpc/src/omx_rpc.c \ - omx_rpc/src/omx_rpc_skel.c \ - omx_rpc/src/omx_rpc_stub.c \ - omx_rpc/src/omx_rpc_config.c \ - omx_rpc/src/omx_rpc_platform.c \ - omx_proxy_common/src/omx_proxy_common.c \ - profiling/src/profile.c - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/omx_rpc/inc \ - $(LOCAL_PATH)/../omx_core/inc \ - $(LOCAL_PATH)/../mm_osal/inc \ - $(LOCAL_PATH)/profiling/inc \ - $(DEVICE_FOLDER)/hwc/ \ - $(DEVICE_FOLDER)/libion_ti/ \ - system/core/include/cutils \ - hardware/libhardware/include \ - frameworks/native/include/media/openmax - -LOCAL_CFLAGS += -D_Android -DENABLE_GRALLOC_BUFFERS -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ENHANCED_PORTRECONFIG -DUSE_ION - -ifneq ($(DEBUG_FORCE_STRICT_ALIASING),true) - LOCAL_CFLAGS += -fno-strict-aliasing -endif - -LOCAL_SHARED_LIBRARIES := \ - libmm_osal \ - libc \ - liblog \ - libion_ti \ - libcutils - -LOCAL_MODULE := libdomx -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/domx/domx/Makefile b/domx/domx/Makefile deleted file mode 100644 index cab0b80..0000000 --- a/domx/domx/Makefile +++ /dev/null @@ -1,111 +0,0 @@ -# -# Copyright (C) Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# REF=ORG -# Original version. -# ---------------------------------------------------------------------------- - -#PROJROOT = .. - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = -ifeq ($(BUILD),udeb) -CDEFS += DEBUG -endif -CDEFS += - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = libdomx - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = SH_LIB - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = lib - -# install directory relative to the root filesystem -ROOTFSRELEASE = lib - -# Folders in which gmake will run before building current target - -SUBMODULES = \ - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ -omx_rpc/src/omx_rpc.c \ -omx_rpc/src/omx_rpc_skel.c \ -omx_rpc/src/omx_rpc_stub.c \ -omx_proxy_common/src/omx_proxy_common.c \ -profiling/profile.c -# The below files are currently empty, so removed them from building -# omx_rpc/src/omx_rpc_config.c \ -# omx_rpc/src/omx_rpc_platform.c \ - -# Search path for include files - -INCLUDES = \ - $(PROJROOT)/omx_core/inc \ - $(PROJROOT)/mm_osal/inc \ - $(PROJROOT)/domx \ - $(PROJROOT)/domx/omx_rpc \ - $(PROJROOT)/domx/omx_rpc/inc \ - ../../memmgrheaders \ - - -# Libraries needed for linking. - -ST_LIBS = -#mm_osal -SH_LIBS = omx_core mm_osal -#rcm ipc -#pthread rt utils procmgr ipc rcm notify -#SH_LIBS += sysmgr sysmemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = $(PROJROOT)/mm_osal \ - $(PROJROOT)/omx_core - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk - diff --git a/domx/domx/memmgr_rpc/src/Android.mk b/domx/domx/memmgr_rpc/src/Android.mk deleted file mode 100755 index 5b61884..0000000 --- a/domx/domx/memmgr_rpc/src/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -HARDWARE_TI_OMAP4_BASE := hardware/ti/omap4xxx - -LOCAL_SRC_FILES := \ - memmgr_rpc.c - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/../inc \ - $(LOCAL_PATH)/../../ \ - $(LOCAL_PATH)/../../omx_rpc/inc \ - $(LOCAL_PATH)/../../../domx \ - $(HARDWARE_TI_OMAP4_BASE)/omx/ducati/domx/system/omx_core/inc \ - $(HARDWARE_TI_OMAP4_BASE)/omx/ducati/domx/system/mm_osal/inc \ - $(HARDWARE_TI_OMAP4_BASE)/tiler \ - $(HARDWARE_TI_OMAP4_BASE)/syslink/syslink/d2c \ - $(HARDWARE_TI_OMAP4_BASE)/syslink/syslink/api/include - -LOCAL_CFLAGS += -D_Android - -LOCAL_SHARED_LIBRARIES := \ - libOMX_CoreOsal \ - libipcutils \ - libsysmgr \ - libipc \ - librcm \ - libnotify \ - libc \ - liblog \ - libd2cmap - -LOCAL_MODULE := libmemmgr_rpc - -include $(BUILD_SHARED_LIBRARY) diff --git a/domx/domx/omx_proxy_common.h b/domx/domx/omx_proxy_common.h deleted file mode 100755 index 7c7d6c8..0000000 --- a/domx/domx/omx_proxy_common.h +++ /dev/null @@ -1,340 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_proxy_common.h - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework OMX Common Proxy. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_proxy_common\ - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - -#ifdef ANDROID_QUIRK_LOCK_BUFFER -#include <hardware/gralloc.h> -#endif - -#ifndef OMX_PROXY_H -#define OMX_PROXY_H - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/* ------compilation control switches ----------------------------------------*/ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -/* ----- system and platform files ----------------------------*/ -#include <OMX_Core.h> -/*-------program files ----------------------------------------*/ -#include "omx_rpc.h" -#include "omx_rpc_internal.h" -#include "omx_rpc_utils.h" - -/**************************************************************** - * PUBLIC DECLARATIONS Defined here, used elsewhere - ****************************************************************/ -/*--------data declarations -----------------------------------*/ -/*OMX versions supported by DOMX*/ -#define OMX_VER_MAJOR 0x1 -#define OMX_VER_MINOR 0x1 - -#define MAX_NUM_PROXY_BUFFERS 100 -#define MAX_COMPONENT_NAME_LENGTH 128 -#define PROXY_MAXNUMOFPORTS 8 - -/****************************************************************** - * MACROS - ASSERTS - ******************************************************************/ -#define PROXY_assert PROXY_paramCheck -#define PROXY_require PROXY_paramCheck -#define PROXY_ensure PROXY_paramCheck - -#define PROXY_paramCheck(C, V, S) do {\ - if (!(C)) { eError = V;\ - if(S) DOMX_ERROR("failed check:" #C" - returning error: 0x%x - %s",V,S);\ - else DOMX_ERROR("failed check:" #C" - returning error: 0x%x",V); \ - goto EXIT; }\ - } while(0) - -#define PROXY_CHK_VERSION(_pStruct_, _sName_) do { \ - PROXY_require((((_sName_ *)_pStruct_)->nSize == sizeof(_sName_)), \ - OMX_ErrorBadParameter, "Incorrect nSize"); \ - PROXY_require(((((_sName_ *)_pStruct_)->nVersion.s.nVersionMajor == \ - OMX_VER_MAJOR) && \ - ((((_sName_ *)_pStruct_)->nVersion.s.nVersionMinor == \ - OMX_VER_MINOR) || \ - (((_sName_ *)_pStruct_)->nVersion.s.nVersionMinor == \ - 0))), \ - OMX_ErrorVersionMismatch, NULL); \ - } while(0) - -#define PROXY_checkRpcError() do { \ - if (eRPCError == RPC_OMX_ErrorNone) \ - { \ - DOMX_DEBUG("Corresponding RPC function executed successfully"); \ - eError = eCompReturn; \ - PROXY_assert((eError == OMX_ErrorNone) || (eError == OMX_ErrorNoMore), eError, "Error returned from OMX API in ducati"); \ - } else \ - { \ - DOMX_ERROR("RPC function returned error 0x%x", eRPCError); \ - switch (eRPCError) \ - { \ - case RPC_OMX_ErrorHardware: \ - eError = OMX_ErrorHardware; \ - break; \ - case RPC_OMX_ErrorInsufficientResources: \ - eError = OMX_ErrorInsufficientResources; \ - break; \ - case RPC_OMX_ErrorBadParameter: \ - eError = OMX_ErrorBadParameter; \ - break; \ - case RPC_OMX_ErrorUnsupportedIndex: \ - eError = OMX_ErrorUnsupportedIndex; \ - break; \ - case RPC_OMX_ErrorTimeout: \ - eError = OMX_ErrorTimeout; \ - break; \ - default: \ - eError = OMX_ErrorUndefined; \ - } \ - PROXY_assert((eError == OMX_ErrorNone), eError, "Error returned from OMX API in ducati"); \ - } \ -} while(0) - - typedef OMX_ERRORTYPE(*PROXY_EMPTYBUFFER_DONE) (OMX_HANDLETYPE - hComponent, OMX_U32 remoteBufHdr, OMX_U32 nfilledLen, - OMX_U32 nOffset, OMX_U32 nFlags); - - typedef OMX_ERRORTYPE(*PROXY_FILLBUFFER_DONE) (OMX_HANDLETYPE - hComponent, OMX_U32 remoteBufHdr, OMX_U32 nfilledLen, - OMX_U32 nOffset, OMX_U32 nFlags, OMX_TICKS nTimeStamp, - OMX_HANDLETYPE hMarkTargetComponent, OMX_PTR pMarkData); - - typedef OMX_ERRORTYPE(*PROXY_EVENTHANDLER) (OMX_HANDLETYPE hComponent, - OMX_PTR pAppData, OMX_EVENTTYPE eEvent, OMX_U32 nData1, - OMX_U32 nData2, OMX_PTR pEventData); - -/******************************************************************************* -* Structures -*******************************************************************************/ -/*===============================================================*/ -/** PROXY_BUFFER_INFO : This structure maintains a table of A9 and - * Ducati side buffers and headers. - * - * @param pBufHeader : This is a pointer to the A9 bufferheader. - * - * @param pBufHeaderRemote : This is pointer to Ducati side bufferheader. - * - * @param pRegisteredAufBux0 - * @param pRegisteredAufBux1 - * @param pRegisteredAufBux2 : These are pointers to buffers registered with rpc driver - * They will assigned when registering and used when - * unregistering the buffer - */ -/*===============================================================*/ - typedef struct PROXY_BUFFER_INFO - { - OMX_BUFFERHEADERTYPE *pBufHeader; - OMX_U32 pBufHeaderRemote; - OMX_PTR pYBuffer; - OMX_PTR pMetaDataBuffer; -#ifdef USE_ION - int mmap_fd; - int mmap_fd_metadata_buff; - OMX_PTR pRegisteredAufBux0; - OMX_PTR pRegisteredAufBux1; - OMX_PTR pRegisteredAufBux2; -#endif - } PROXY_BUFFER_INFO; - -/*===============================================================*/ -/** PROXY_BUFFER_TYPE : This enumeration tells the type of buffer pointers coming to OMX in - UseBuffer call. - */ -/*===============================================================*/ - typedef enum PROXY_BUFFER_TYPE - { - VirtualPointers, /*Used when buffer pointers come from the normal A9 virtual space */ - GrallocPointers, /*Used when buffer pointers come from Gralloc allocations */ - IONPointers, /*Used when buffer pointers come from ION allocations */ - EncoderMetadataPointers, /*Used when buffer pointers come from Stagefright in camcorder usecase */ - BufferDescriptorVirtual2D /*Virtual unpacked buffers passed via OMX_TI_BUFFERDESCRIPTOR_TYPE */ - } PROXY_BUFFER_TYPE; - -/*===============================================================*/ -/** PROXY_BUFFER_TYPE : This enumeration tells the type of buffer pointers coming to OMX in - UseBuffer call. - */ -/*===============================================================*/ - typedef struct PROXY_PORT_TYPE - { - PROXY_BUFFER_TYPE proxyBufferType; /*Used when buffer pointers come from the normal A9 virtual space */ - OMX_U32 IsBuffer2D; /*Used when buffer pointers come from Gralloc allocations */ - } PROXY_PORT_TYPE; - -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY -/*===============================================================*/ -/** DebugFrame_Dump : Structure holding the info about frames to dump - * @param fromFrame: From which frame to start dumping - * @param toFrame: till which frame to dump - * @param frame_width: Width of the frame - * @param frame_height: Height of the frame - * @param padded_width: Width of the buffer - * @param padded_height: Height of the buffer - * @param stride: Stride of the Buffer - * @param runningFrame: running counter to track the frames - */ -/*===============================================================*/ - typedef struct DebugFrame_Dump - { - OMX_S32 fromFrame; - OMX_S32 toFrame; - OMX_U32 frame_width; - OMX_U32 frame_height; - OMX_U32 frame_xoffset; - OMX_U32 frame_yoffset; - OMX_U32 stride; - OMX_S32 runningFrame; - OMX_U32 *y_uv[2]; - }DebugFrame_Dump; -#endif - -/* ========================================================================== */ -/** -* PROXY_COMPONENT_PRIVATE -* -*/ -/* ========================================================================== */ - typedef struct PROXY_COMPONENT_PRIVATE - { - /* OMX Related Information */ - OMX_CALLBACKTYPE tCBFunc; - OMX_PTR pILAppData; - OMX_HANDLETYPE hRemoteComp; - - PROXY_BUFFER_INFO tBufList[MAX_NUM_PROXY_BUFFERS]; - PROXY_PORT_TYPE proxyPortBuffers[PROXY_MAXNUMOFPORTS]; - OMX_BOOL IsLoadedState; - OMX_U32 nTotalBuffers; - OMX_U32 nAllocatedBuffers; - - /* PROXY specific data - PROXY PRIVATE DATA */ - OMX_PTR pCompProxyPrv; - char *cCompName; - - PROXY_EMPTYBUFFER_DONE proxyEmptyBufferDone; - PROXY_FILLBUFFER_DONE proxyFillBufferDone; - PROXY_EVENTHANDLER proxyEventHandler; - -#ifdef ANDROID_QUIRK_LOCK_BUFFER - gralloc_module_t const *grallocModule; -#endif -#ifdef USE_ION - int ion_fd; - OMX_BOOL bUseIon; - OMX_BOOL bMapIonBuffers; -#endif -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY - DebugFrame_Dump debugframeInfo; -#endif - int secure_misc_drv_fd; - } PROXY_COMPONENT_PRIVATE; - - - -/*===============================================================*/ -/** PROXY_MARK_DATA : A pointer to this structure is sent as mark data to - * the remote core when a MarkBuffer command is made. - * - * @param hComponentActual : This is the actual handle of the component to be - * marked. When marked buffers come from the remote - * to the local core then remote handle of the mark - * component is replaced by this in the header. - * - * @param pMarkdataActual : This is the mark data set by the client. - */ -/*===============================================================*/ - typedef struct PROXY_MARK_DATA - { - OMX_HANDLETYPE hComponentActual; - OMX_PTR pMarkDataActual; - } PROXY_MARK_DATA; -/******************************************************************************* -* Functions -*******************************************************************************/ - OMX_ERRORTYPE OMX_ProxyCommonInit(OMX_HANDLETYPE hComponent); - OMX_ERRORTYPE PROXY_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct); - OMX_ERRORTYPE PROXY_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct); - OMX_ERRORTYPE PROXY_EventHandler(OMX_HANDLETYPE hComponent, - OMX_PTR pAppData, OMX_EVENTTYPE eEvent, OMX_U32 nData1, OMX_U32 nData2, - OMX_PTR pEventData); - OMX_ERRORTYPE PROXY_SendCommand(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_COMMANDTYPE eCmd, - OMX_IN OMX_U32 nParam, OMX_IN OMX_PTR pCmdData); - OMX_ERRORTYPE PROXY_EmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr); - OMX_ERRORTYPE PROXY_GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE * pIndexType); - OMX_ERRORTYPE PROXY_FillBufferDone(OMX_HANDLETYPE hComponent, - OMX_U32 remoteBufHdr, OMX_U32 nfilledLen, OMX_U32 nOffset, OMX_U32 nFlags, - OMX_TICKS nTimeStamp, OMX_HANDLETYPE hMarkTargetComponent, - OMX_PTR pMarkData); - OMX_ERRORTYPE PROXY_FillThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr); - OMX_ERRORTYPE PROXY_AllocateBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr,OMX_IN OMX_U32 nPortIndex, - OMX_IN OMX_PTR pAppPrivate, OMX_IN OMX_U32 nSizeBytes); - OMX_ERRORTYPE PROXY_FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_BUFFERHEADERTYPE * pBufferHdr); - OMX_ERRORTYPE PROXY_ComponentDeInit(OMX_HANDLETYPE hComponent); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif diff --git a/domx/domx/omx_proxy_common/src/omx_proxy_common.c b/domx/domx/omx_proxy_common/src/omx_proxy_common.c deleted file mode 100644 index b1df157..0000000 --- a/domx/domx/omx_proxy_common/src/omx_proxy_common.c +++ /dev/null @@ -1,2563 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_proxy_common.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework OMX Common Proxy . - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_proxy_common\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - -/* ------compilation control switches ----------------------------------------*/ -#define TILER_BUFF -#define ALLOCATE_TILER_BUFFER_IN_PROXY -// This has been enabled enbled only in Android.mk -// #define ENABLE_GRALLOC_BUFFER -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -/* ----- system and platform files ----------------------------*/ -#include <string.h> - -#include "timm_osal_memory.h" -#include "timm_osal_mutex.h" -#include "OMX_TI_Common.h" -#include "OMX_TI_Index.h" -#include "OMX_TI_Core.h" -/*-------program files ----------------------------------------*/ -#include "omx_proxy_common.h" -#include "omx_rpc.h" -#include "omx_rpc_stub.h" -#include "omx_rpc_utils.h" -#include "OMX_TI_IVCommon.h" -#include "profile.h" - -#ifdef ALLOCATE_TILER_BUFFER_IN_PROXY - -#ifdef USE_ION -#include <unistd.h> -#include <ion_ti/ion.h> -#include <sys/ioctl.h> -#include <sys/mman.h> -#include <sys/eventfd.h> -#include <fcntl.h> -#include <linux/rpmsg_omx.h> -#include <errno.h> -#endif - -#endif - -#ifdef ENABLE_GRALLOC_BUFFERS -#include "native_handle.h" -#include "hal_public.h" -#endif - -#ifdef TILER_BUFF -#define PortFormatIsNotYUV 0 - -static OMX_ERRORTYPE _RPC_IsProxyComponent(OMX_HANDLETYPE hComponent, - OMX_BOOL * bIsProxy); -OMX_ERRORTYPE RPC_UTIL_GetStride(OMX_COMPONENTTYPE * hRemoteComp, - OMX_U32 nPortIndex, OMX_U32 * nStride); -OMX_ERRORTYPE RPC_UTIL_GetNumLines(OMX_COMPONENTTYPE * hComp, - OMX_U32 nPortIndex, OMX_U32 * nNumOfLines); - -#endif - -#ifdef ALLOCATE_TILER_BUFFER_IN_PROXY - -static OMX_ERRORTYPE PROXY_UseBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_PTR pAppPrivate, - OMX_IN OMX_U32 nSizeBytes, OMX_IN OMX_U8 * pBuffer); -#endif - -#define LINUX_PAGE_SIZE 4096 -#define MAXNAMESIZE 128 - -#define CORE_MAX 4 -#define CORE_CHIRON 3 -#define CORE_SYSM3 2 -#define CORE_APPM3 1 -#define CORE_TESLA 0 - -#define MAX_CORENAME_LENGTH 32 -char Core_Array[][MAX_CORENAME_LENGTH] = - { "TESLA", "DUCATI1", "DUCATI0", "CHIRON" }; - -/****************************************************************** - * MACROS - LOCAL - ******************************************************************/ - -#ifdef USE_ION - - -RPC_OMX_ERRORTYPE RPC_RegisterBuffer(OMX_HANDLETYPE hRPCCtx, int fd, - OMX_PTR *handle1, OMX_PTR *handle2, - PROXY_BUFFER_TYPE proxyBufferType) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - int status; - RPC_OMX_CONTEXT *pRPCCtx = (RPC_OMX_CONTEXT *) hRPCCtx; - - if ((fd < 0) || (handle1 == NULL) || - ((proxyBufferType == GrallocPointers) && (handle2 == NULL))) { - eRPCError = RPC_OMX_ErrorBadParameter; - goto EXIT; - } - - if (proxyBufferType != GrallocPointers) { - struct ion_fd_data ion_data; - - ion_data.fd = fd; - ion_data.handle = NULL; - status = ioctl(pRPCCtx->fd_omx, OMX_IOCIONREGISTER, &ion_data); - if (status < 0) { - DOMX_ERROR("RegisterBuffer ioctl call failed"); - eRPCError = RPC_OMX_ErrorInsufficientResources; - goto EXIT; - } - if (ion_data.handle) - *handle1 = ion_data.handle; - } else { -#ifdef OMX_IOCPVRREGISTER - struct omx_pvr_data pvr_data; - - pvr_data.fd = fd; - memset(pvr_data.handles, 0x0, sizeof(pvr_data.handles)); - status = ioctl(pRPCCtx->fd_omx, OMX_IOCPVRREGISTER, &pvr_data); - if (status < 0) { - if (errno == ENOTTY) { - DOMX_DEBUG("OMX_IOCPVRREGISTER not supported with current kernel version"); - } else { - DOMX_ERROR("RegisterBuffer ioctl call failed"); - eRPCError = RPC_OMX_ErrorInsufficientResources; - } - goto EXIT; - } - - if (pvr_data.handles[0]) - *handle1 = pvr_data.handles[0]; - if (pvr_data.handles[1]) - *handle2 = pvr_data.handles[1]; -#endif - } - - - EXIT: - return eRPCError; -} - -RPC_OMX_ERRORTYPE RPC_UnRegisterBuffer(OMX_HANDLETYPE hRPCCtx, OMX_PTR handle) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - int status; - struct ion_fd_data data; - RPC_OMX_CONTEXT *pRPCCtx = (RPC_OMX_CONTEXT *) hRPCCtx; - - if (handle == NULL) { - eRPCError = RPC_OMX_ErrorBadParameter; - goto EXIT; - } - - data.handle = handle; - status = ioctl(pRPCCtx->fd_omx, OMX_IOCIONUNREGISTER, &data); - if (status < 0) { - eRPCError = RPC_OMX_ErrorInsufficientResources; - goto EXIT; - } - - EXIT: - return eRPCError; -} - -static OMX_ERRORTYPE PROXY_AllocateBufferIonCarveout(PROXY_COMPONENT_PRIVATE *pCompPrv, - size_t len, struct ion_handle **handle) -{ - int fd; - int ret; - struct ion_handle *temp; - size_t stride; - - ret = ion_alloc(pCompPrv->ion_fd, len, 0x1000, 1 << ION_HEAP_TYPE_CARVEOUT, &temp); - - if (ret || ((int)temp == -ENOMEM)) { - ret = ion_alloc_tiler(pCompPrv->ion_fd, len, 1, TILER_PIXEL_FMT_PAGE, - OMAP_ION_HEAP_TILER_MASK, &temp, &stride); - } - - if (ret || ((int)temp == -ENOMEM)) { - DOMX_ERROR("FAILED to allocate buffer of size=%d. ret=0x%x",len, ret); - return OMX_ErrorInsufficientResources; - } - - if (ret) - return OMX_ErrorInsufficientResources; - *handle = temp; - return OMX_ErrorNone; -} -#endif - -/* ===========================================================================*/ -/** - * @name PROXY_EventHandler() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_EventHandler(OMX_HANDLETYPE hComponent, - OMX_PTR pAppData, OMX_EVENTTYPE eEvent, OMX_U32 nData1, OMX_U32 nData2, - OMX_PTR pEventData) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PTR pTmpData = NULL; - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, - "This is fatal error, processing cant proceed - please debug"); - - DOMX_ENTER - ("hComponent=%p, pCompPrv=%p, eEvent=%p, nData1=%p, nData2=%p, pEventData=%p", - hComponent, pCompPrv, eEvent, nData1, nData2, pEventData); - - switch (eEvent) - { -#if 0 // This feature is currently not supported, so kept in if(0) to be supported in the future - case OMX_TI_EventBufferRefCount: - DOMX_DEBUG("Received Ref Count Event"); - /*nData1 will be pBufferHeader, nData2 will be present count. Need to find local - buffer header for nData1 which is remote buffer header */ - - PROXY_assert((nData1 != 0), OMX_ErrorBadParameter, - "Received NULL buffer header from OMX component"); - - /*find local buffer header equivalent */ - for (count = 0; count < pCompPrv->nTotalBuffers; ++count) - { - if (pCompPrv->tBufList[count].pBufHeaderRemote == - nData1) - { - pLocalBufHdr = - pCompPrv->tBufList[count].pBufHeader; - pLocalBufHdr->pBuffer = - (OMX_U8 *) pCompPrv->tBufList[count]. - pBufferActual; - break; - } - } - PROXY_assert((count != pCompPrv->nTotalBuffers), - OMX_ErrorBadParameter, - "Received invalid-buffer header from OMX component"); - - /*update local buffer header */ - nData1 = (OMX_U32) pLocalBufHdr; - break; -#endif - case OMX_EventMark: - DOMX_DEBUG("Received Mark Event"); - PROXY_assert((pEventData != NULL), OMX_ErrorUndefined, - "MarkData corrupted"); - pTmpData = pEventData; - pEventData = - ((PROXY_MARK_DATA *) pEventData)->pMarkDataActual; - TIMM_OSAL_Free(pTmpData); - break; - - default: - break; - } - - EXIT: - if (eError == OMX_ErrorNone) - { - pCompPrv->tCBFunc.EventHandler(hComponent, - pCompPrv->pILAppData, eEvent, nData1, nData2, pEventData); - } else if (pCompPrv) - { - pCompPrv->tCBFunc.EventHandler(hComponent, - pCompPrv->pILAppData, OMX_EventError, eError, 0, NULL); - } - - DOMX_EXIT("eError: %d", eError); - return OMX_ErrorNone; -} - -/* ===========================================================================*/ -/** - * @name PROXY_EmptyBufferDone() - * @brief - * @param - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -static OMX_ERRORTYPE PROXY_EmptyBufferDone(OMX_HANDLETYPE hComponent, - OMX_U32 remoteBufHdr, OMX_U32 nfilledLen, OMX_U32 nOffset, OMX_U32 nFlags) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U16 count; - OMX_BUFFERHEADERTYPE *pBufHdr = NULL; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, - "This is fatal error, processing cant proceed - please debug"); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent=%p, pCompPrv=%p, remoteBufHdr=%p, nFilledLen=%d, nOffset=%d, nFlags=%08x", - hComponent, pCompPrv, remoteBufHdr, nfilledLen, nOffset, nFlags); - - for (count = 0; count < pCompPrv->nTotalBuffers; ++count) - { - if (pCompPrv->tBufList[count].pBufHeaderRemote == - remoteBufHdr) - { - pBufHdr = pCompPrv->tBufList[count].pBufHeader; - pBufHdr->nFilledLen = nfilledLen; - pBufHdr->nOffset = nOffset; - pBufHdr->nFlags = nFlags; - /* Setting mark info to NULL. This would always be - NULL in EBD, whether component has propagated the - mark or has generated mark event */ - pBufHdr->hMarkTargetComponent = NULL; - pBufHdr->pMarkData = NULL; - break; - } - } - PROXY_assert((count != pCompPrv->nTotalBuffers), - OMX_ErrorBadParameter, - "Received invalid-buffer header from OMX component"); - - KPI_OmxCompBufferEvent(KPI_BUFFER_EBD, hComponent, &(pCompPrv->tBufList[count])); - - EXIT: - if (eError == OMX_ErrorNone) - { - pCompPrv->tCBFunc.EmptyBufferDone(hComponent, - pCompPrv->pILAppData, pBufHdr); - } else if (pCompPrv) - { - pCompPrv->tCBFunc.EventHandler(hComponent, - pCompPrv->pILAppData, OMX_EventError, eError, 0, NULL); - } - - DOMX_EXIT("eError: %d", eError); - return OMX_ErrorNone; -} - -/* ===========================================================================*/ -/** - * @name PROXY_FillBufferDone() - * @brief - * @param - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_FillBufferDone(OMX_HANDLETYPE hComponent, - OMX_U32 remoteBufHdr, OMX_U32 nfilledLen, OMX_U32 nOffset, OMX_U32 nFlags, - OMX_TICKS nTimeStamp, OMX_HANDLETYPE hMarkTargetComponent, - OMX_PTR pMarkData) -{ - - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U16 count; - OMX_BUFFERHEADERTYPE *pBufHdr = NULL; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, - "This is fatal error, processing cant proceed - please debug"); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent=%p, pCompPrv=%p, remoteBufHdr=%p, nFilledLen=%d, nOffset=%d, nFlags=%08x", - hComponent, pCompPrv, remoteBufHdr, nfilledLen, nOffset, nFlags); - - for (count = 0; count < pCompPrv->nTotalBuffers; ++count) - { - if (pCompPrv->tBufList[count].pBufHeaderRemote == - remoteBufHdr) - { - pBufHdr = pCompPrv->tBufList[count].pBufHeader; - pBufHdr->nFilledLen = nfilledLen; - pBufHdr->nOffset = nOffset; - pBufHdr->nFlags = nFlags; - pBufHdr->nTimeStamp = nTimeStamp; - if (pMarkData != NULL) - { - /*Update mark info in the buffer header */ - pBufHdr->pMarkData = - ((PROXY_MARK_DATA *) - pMarkData)->pMarkDataActual; - pBufHdr->hMarkTargetComponent = - ((PROXY_MARK_DATA *) - pMarkData)->hComponentActual; - TIMM_OSAL_Free(pMarkData); - } - break; - } - } - PROXY_assert((count != pCompPrv->nTotalBuffers), - OMX_ErrorBadParameter, - "Received invalid-buffer header from OMX component"); - - KPI_OmxCompBufferEvent(KPI_BUFFER_FBD, hComponent, &(pCompPrv->tBufList[count])); - - EXIT: - if (eError == OMX_ErrorNone) - { - pCompPrv->tCBFunc.FillBufferDone(hComponent, - pCompPrv->pILAppData, pBufHdr); - } else if (pCompPrv) - { - pCompPrv->tCBFunc.EventHandler(hComponent, - pCompPrv->pILAppData, OMX_EventError, eError, 0, NULL); - } - - DOMX_EXIT("eError: %d", eError); - return OMX_ErrorNone; -} - -/* ===========================================================================*/ -/** - * @name PROXY_EmptyThisBuffer() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_EmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U32 count = 0; - OMX_COMPONENTTYPE *pMarkComp = NULL; - PROXY_COMPONENT_PRIVATE *pMarkCompPrv = NULL; - OMX_PTR pMarkData = NULL; - OMX_BOOL bFreeMarkIfError = OMX_FALSE; - OMX_BOOL bIsProxy = OMX_FALSE , bMapBuffer; - - PROXY_require(pBufferHdr != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - PROXY_CHK_VERSION(pBufferHdr, OMX_BUFFERHEADERTYPE); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent=%p, pCompPrv=%p, nFilledLen=%d, nOffset=%d, nFlags=%08x", - hComponent, pCompPrv, pBufferHdr->nFilledLen, - pBufferHdr->nOffset, pBufferHdr->nFlags); - - /*First find the index of this buffer header to retrieve remote buffer header */ - for (count = 0; count < pCompPrv->nTotalBuffers; count++) - { - if (pCompPrv->tBufList[count].pBufHeader == pBufferHdr) - { - DOMX_DEBUG("Buffer Index of Match %d ", count); - break; - } - } - PROXY_assert((count != pCompPrv->nTotalBuffers), - OMX_ErrorBadParameter, - "Could not find the remote header in buffer list"); - - if (pBufferHdr->hMarkTargetComponent != NULL) - { - pMarkComp = - (OMX_COMPONENTTYPE *) (pBufferHdr->hMarkTargetComponent); - /* Check is mark comp is proxy */ - eError = _RPC_IsProxyComponent(pMarkComp, &bIsProxy); - PROXY_assert(eError == OMX_ErrorNone, eError, ""); - - /*Replacing original mark data with proxy specific structure */ - pMarkData = pBufferHdr->pMarkData; - pBufferHdr->pMarkData = - TIMM_OSAL_Malloc(sizeof(PROXY_MARK_DATA), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - PROXY_assert(pBufferHdr->pMarkData != NULL, - OMX_ErrorInsufficientResources, "Malloc failed"); - bFreeMarkIfError = OMX_TRUE; - ((PROXY_MARK_DATA *) (pBufferHdr-> - pMarkData))->hComponentActual = pMarkComp; - ((PROXY_MARK_DATA *) (pBufferHdr-> - pMarkData))->pMarkDataActual = pMarkData; - - /* If proxy comp then replace hMarkTargetComponent with remote - handle */ - if (bIsProxy) - { - pMarkCompPrv = pMarkComp->pComponentPrivate; - PROXY_assert(pMarkCompPrv != NULL, - OMX_ErrorBadParameter, NULL); - - /* Replacing with remote component handle */ - pBufferHdr->hMarkTargetComponent = - ((RPC_OMX_CONTEXT *) pMarkCompPrv->hRemoteComp)-> - hActualRemoteCompHandle; - } - } - - bMapBuffer = - pCompPrv->proxyPortBuffers[pBufferHdr->nInputPortIndex].proxyBufferType == - EncoderMetadataPointers; - - KPI_OmxCompBufferEvent(KPI_BUFFER_ETB, hComponent, &(pCompPrv->tBufList[count])); - - eRPCError = - RPC_EmptyThisBuffer(pCompPrv->hRemoteComp, pBufferHdr, - pCompPrv->tBufList[count].pBufHeaderRemote, &eCompReturn,bMapBuffer); - - PROXY_checkRpcError(); - - EXIT: - /*If ETB is about to return an error then this means that buffer has not - been accepted by the component. Thus the allocated mark data will be - lost so free it here. Also replace original mark data in the header */ - if ((eError != OMX_ErrorNone) && bFreeMarkIfError) - { - pBufferHdr->hMarkTargetComponent = - ((PROXY_MARK_DATA *) (pBufferHdr-> - pMarkData))->hComponentActual; - pMarkData = - ((PROXY_MARK_DATA *) (pBufferHdr-> - pMarkData))->pMarkDataActual; - TIMM_OSAL_Free(pBufferHdr->pMarkData); - pBufferHdr->pMarkData = pMarkData; - } - - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name PROXY_FillThisBuffer() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_FillThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U32 count = 0; - - PROXY_require(pBufferHdr != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - PROXY_CHK_VERSION(pBufferHdr, OMX_BUFFERHEADERTYPE); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nFilledLen = %d, nOffset = %d, nFlags = %08x", - hComponent, pCompPrv, pBufferHdr->nFilledLen, - pBufferHdr->nOffset, pBufferHdr->nFlags); - - /*First find the index of this buffer header to retrieve remote buffer header */ - for (count = 0; count < pCompPrv->nTotalBuffers; count++) - { - if (pCompPrv->tBufList[count].pBufHeader == pBufferHdr) - { - DOMX_DEBUG("Buffer Index of Match %d ", count); - break; - } - } - PROXY_assert((count != pCompPrv->nTotalBuffers), - OMX_ErrorBadParameter, - "Could not find the remote header in buffer list"); - - KPI_OmxCompBufferEvent(KPI_BUFFER_FTB, hComponent, &(pCompPrv->tBufList[count])); - - eRPCError = RPC_FillThisBuffer(pCompPrv->hRemoteComp, pBufferHdr, - pCompPrv->tBufList[count].pBufHeaderRemote, &eCompReturn); - - PROXY_checkRpcError(); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name PROXY_AllocateBuffer() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_AllocateBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, - OMX_IN OMX_U32 nPortIndex, - OMX_IN OMX_PTR pAppPrivate, OMX_IN OMX_U32 nSizeBytes) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U32 currentBuffer = 0, i = 0; - OMX_BOOL bSlotFound = OMX_FALSE; -#ifdef USE_ION - struct ion_handle *handle = NULL; - OMX_PTR pIonMappedBuffer = NULL; -#endif - -#ifdef ALLOCATE_TILER_BUFFER_IN_PROXY - // Do the tiler allocations in Proxy and call use buffers on Ducati. - - //Round Off the size to allocate and map to next page boundary. - OMX_U32 nSize = (nSizeBytes + LINUX_PAGE_SIZE - 1) & ~(LINUX_PAGE_SIZE - 1); - OMX_U32 nStride = 0; - OMX_U8* pMemptr = NULL; - OMX_CONFIG_RECTTYPE tParamRect; - OMX_PARAM_PORTDEFINITIONTYPE tParamPortDef; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - PROXY_require(ppBufferHdr != NULL, OMX_ErrorBadParameter, - "Pointer to buffer header is NULL"); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nPortIndex = %p, pAppPrivate = %p, nSizeBytes = %d", - hComponent, pCompPrv, nPortIndex, pAppPrivate, nSizeBytes); - - /*Pick up 1st empty slot */ - /*The same empty spot will be picked up by the subsequent - Use buffer call to fill in the corresponding buffer - Buffer header in the list */ - - bSlotFound = OMX_FALSE; - for (i = 0; i < pCompPrv->nTotalBuffers; i++) - { - if (pCompPrv->tBufList[i].pBufHeader == NULL) - { - currentBuffer = i; - bSlotFound = OMX_TRUE; - break; - } - } - - if (bSlotFound == OMX_FALSE) - { - currentBuffer = pCompPrv->nTotalBuffers; - } - - /*To find whether buffer is 2D or 1D */ - eError = - RPC_UTIL_GetStride(pCompPrv->hRemoteComp, nPortIndex, &nStride); - PROXY_assert(eError == OMX_ErrorNone, eError, - "Failed to get stride of component"); - - if (nStride == LINUX_PAGE_SIZE && \ - pCompPrv->proxyPortBuffers[nPortIndex].proxyBufferType != EncoderMetadataPointers) //Allocate 2D buffer - { -#if USE_ION - DOMX_ERROR ("Tiler 2d port buffers not implemented"); - eError = OMX_ErrorNotImplemented; - goto EXIT; -#endif - } -#ifdef USE_ION - else if (pCompPrv->bUseIon == OMX_TRUE) - { - eError = PROXY_AllocateBufferIonCarveout(pCompPrv, nSize, &handle); - pCompPrv->tBufList[currentBuffer].pYBuffer = handle; - if (pCompPrv->bMapIonBuffers == OMX_TRUE) - { - DOMX_DEBUG("before mapping, handle = %x, nSize = %d",handle,nSize); - if (ion_map(pCompPrv->ion_fd, handle, nSize, PROT_READ | PROT_WRITE, MAP_SHARED, 0, - &pIonMappedBuffer, &(pCompPrv->tBufList[currentBuffer].mmap_fd)) < 0) - { - DOMX_ERROR("userspace mapping of ION buffers returned error"); - eError = OMX_ErrorInsufficientResources; - goto EXIT; - } - } else { - if (ion_share(pCompPrv->ion_fd, handle, &(pCompPrv->tBufList[currentBuffer].mmap_fd)) < 0) { - DOMX_ERROR("ion_share failed !!! \n"); - goto EXIT; - } else { - DOMX_DEBUG("ion_share success pMemptr: 0x%x \n", pCompPrv->tBufList[currentBuffer].mmap_fd); - } - } - pMemptr = pCompPrv->tBufList[currentBuffer].mmap_fd; - DOMX_DEBUG ("Ion handle recieved = %x",handle); - if (eError != OMX_ErrorNone) - goto EXIT; - } -#endif - - /*No need to increment Allocated buffers here. - It will be done in the subsequent use buffer call below*/ - eError = PROXY_UseBuffer(hComponent, ppBufferHdr, nPortIndex, pAppPrivate, nSize, pMemptr); - - if(eError != OMX_ErrorNone) { - DOMX_ERROR("PROXY_UseBuffer in PROXY_AllocateBuffer failed with error %d (0x%08x)", eError, eError); -#ifdef USE_ION - ion_free(pCompPrv->ion_fd, - (struct ion_handle *)pCompPrv->tBufList[currentBuffer].pYBuffer); - close(pCompPrv->tBufList[currentBuffer].mmap_fd); -#endif - goto EXIT; - } - else { -#ifndef USE_ION - pCompPrv->tBufList[currentBuffer].pYBuffer = pMemptr; -#endif - } - -#ifdef USE_ION - if (pCompPrv->bUseIon == OMX_TRUE && pCompPrv->bMapIonBuffers == OMX_TRUE) - { - DOMX_DEBUG("before mapping, handle = %x, nSize = %d",handle,nSize); - (*ppBufferHdr)->pBuffer = pIonMappedBuffer; - } else { - (*ppBufferHdr)->pBuffer = (OMX_U8 *)handle; - } -#endif - -#else - //This code is the un-changed version of original implementation. - OMX_BUFFERHEADERTYPE *pBufferHeader = NULL; - OMX_U32 pBufHeaderRemote = 0; - OMX_U32 currentBuffer = 0, i = 0; - OMX_U8 *pBuffer = NULL; - OMX_TI_PLATFORMPRIVATE *pPlatformPrivate = NULL; - OMX_BOOL bSlotFound = OMX_FALSE; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_ERRORTYPE eCompReturn = OMX_ErrorNone; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - PROXY_require(ppBufferHdr != NULL, OMX_ErrorBadParameter, - "Pointer to buffer header is NULL"); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nPortIndex = %p, pAppPrivate = %p, nSizeBytes = %d", - hComponent, pCompPrv, nPortIndex, pAppPrivate, nSizeBytes); - - /*Pick up 1st empty slot */ - for (i = 0; i < pCompPrv->nTotalBuffers; i++) - { - if (pCompPrv->tBufList[i].pBufHeader == 0) - { - currentBuffer = i; - bSlotFound = OMX_TRUE; - break; - } - } - if (!bSlotFound) - { - currentBuffer = pCompPrv->nTotalBuffers; - } - - DOMX_DEBUG("In AB, no. of buffers = %d", pCompPrv->nTotalBuffers); - PROXY_assert((pCompPrv->nTotalBuffers < MAX_NUM_PROXY_BUFFERS), - OMX_ErrorInsufficientResources, - "Proxy cannot handle more than MAX buffers"); - - //Allocating Local bufferheader to be maintained locally within proxy - pBufferHeader = - (OMX_BUFFERHEADERTYPE *) - TIMM_OSAL_Malloc(sizeof(OMX_BUFFERHEADERTYPE), TIMM_OSAL_TRUE, 0, - TIMMOSAL_MEM_SEGMENT_INT); - PROXY_assert((pBufferHeader != NULL), OMX_ErrorInsufficientResources, - "Allocation of Buffer Header structure failed"); - - pPlatformPrivate = - (OMX_TI_PLATFORMPRIVATE *) - TIMM_OSAL_Malloc(sizeof(OMX_TI_PLATFORMPRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - PROXY_assert(pPlatformPrivate != NULL, OMX_ErrorInsufficientResources, - "Allocation of platform private structure failed"); - pBufferHeader->pPlatformPrivate = pPlatformPrivate; - - DOMX_DEBUG(" Calling RPC "); - - eRPCError = - RPC_AllocateBuffer(pCompPrv->hRemoteComp, &pBufferHeader, - nPortIndex, &pBufHeaderRemote, pAppPrivate, nSizeBytes, - &eCompReturn); - - PROXY_checkRpcError(); - - DOMX_DEBUG("Allocate Buffer Successful"); - DOMX_DEBUG("Value of pBufHeaderRemote: %p LocalBufferHdr :%p", - pBufHeaderRemote, pBufferHeader); - - pCompPrv->tBufList[currentBuffer].pBufHeader = pBufferHeader; - pCompPrv->tBufList[currentBuffer].pBufHeaderRemote = pBufHeaderRemote; - - - //keeping track of number of Buffers - pCompPrv->nAllocatedBuffers++; - - if (pCompPrv->nTotalBuffers < pCompPrv->nAllocatedBuffers) - { - pCompPrv->nTotalBuffers = pCompPrv->nAllocatedBuffers; - } - - *ppBufferHdr = pBufferHeader; - - EXIT: - if (eError != OMX_ErrorNone) - { - if (pPlatformPrivate) - TIMM_OSAL_Free(pPlatformPrivate); - if (pBufferHeader) - TIMM_OSAL_Free(pBufferHeader); - } - DOMX_EXIT("eError: %d", eError); - return eError; -#endif //ALLOCATE_TILER_BUFFER_IN_PROXY - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name PROXY_UseBuffer() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -static OMX_ERRORTYPE PROXY_UseBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_PTR pAppPrivate, - OMX_IN OMX_U32 nSizeBytes, OMX_IN OMX_U8 * pBuffer) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - OMX_BUFFERHEADERTYPE *pBufferHeader = NULL; - OMX_U32 pBufHeaderRemote = 0; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_U32 currentBuffer = 0, i = 0, nStride = 0, nNumLines = 0; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_TI_PLATFORMPRIVATE *pPlatformPrivate = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_BOOL bSlotFound = OMX_FALSE; - OMX_PTR pAuxBuf0 = pBuffer; - //OMX_PTR pMappedMetaDataBuffer = NULL; - OMX_TI_PARAM_METADATABUFFERINFO tMetaDataBuffer; - OMX_U32 nBufferHeight = 0; - OMX_CONFIG_RECTTYPE tParamRect; - OMX_PARAM_PORTDEFINITIONTYPE tParamPortDef; - -#ifdef USE_ION - OMX_PTR pMetadataBuffer = NULL; -#endif - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - PROXY_require(pBuffer != NULL, OMX_ErrorBadParameter, "Pointer to buffer is NULL"); - PROXY_require(ppBufferHdr != NULL, OMX_ErrorBadParameter, - "Pointer to buffer header is NULL"); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nPortIndex = %p, pAppPrivate = %p, nSizeBytes = %d, pBuffer = %p", - hComponent, pCompPrv, nPortIndex, pAppPrivate, nSizeBytes, - pBuffer); - - /*Pick up 1st empty slot */ - for (i = 0; i < pCompPrv->nTotalBuffers; i++) - { - if (pCompPrv->tBufList[i].pBufHeader == 0) - { - currentBuffer = i; - bSlotFound = OMX_TRUE; - break; - } - } - if (!bSlotFound) - { - currentBuffer = pCompPrv->nTotalBuffers; - } - DOMX_DEBUG("In UB, no. of buffers = %d", pCompPrv->nTotalBuffers); - - PROXY_assert((pCompPrv->nTotalBuffers < MAX_NUM_PROXY_BUFFERS), - OMX_ErrorInsufficientResources, - "Proxy cannot handle more than MAX buffers"); - - //Allocating Local bufferheader to be maintained locally within proxy - pBufferHeader = - (OMX_BUFFERHEADERTYPE *) - TIMM_OSAL_Malloc(sizeof(OMX_BUFFERHEADERTYPE), TIMM_OSAL_TRUE, 0, - TIMMOSAL_MEM_SEGMENT_INT); - PROXY_assert((pBufferHeader != NULL), OMX_ErrorInsufficientResources, - "Allocation of Buffer Header structure failed"); - - pPlatformPrivate = - (OMX_TI_PLATFORMPRIVATE *) - TIMM_OSAL_Malloc(sizeof(OMX_TI_PLATFORMPRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - PROXY_assert(pPlatformPrivate != NULL, OMX_ErrorInsufficientResources, - "Allocation of platform private structure failed"); - TIMM_OSAL_Memset(pPlatformPrivate, 0, sizeof(OMX_TI_PLATFORMPRIVATE)); - - pBufferHeader->pPlatformPrivate = pPlatformPrivate; - ((OMX_TI_PLATFORMPRIVATE *)pBufferHeader->pPlatformPrivate)->nSize = sizeof(OMX_TI_PLATFORMPRIVATE); - -#ifdef ENABLE_GRALLOC_BUFFERS - - if(pCompPrv->proxyPortBuffers[nPortIndex].proxyBufferType == GrallocPointers) - { - //Extracting buffer pointer from the gralloc buffer - pAuxBuf0 = (OMX_U8 *)(((IMG_native_handle_t*)pBuffer)->fd[0]); - } -#endif - - DOMX_DEBUG("Preparing buffer to Remote Core..."); - pBufferHeader->pBuffer = pBuffer; - /*To find whether buffer is 2D or 1D */ - eError = - RPC_UTIL_GetStride(pCompPrv->hRemoteComp, nPortIndex, &nStride); - PROXY_assert(eError == OMX_ErrorNone, eError, - "Failed to get stride of component"); - if (nStride == LINUX_PAGE_SIZE) - { - // Change this to extract UV pointer from gralloc handle once new gralloc interface is available - /*2D buffer, assume NV12 format */ - eError = - RPC_UTIL_GetNumLines(pCompPrv->hRemoteComp, nPortIndex, - &nNumLines); - PROXY_assert(eError == OMX_ErrorNone, eError, - "Failed to get num of lines"); - - if(pCompPrv->proxyPortBuffers[nPortIndex].proxyBufferType == GrallocPointers) - { - ((OMX_TI_PLATFORMPRIVATE *) pBufferHeader->pPlatformPrivate)-> - pAuxBuf1 = (OMX_U8 *)(((IMG_native_handle_t*)pBuffer)->fd[1]); - } - - if(pCompPrv->proxyPortBuffers[nPortIndex].proxyBufferType == EncoderMetadataPointers) - { - ((OMX_TI_PLATFORMPRIVATE *) pBufferHeader->pPlatformPrivate)-> - pAuxBuf1 = NULL; - } -#ifndef OMAP_TUNA - if(pCompPrv->proxyPortBuffers[nPortIndex].proxyBufferType == BufferDescriptorVirtual2D) - { - pAuxBuf0 = (OMX_U8 *)(((OMX_TI_BUFFERDESCRIPTOR_TYPE*)pBuffer)->pBuf[0]); - - ((OMX_TI_PLATFORMPRIVATE *) pBufferHeader->pPlatformPrivate)-> - pAuxBuf1 = (OMX_U8 *)(((OMX_TI_BUFFERDESCRIPTOR_TYPE*)pBuffer)->pBuf[1]); - } -#endif - } - - /*Initializing Structure */ - tMetaDataBuffer.nSize = sizeof(OMX_TI_PARAM_METADATABUFFERINFO); - tMetaDataBuffer.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - tMetaDataBuffer.nVersion.s.nVersionMinor = OMX_VER_MINOR; - tMetaDataBuffer.nVersion.s.nRevision = 0x0; - tMetaDataBuffer.nVersion.s.nStep = 0x0; - tMetaDataBuffer.nPortIndex = nPortIndex; - eError = PROXY_GetParameter(hComponent, (OMX_INDEXTYPE)OMX_TI_IndexParamMetaDataBufferInfo, (OMX_PTR)&tMetaDataBuffer); - PROXY_assert(eError == OMX_ErrorNone, eError, - "Get Parameter for Metadata infor failed"); - - DOMX_DEBUG("Metadata size = %d",tMetaDataBuffer.nMetaDataSize); - - if(tMetaDataBuffer.bIsMetaDataEnabledOnPort) - { -#ifdef USE_ION - ((OMX_TI_PLATFORMPRIVATE *)pBufferHeader->pPlatformPrivate)->nMetaDataSize = - (tMetaDataBuffer.nMetaDataSize + LINUX_PAGE_SIZE - 1) & ~(LINUX_PAGE_SIZE -1); - eError = PROXY_AllocateBufferIonCarveout(pCompPrv, ((OMX_TI_PLATFORMPRIVATE *)pBufferHeader->pPlatformPrivate)->nMetaDataSize, - (struct ion_handle **)(&(((OMX_TI_PLATFORMPRIVATE *)pBufferHeader->pPlatformPrivate)->pMetaDataBuffer))); - pCompPrv->tBufList[currentBuffer].pMetaDataBuffer = ((OMX_TI_PLATFORMPRIVATE *)pBufferHeader-> - pPlatformPrivate)->pMetaDataBuffer; - DOMX_DEBUG("Metadata buffer ion handle = %d",((OMX_TI_PLATFORMPRIVATE *)pBufferHeader->pPlatformPrivate)->pMetaDataBuffer); - if (pCompPrv->bMapIonBuffers == OMX_TRUE) { - if (ion_map(pCompPrv->ion_fd, pPlatformPrivate->pMetaDataBuffer, - pPlatformPrivate->nMetaDataSize, - PROT_READ | PROT_WRITE, MAP_SHARED, 0, - &pMetadataBuffer, - &(pCompPrv->tBufList[currentBuffer].mmap_fd_metadata_buff)) < 0) - { - DOMX_ERROR("userspace mapping of ION metadata buffers returned error"); - eError = OMX_ErrorInsufficientResources; - goto EXIT; - } - } -#endif - } - -#ifdef USE_ION - { - // Need to register buffers when using ion and rpmsg - eRPCError = RPC_RegisterBuffer(pCompPrv->hRemoteComp, pAuxBuf0, - &pCompPrv->tBufList[currentBuffer].pRegisteredAufBux0, - &pCompPrv->tBufList[currentBuffer].pRegisteredAufBux1, - pCompPrv->proxyPortBuffers[nPortIndex].proxyBufferType); - PROXY_checkRpcError(); - if (pCompPrv->tBufList[currentBuffer].pRegisteredAufBux0) - pAuxBuf0 = pCompPrv->tBufList[currentBuffer].pRegisteredAufBux0; - if (pCompPrv->tBufList[currentBuffer].pRegisteredAufBux1) - pPlatformPrivate->pAuxBuf1 = pCompPrv->tBufList[currentBuffer].pRegisteredAufBux1; - - if (pPlatformPrivate->pMetaDataBuffer != NULL) - { - int fd = -1; - if (pCompPrv->bMapIonBuffers == OMX_TRUE) { - fd = pCompPrv->tBufList[currentBuffer].mmap_fd_metadata_buff; - } else { - ion_share (pCompPrv->ion_fd, pPlatformPrivate->pMetaDataBuffer, &fd); - pCompPrv->tBufList[currentBuffer].mmap_fd_metadata_buff = fd; - } - eRPCError = RPC_RegisterBuffer(pCompPrv->hRemoteComp, fd, - &pCompPrv->tBufList[currentBuffer].pRegisteredAufBux2, NULL, IONPointers); - PROXY_checkRpcError(); - if (pCompPrv->tBufList[currentBuffer].pRegisteredAufBux2) - pPlatformPrivate->pMetaDataBuffer = pCompPrv->tBufList[currentBuffer].pRegisteredAufBux2; - } - } -#endif - - eRPCError = RPC_UseBuffer(pCompPrv->hRemoteComp, &pBufferHeader, nPortIndex, - pAppPrivate, nSizeBytes, pAuxBuf0, &pBufHeaderRemote, &eCompReturn); - - PROXY_checkRpcError(); - - DOMX_DEBUG("Use Buffer Successful"); - DOMX_DEBUG - ("Value of pBufHeaderRemote: %p LocalBufferHdr :%p, LocalBuffer :%p", - pBufHeaderRemote, pBufferHeader, pBufferHeader->pBuffer); - -#ifdef USE_ION - if (pCompPrv->bUseIon == OMX_TRUE && pCompPrv->bMapIonBuffers == OMX_TRUE && tMetaDataBuffer.bIsMetaDataEnabledOnPort) - { - ((OMX_TI_PLATFORMPRIVATE *)pBufferHeader->pPlatformPrivate)->pMetaDataBuffer = pMetadataBuffer; - //ion_free(pCompPrv->ion_fd, handleToMap); - memset(((OMX_TI_PLATFORMPRIVATE *)pBufferHeader->pPlatformPrivate)->pMetaDataBuffer, - 0x0, tMetaDataBuffer.nMetaDataSize); - } -#endif - - //Storing details of pBufferHeader/Mapped/Actual buffer address locally. - pCompPrv->tBufList[currentBuffer].pBufHeader = pBufferHeader; - pCompPrv->tBufList[currentBuffer].pBufHeaderRemote = pBufHeaderRemote; - - //keeping track of number of Buffers - pCompPrv->nAllocatedBuffers++; - if (pCompPrv->nTotalBuffers < pCompPrv->nAllocatedBuffers) - pCompPrv->nTotalBuffers = pCompPrv->nAllocatedBuffers; - - DOMX_DEBUG("Updating no. of buffer to %d", pCompPrv->nTotalBuffers); - - *ppBufferHdr = pBufferHeader; - - EXIT: - if (eError != OMX_ErrorNone) - { - if (pPlatformPrivate) - TIMM_OSAL_Free(pPlatformPrivate); - if (pBufferHeader) - TIMM_OSAL_Free(pBufferHeader); - } - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_FreeBuffer() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone, eTmpRPCError = - RPC_OMX_ErrorNone; - OMX_U32 count = 0, nStride = 0; - OMX_U32 pBuffer = 0; - OMX_PTR pMetaDataBuffer = NULL; - OMX_PTR pAuxBuf0 = NULL; - OMX_TI_PLATFORMPRIVATE * pPlatformPrivate = NULL; - - PROXY_require(pBufferHdr != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - PROXY_CHK_VERSION(pBufferHdr, OMX_BUFFERHEADERTYPE); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nPortIndex = %p, pBufferHdr = %p, pBuffer = %p", - hComponent, pCompPrv, nPortIndex, pBufferHdr, - pBufferHdr->pBuffer); - - for (count = 0; count < pCompPrv->nTotalBuffers; count++) - { - if (pCompPrv->tBufList[count].pBufHeader == pBufferHdr) - { - DOMX_DEBUG("Buffer Index of Match %d", count); - break; - } - } - PROXY_assert((count != pCompPrv->nTotalBuffers), - OMX_ErrorBadParameter, - "Could not find the mapped address in component private buffer list"); - - pBuffer = (OMX_U32)pBufferHdr->pBuffer; - pAuxBuf0 = (OMX_PTR) pBuffer; - -#ifdef ENABLE_GRALLOC_BUFFERS - if (pCompPrv->proxyPortBuffers[nPortIndex].proxyBufferType == GrallocPointers) - { - //Extracting buffer pointer from the gralloc buffer - pAuxBuf0 = (OMX_U8 *)(((IMG_native_handle_t*)pBuffer)->fd[0]); - } -#endif - - /*To find whether buffer is 2D or 1D */ - /*Not having asserts from this point since even if error occurs during - unmapping/freeing, still trying to clean up as much as possible */ - eError = - RPC_UTIL_GetStride(pCompPrv->hRemoteComp, nPortIndex, &nStride); -#ifndef OMAP_TUNA - if (eError == OMX_ErrorNone && nStride == LINUX_PAGE_SIZE) - { - if (pCompPrv->proxyPortBuffers[nPortIndex].proxyBufferType == BufferDescriptorVirtual2D) - { - pAuxBuf0 = (OMX_U8 *)(((OMX_TI_BUFFERDESCRIPTOR_TYPE*)pBuffer)->pBuf[0]); - } - } -#endif - - /*Not having asserts from this point since even if error occurs during - unmapping/freeing, still trying to clean up as much as possible */ - - if (pCompPrv->tBufList[count].pRegisteredAufBux0 != NULL) - pAuxBuf0 = pCompPrv->tBufList[count].pRegisteredAufBux0; - - eRPCError = - RPC_FreeBuffer(pCompPrv->hRemoteComp, nPortIndex, - pCompPrv->tBufList[count].pBufHeaderRemote, (OMX_U32) pAuxBuf0, - &eCompReturn); - - if (eRPCError != RPC_OMX_ErrorNone) - eTmpRPCError = eRPCError; - - pPlatformPrivate = (OMX_TI_PLATFORMPRIVATE *)(pCompPrv->tBufList[count].pBufHeader)-> - pPlatformPrivate; - - if (pCompPrv->tBufList[count].pBufHeader) - { -#ifdef ALLOCATE_TILER_BUFFER_IN_PROXY -#ifdef USE_ION - if(pCompPrv->tBufList[count].pYBuffer) - { - if (pCompPrv->bUseIon == OMX_TRUE) - { - if(pCompPrv->bMapIonBuffers == OMX_TRUE && pBufferHdr->pBuffer) - { - munmap(pBufferHdr->pBuffer, pBufferHdr->nAllocLen); - close(pCompPrv->tBufList[count].mmap_fd); - } - ion_free(pCompPrv->ion_fd, pCompPrv->tBufList[count].pYBuffer); - pCompPrv->tBufList[count].pYBuffer = NULL; - } - } -#endif -#endif - pMetaDataBuffer = pPlatformPrivate->pMetaDataBuffer; - if (pMetaDataBuffer) - { -#ifdef USE_ION - if (pCompPrv->bUseIon == OMX_TRUE) - { - if(pCompPrv->bMapIonBuffers == OMX_TRUE) - { - munmap(pMetaDataBuffer, pPlatformPrivate->nMetaDataSize); - } - close(pCompPrv->tBufList[count].mmap_fd_metadata_buff); - ion_free(pCompPrv->ion_fd, pCompPrv->tBufList[count].pMetaDataBuffer); - pPlatformPrivate->pMetaDataBuffer = NULL; - } -#endif - } - -#ifdef USE_ION - { - // Need to unregister buffers when using ion and rpmsg - if (pCompPrv->tBufList[count].pRegisteredAufBux0 != NULL) - { - eTmpRPCError = RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, - pCompPrv->tBufList[count].pRegisteredAufBux0); - if (eTmpRPCError != RPC_OMX_ErrorNone) { - eRPCError = eTmpRPCError; - } - } - - if (pCompPrv->tBufList[count].pRegisteredAufBux1 != NULL) - { - eTmpRPCError = RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, - pCompPrv->tBufList[count].pRegisteredAufBux1); - if (eTmpRPCError != RPC_OMX_ErrorNone) { - eRPCError = eTmpRPCError; - } - } - if (pCompPrv->tBufList[count].pRegisteredAufBux2 != NULL) - { - eTmpRPCError = RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, - pCompPrv->tBufList[count].pRegisteredAufBux2); - if (eTmpRPCError != RPC_OMX_ErrorNone) { - eRPCError = eTmpRPCError; - } - } - } -#endif - if (pCompPrv->tBufList[count].pBufHeader->pPlatformPrivate) - { - TIMM_OSAL_Free(pCompPrv->tBufList[count].pBufHeader-> - pPlatformPrivate); - } - TIMM_OSAL_Free(pCompPrv->tBufList[count].pBufHeader); - TIMM_OSAL_Memset(&(pCompPrv->tBufList[count]), 0, - sizeof(PROXY_BUFFER_INFO)); - } - pCompPrv->nAllocatedBuffers--; - - PROXY_checkRpcError(); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name PROXY_SetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE __PROXY_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_IN OMX_PTR pParamStruct, - OMX_PTR pLocBufNeedMap, OMX_U32 nNumOfLocalBuf) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; -#ifndef OMAP_TUNA - OMX_TI_PARAM_USEBUFFERDESCRIPTOR *ptBufDescParam = NULL; -#endif -#ifdef ENABLE_GRALLOC_BUFFERS - OMX_TI_PARAMUSENATIVEBUFFER *pParamNativeBuffer = NULL; -#endif -#ifdef USE_ION - OMX_PTR *pAuxBuf = pLocBufNeedMap; - OMX_PTR pRegistered = NULL; -#endif - - PROXY_require((pParamStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nParamIndex = %d, pParamStruct = %p", - hComponent, pCompPrv, nParamIndex, pParamStruct); - - switch(nParamIndex) - { -#ifdef ENABLE_GRALLOC_BUFFERS - case OMX_TI_IndexUseNativeBuffers: - { - //Add check version. - pParamNativeBuffer = (OMX_TI_PARAMUSENATIVEBUFFER* )pParamStruct; - if(pParamNativeBuffer->bEnable == OMX_TRUE) - { - pCompPrv->proxyPortBuffers[pParamNativeBuffer->nPortIndex].proxyBufferType = GrallocPointers; - pCompPrv->proxyPortBuffers[pParamNativeBuffer->nPortIndex].IsBuffer2D = OMX_TRUE; - } else - { - /* Reset to defaults */ - pCompPrv->proxyPortBuffers[pParamNativeBuffer->nPortIndex].proxyBufferType = VirtualPointers; - pCompPrv->proxyPortBuffers[pParamNativeBuffer->nPortIndex].IsBuffer2D = OMX_FALSE; - } - - break; - } -#endif -#ifndef OMAP_TUNA - case OMX_TI_IndexUseBufferDescriptor: - ptBufDescParam = (OMX_TI_PARAM_USEBUFFERDESCRIPTOR *) pParamStruct; - if(ptBufDescParam->bEnabled == OMX_TRUE) - { - if(ptBufDescParam->eBufferType == OMX_TI_BufferTypeVirtual2D) - { - pCompPrv->proxyPortBuffers[ptBufDescParam->nPortIndex].proxyBufferType = BufferDescriptorVirtual2D; - pCompPrv->proxyPortBuffers[ptBufDescParam->nPortIndex].IsBuffer2D = OMX_TRUE; - } - } - else if(ptBufDescParam->bEnabled == OMX_FALSE) - { - /* Reset to defaults*/ - pCompPrv->proxyPortBuffers[ptBufDescParam->nPortIndex].proxyBufferType = VirtualPointers; - pCompPrv->proxyPortBuffers[ptBufDescParam->nPortIndex].IsBuffer2D = OMX_FALSE; - } - eRPCError = - RPC_SetParameter(pCompPrv->hRemoteComp, nParamIndex, pParamStruct, - pLocBufNeedMap, nNumOfLocalBuf, &eCompReturn); - break; -#endif - default: - { -#ifdef USE_ION - if (pAuxBuf != NULL) { - int fd = *((int*)pAuxBuf); - if (fd > -1) { - eRPCError = RPC_RegisterBuffer(pCompPrv->hRemoteComp, *((int*)pAuxBuf), - &pRegistered, NULL, IONPointers); - PROXY_checkRpcError(); - if (pRegistered) - *pAuxBuf = pRegistered; - } - } -#endif - eRPCError = - RPC_SetParameter(pCompPrv->hRemoteComp, nParamIndex, pParamStruct, - pLocBufNeedMap, nNumOfLocalBuf, &eCompReturn); -#ifdef USE_ION - PROXY_checkRpcError(); - if (pRegistered != NULL) { - eRPCError = RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, pRegistered); - PROXY_checkRpcError(); - } -#endif - } - } - - PROXY_checkRpcError(); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_SetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_IN OMX_PTR pParamStruct) -{ - return __PROXY_SetParameter(hComponent, nParamIndex, pParamStruct, NULL, 0); -} - - -/* ===========================================================================*/ -/** - * @name __PROXY_GetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE __PROXY_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct, - OMX_PTR pLocBufNeedMap) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; -#ifndef OMAP_TUNA - OMX_TI_PARAM_USEBUFFERDESCRIPTOR *ptBufDescParam = NULL; -#endif -#ifdef USE_ION - OMX_PTR *pAuxBuf = pLocBufNeedMap; - OMX_PTR pRegistered = NULL; -#endif - - PROXY_require((pParamStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_assert((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nParamIndex = %d, pParamStruct = %p", - hComponent, pCompPrv, nParamIndex, pParamStruct); - - switch(nParamIndex) - { -#ifndef OMAP_TUNA - case OMX_TI_IndexUseBufferDescriptor: - ptBufDescParam = (OMX_TI_PARAM_USEBUFFERDESCRIPTOR *) pParamStruct; - if(pCompPrv->proxyPortBuffers[ptBufDescParam->nPortIndex].proxyBufferType == BufferDescriptorVirtual2D) - { - ptBufDescParam->bEnabled = OMX_TRUE; - ptBufDescParam->eBufferType = OMX_TI_BufferTypeVirtual2D; - } - else - { - ptBufDescParam->bEnabled = OMX_FALSE; - ptBufDescParam->eBufferType = OMX_TI_BufferTypeMax; - } - break; -#endif - default: - { -#ifdef USE_ION - if (pAuxBuf != NULL) { - int fd = *((int*)pAuxBuf); - if (fd > -1) { - eRPCError = RPC_RegisterBuffer(pCompPrv->hRemoteComp, *((int*)pAuxBuf), - &pRegistered, NULL, IONPointers); - PROXY_checkRpcError(); - if (pRegistered) - *pAuxBuf = pRegistered; - } - } -#endif - eRPCError = RPC_GetParameter(pCompPrv->hRemoteComp, nParamIndex, pParamStruct, - pLocBufNeedMap, &eCompReturn); -#ifdef USE_ION - PROXY_checkRpcError(); - if (pRegistered != NULL) { - eRPCError = RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, pRegistered); - PROXY_checkRpcError(); - } -#endif - } - } - - PROXY_checkRpcError(); - -EXIT: - DOMX_EXIT("eError: %d index: 0x%x", eError, nParamIndex); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_GetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct) -{ - return __PROXY_GetParameter(hComponent, nParamIndex, pParamStruct, NULL); -} - -/* ===========================================================================*/ -/** - * @name __PROXY_GetConfig() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE __PROXY_GetConfig(OMX_HANDLETYPE hComponent, - OMX_INDEXTYPE nConfigIndex, OMX_PTR pConfigStruct, OMX_PTR pLocBufNeedMap) -{ -#ifdef USE_ION - OMX_PTR *pAuxBuf = pLocBufNeedMap; - OMX_PTR pRegistered = NULL; -#endif - - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - - PROXY_require((pConfigStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER("hComponent = %p, pCompPrv = %p, nConfigIndex = %d, " - "pConfigStruct = %p", - hComponent, pCompPrv, nConfigIndex, - pConfigStruct); - -#ifdef USE_ION - if (pAuxBuf != NULL) { - int fd = *((int*)pAuxBuf); - if (fd > -1) { - eRPCError = RPC_RegisterBuffer(pCompPrv->hRemoteComp, *((int*)pAuxBuf), - &pRegistered, NULL, IONPointers); - PROXY_checkRpcError(); - if (pRegistered) - *pAuxBuf = pRegistered; - } - } -#endif - - eRPCError = - RPC_GetConfig(pCompPrv->hRemoteComp, nConfigIndex, pConfigStruct, - pLocBufNeedMap, &eCompReturn); -#ifdef USE_ION - PROXY_checkRpcError(); - if (pRegistered != NULL) { - eRPCError = RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, pRegistered); - PROXY_checkRpcError(); - } -#endif - - PROXY_checkRpcError(); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_GetConfig() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_GetConfig(OMX_HANDLETYPE hComponent, - OMX_INDEXTYPE nConfigIndex, OMX_PTR pConfigStruct) -{ - return __PROXY_GetConfig(hComponent, nConfigIndex, pConfigStruct, NULL); -} - -/* ===========================================================================*/ -/** - * @name __PROXY_SetConfig() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE __PROXY_SetConfig(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nConfigIndex, OMX_IN OMX_PTR pConfigStruct, - OMX_PTR pLocBufNeedMap) -{ -#ifdef USE_ION - OMX_PTR *pAuxBuf = pLocBufNeedMap; - OMX_PTR pRegistered = NULL; -#endif - - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - - PROXY_require((pConfigStruct != NULL), OMX_ErrorBadParameter, NULL); - - PROXY_assert((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER("hComponent = %p, pCompPrv = %p, nConfigIndex = %d, " - "pConfigStruct = %p", - hComponent, pCompPrv, nConfigIndex, - pConfigStruct); - -#ifdef USE_ION - if (pAuxBuf != NULL) { - int fd = *((int*)pAuxBuf); - if (fd > -1) { - eRPCError = RPC_RegisterBuffer(pCompPrv->hRemoteComp, *((int*)pAuxBuf), - &pRegistered, NULL, IONPointers); - PROXY_checkRpcError(); - if (pRegistered) - *pAuxBuf = pRegistered; - } - } -#endif - - eRPCError = - RPC_SetConfig(pCompPrv->hRemoteComp, nConfigIndex, pConfigStruct, - pLocBufNeedMap, &eCompReturn); - -#ifdef USE_ION - PROXY_checkRpcError(); - if (pRegistered != NULL) { - eRPCError = RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, pRegistered); - PROXY_checkRpcError(); - } -#endif - - PROXY_checkRpcError(); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_SetConfig() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_SetConfig(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nConfigIndex, OMX_IN OMX_PTR pConfigStruct) -{ - return __PROXY_SetConfig(hComponent, nConfigIndex, pConfigStruct, NULL); -} - - -/* ===========================================================================*/ -/** - * @name PROXY_GetState() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -static OMX_ERRORTYPE PROXY_GetState(OMX_IN OMX_HANDLETYPE hComponent, - OMX_OUT OMX_STATETYPE * pState) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_COMPONENTTYPE *hComp = hComponent; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - - PROXY_require((pState != NULL), OMX_ErrorBadParameter, NULL); - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER("hComponent = %p, pCompPrv = %p", hComponent, pCompPrv); - - eRPCError = RPC_GetState(pCompPrv->hRemoteComp, pState, &eCompReturn); - - DOMX_DEBUG("Returned from RPC_GetState, state: = %x", *pState); - - PROXY_checkRpcError(); - - EXIT: - if (eError == OMX_ErrorHardware) - { - *pState = OMX_StateInvalid; - eError = OMX_ErrorNone; - DOMX_DEBUG("Invalid state returned from RPC_GetState, state due to ducati in faulty state"); - } - DOMX_EXIT("eError: %d", eError); - return eError; -} - - - -/* ===========================================================================*/ -/** - * @name PROXY_SendCommand() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_SendCommand(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_COMMANDTYPE eCmd, - OMX_IN OMX_U32 nParam, OMX_IN OMX_PTR pCmdData) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_COMPONENTTYPE *pMarkComp = NULL; - PROXY_COMPONENT_PRIVATE *pMarkCompPrv = NULL; - OMX_PTR pMarkData = NULL, pMarkToBeFreedIfError = NULL; - OMX_BOOL bIsProxy = OMX_FALSE; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, eCmd = %d, nParam = %d, pCmdData = %p", - hComponent, pCompPrv, eCmd, nParam, pCmdData); - - if (eCmd == OMX_CommandMarkBuffer) - { - PROXY_require(pCmdData != NULL, OMX_ErrorBadParameter, NULL); - pMarkComp = (OMX_COMPONENTTYPE *) - (((OMX_MARKTYPE *) pCmdData)->hMarkTargetComponent); - PROXY_require(pMarkComp != NULL, OMX_ErrorBadParameter, NULL); - - /* To check if mark comp is a proxy or a real component */ - eError = _RPC_IsProxyComponent(pMarkComp, &bIsProxy); - PROXY_assert(eError == OMX_ErrorNone, eError, ""); - - /*Replacing original mark data with proxy specific structure */ - pMarkData = ((OMX_MARKTYPE *) pCmdData)->pMarkData; - ((OMX_MARKTYPE *) pCmdData)->pMarkData = - TIMM_OSAL_Malloc(sizeof(PROXY_MARK_DATA), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - PROXY_assert(((OMX_MARKTYPE *) pCmdData)->pMarkData != NULL, - OMX_ErrorInsufficientResources, "Malloc failed"); - pMarkToBeFreedIfError = - ((OMX_MARKTYPE *) pCmdData)->pMarkData; - ((PROXY_MARK_DATA *) (((OMX_MARKTYPE *) - pCmdData)->pMarkData))->hComponentActual = - pMarkComp; - ((PROXY_MARK_DATA *) (((OMX_MARKTYPE *) - pCmdData)->pMarkData))->pMarkDataActual = - pMarkData; - - /* If it is proxy component then replace hMarkTargetComponent - with remote handle */ - if (bIsProxy) - { - pMarkCompPrv = pMarkComp->pComponentPrivate; - PROXY_assert(pMarkCompPrv != NULL, - OMX_ErrorBadParameter, NULL); - - /* Replacing with remote component handle */ - ((OMX_MARKTYPE *) pCmdData)->hMarkTargetComponent = - ((RPC_OMX_CONTEXT *) pMarkCompPrv->hRemoteComp)-> - hActualRemoteCompHandle; - } - } - - eRPCError = - RPC_SendCommand(pCompPrv->hRemoteComp, eCmd, nParam, pCmdData, - &eCompReturn); - - if (eCmd == OMX_CommandMarkBuffer && bIsProxy) - { - /*Resetting to original values */ - ((OMX_MARKTYPE *) pCmdData)->hMarkTargetComponent = pMarkComp; - ((OMX_MARKTYPE *) pCmdData)->pMarkData = pMarkData; - } - - PROXY_checkRpcError(); - - EXIT: - /*If SendCommand is about to return an error then this means that the - command has not been accepted by the component. Thus the allocated mark data - will be lost so free it here */ - if ((eError != OMX_ErrorNone) && pMarkToBeFreedIfError) - { - TIMM_OSAL_Free(pMarkToBeFreedIfError); - } - DOMX_EXIT("eError: %d", eError); - return eError; -} - - - -/* ===========================================================================*/ -/** - * @name PROXY_GetComponentVersion() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -static OMX_ERRORTYPE PROXY_GetComponentVersion(OMX_IN OMX_HANDLETYPE - hComponent, OMX_OUT OMX_STRING pComponentName, - OMX_OUT OMX_VERSIONTYPE * pComponentVersion, - OMX_OUT OMX_VERSIONTYPE * pSpecVersion, - OMX_OUT OMX_UUIDTYPE * pComponentUUID) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = hComponent; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - - DOMX_ENTER("hComponent = %p, pCompPrv = %p", hComponent, pCompPrv); - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - PROXY_require(pComponentName != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(pComponentVersion != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(pSpecVersion != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(pComponentUUID != NULL, OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - eRPCError = RPC_GetComponentVersion(pCompPrv->hRemoteComp, - pComponentName, - pComponentVersion, pSpecVersion, pComponentUUID, &eCompReturn); - - PROXY_checkRpcError(); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - - -/* ===========================================================================*/ -/** - * @name PROXY_GetExtensionIndex() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE * pIndexType) -{ - - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = hComponent; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - PROXY_require(cParameterName != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(pIndexType != NULL, OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER("hComponent = %p, pCompPrv = %p, cParameterName = %s", - hComponent, pCompPrv, cParameterName); - - -#ifdef ENABLE_GRALLOC_BUFFERS - // Check for NULL Parameters - PROXY_require((cParameterName != NULL && pIndexType != NULL), - OMX_ErrorBadParameter, NULL); - - // Ensure that String length is not greater than Max allowed length - PROXY_require(strlen(cParameterName) <= 127, OMX_ErrorBadParameter, NULL); - - if(strcmp(cParameterName, "OMX.google.android.index.enableAndroidNativeBuffers") == 0) - { - // If Index type is 2D Buffer Allocated Dimension - *pIndexType = (OMX_INDEXTYPE) OMX_TI_IndexUseNativeBuffers; - goto EXIT; - } - else if (strcmp(cParameterName, "OMX.google.android.index.useAndroidNativeBuffer2") == 0) - { - //This is call just a dummy for android to support backward compatibility - *pIndexType = (OMX_INDEXTYPE) NULL; - goto EXIT; - } - else - { - eRPCError = RPC_GetExtensionIndex(pCompPrv->hRemoteComp, - cParameterName, pIndexType, &eCompReturn); - - PROXY_checkRpcError(); - } -#else - eRPCError = RPC_GetExtensionIndex(pCompPrv->hRemoteComp, - cParameterName, pIndexType, &eCompReturn); - - PROXY_checkRpcError(); -#endif - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - - - -/* ===========================================================================*/ -/** - * @name PROXY_ComponentRoleEnum() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -static OMX_ERRORTYPE PROXY_ComponentRoleEnum(OMX_IN OMX_HANDLETYPE hComponent, - OMX_OUT OMX_U8 * cRole, OMX_IN OMX_U32 nIndex) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - - DOMX_ENTER("hComponent = %p", hComponent); - DOMX_DEBUG(" EMPTY IMPLEMENTATION "); - - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name PROXY_ComponentTunnelRequest() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -static OMX_ERRORTYPE PROXY_ComponentTunnelRequest(OMX_IN OMX_HANDLETYPE - hComponent, OMX_IN OMX_U32 nPort, OMX_IN OMX_HANDLETYPE hTunneledComp, - OMX_IN OMX_U32 nTunneledPort, - OMX_INOUT OMX_TUNNELSETUPTYPE * pTunnelSetup) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - - DOMX_ENTER("hComponent = %p", hComponent); - DOMX_DEBUG(" EMPTY IMPLEMENTATION "); - PROXY_COMPONENT_PRIVATE *pOutCompPrv = NULL; - PROXY_COMPONENT_PRIVATE *pInCompPrv = NULL; - OMX_COMPONENTTYPE *hOutComp = hComponent; - OMX_COMPONENTTYPE *hInComp = hTunneledComp; - OMX_ERRORTYPE eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_assert((hOutComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - PROXY_assert((hInComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - //TBD - //PROXY_assert(nPort != 1, OMX_ErrorBadParameter, NULL); - //PROXY_assert(nTunnelPort != 0, OMX_ErrorBadParameter, NULL); - pOutCompPrv = (PROXY_COMPONENT_PRIVATE *) hOutComp->pComponentPrivate; - pInCompPrv = (PROXY_COMPONENT_PRIVATE *) hInComp->pComponentPrivate; - DOMX_ENTER("hOutComp=%p, pOutCompPrv=%p, hInComp=%p, pInCompPrv=%p, nOutPort=%d, nInPort=%d \n", - hOutComp, pOutCompPrv, hInComp, pInCompPrv, nPort, nTunneledPort); - - DOMX_INFO("PROXY_ComponentTunnelRequest:: hOutComp=%p, pOutCompPrv=%p, hInComp=%p, pInCompPrv=%p, nOutPort=%d, nInPort=%d \n ", - hOutComp, pOutCompPrv, hInComp, pInCompPrv, nPort, nTunneledPort); - eRPCError = RPC_ComponentTunnelRequest(pOutCompPrv->hRemoteComp, nPort, - pInCompPrv->hRemoteComp, nTunneledPort, pTunnelSetup, &eCompReturn); - DOMX_INFO("\nafter: RPC_ComponentTunnelRequest = 0x%x\n ", eRPCError); - PROXY_checkRpcError(); - -EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name PROXY_SetCallbacks() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -static OMX_ERRORTYPE PROXY_SetCallbacks(OMX_HANDLETYPE hComponent, - OMX_CALLBACKTYPE * pCallBacks, OMX_PTR pAppData) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - - PROXY_require((pCallBacks != NULL), OMX_ErrorBadParameter, NULL); - - PROXY_assert((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER("hComponent = %p, pCompPrv = %p", hComponent, pCompPrv); - - /*Store App callback and data to proxy- managed by proxy */ - pCompPrv->tCBFunc = *pCallBacks; - pCompPrv->pILAppData = pAppData; - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name PROXY_UseEGLImage() - * @brief : This returns error not implemented by default as no component - * implements this. In case there is a requiremet, support for this - * can be added later. - * - */ -/* ===========================================================================*/ -static OMX_ERRORTYPE PROXY_UseEGLImage(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE ** ppBufferHdr, - OMX_U32 nPortIndex, OMX_PTR pAppPrivate, void *pBuffer) -{ - return OMX_ErrorNotImplemented; -} - - -/* ===========================================================================*/ -/** - * @name PROXY_ComponentDeInit() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_ComponentDeInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone, eTmpRPCError = - RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U32 count = 0, nStride = 0; - OMX_PTR pMetaDataBuffer = NULL; - - DOMX_ENTER("hComponent = %p", hComponent); - - PROXY_assert((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - ion_close(pCompPrv->ion_fd); - - for (count = 0; count < pCompPrv->nTotalBuffers; count++) - { - if (pCompPrv->tBufList[count].pBufHeader) - { -#ifdef ALLOCATE_TILER_BUFFER_IN_PROXY - if(pCompPrv->tBufList[count].pYBuffer) - { -#ifdef USE_ION - if(pCompPrv->tBufList[count].pYBuffer) - { - if (pCompPrv->bUseIon == OMX_TRUE) - { - if(pCompPrv->bMapIonBuffers == OMX_TRUE) - { - munmap(pCompPrv->tBufList[count].pBufHeader->pBuffer, pCompPrv->tBufList[count].pBufHeader->nAllocLen); - close(pCompPrv->tBufList[count].mmap_fd); - } - ion_free(pCompPrv->ion_fd, pCompPrv->tBufList[count].pYBuffer); - pCompPrv->tBufList[count].pYBuffer = NULL; - } - } -#endif - } -#endif - pMetaDataBuffer = ((OMX_TI_PLATFORMPRIVATE *)(pCompPrv->tBufList[count].pBufHeader)-> - pPlatformPrivate)->pMetaDataBuffer; - if (pMetaDataBuffer) - { -#ifdef USE_ION - if (pCompPrv->bUseIon == OMX_TRUE) - { - if(pCompPrv->bMapIonBuffers == OMX_TRUE) - { - munmap(pMetaDataBuffer, ((OMX_TI_PLATFORMPRIVATE *)(pCompPrv->tBufList[count].pBufHeader)-> - pPlatformPrivate)->nMetaDataSize); - } - close(pCompPrv->tBufList[count].mmap_fd_metadata_buff); - ion_free(pCompPrv->ion_fd, pMetaDataBuffer); - ((OMX_TI_PLATFORMPRIVATE *)(pCompPrv->tBufList[count].pBufHeader)-> - pPlatformPrivate)->pMetaDataBuffer = NULL; - } -#endif - } - if (pCompPrv->tBufList[count].pBufHeader->pPlatformPrivate) - { - TIMM_OSAL_Free(pCompPrv->tBufList[count].pBufHeader-> - pPlatformPrivate); - } - TIMM_OSAL_Free(pCompPrv->tBufList[count].pBufHeader); - TIMM_OSAL_Memset(&(pCompPrv->tBufList[count]), 0, - sizeof(PROXY_BUFFER_INFO)); - } - } - - KPI_OmxCompDeinit(hComponent); - - eRPCError = RPC_FreeHandle(pCompPrv->hRemoteComp, &eCompReturn); - if (eRPCError != RPC_OMX_ErrorNone) - eTmpRPCError = eRPCError; - - eRPCError = RPC_InstanceDeInit(pCompPrv->hRemoteComp); - if (eRPCError != RPC_OMX_ErrorNone) - eTmpRPCError = eRPCError; - - if (pCompPrv->cCompName) - { - TIMM_OSAL_Free(pCompPrv->cCompName); - } - - if (pCompPrv) - { - TIMM_OSAL_Free(pCompPrv); - } - - eRPCError = eTmpRPCError; - PROXY_checkRpcError(); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name OMX_ProxyCommonInit() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE OMX_ProxyCommonInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_HANDLETYPE hRemoteComp = NULL; - OMX_U32 i = 0; - - DOMX_ENTER("hComponent = %p", hComponent); - - TIMM_OSAL_UpdateTraceLevel(); - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - pCompPrv->nTotalBuffers = 0; - pCompPrv->nAllocatedBuffers = 0; - pCompPrv->proxyEmptyBufferDone = PROXY_EmptyBufferDone; - pCompPrv->proxyFillBufferDone = PROXY_FillBufferDone; - pCompPrv->proxyEventHandler = PROXY_EventHandler; - - for (i=0; i<PROXY_MAXNUMOFPORTS ; i++) - { - pCompPrv->proxyPortBuffers[i].proxyBufferType = VirtualPointers; - } - - eRPCError = RPC_InstanceInit(pCompPrv->cCompName, &hRemoteComp); - PROXY_assert(eRPCError == RPC_OMX_ErrorNone, - OMX_ErrorUndefined, "Error initializing RPC"); - PROXY_assert(hRemoteComp != NULL, - OMX_ErrorUndefined, "Error initializing RPC"); - - //Send the proxy component handle for pAppData - eRPCError = - RPC_GetHandle(hRemoteComp, pCompPrv->cCompName, - (OMX_PTR) hComponent, NULL, &eCompReturn); - - PROXY_checkRpcError(); - - hComp->SetCallbacks = PROXY_SetCallbacks; - hComp->ComponentDeInit = PROXY_ComponentDeInit; - hComp->UseBuffer = PROXY_UseBuffer; - hComp->GetParameter = PROXY_GetParameter; - hComp->SetParameter = PROXY_SetParameter; - hComp->EmptyThisBuffer = PROXY_EmptyThisBuffer; - hComp->FillThisBuffer = PROXY_FillThisBuffer; - hComp->GetComponentVersion = PROXY_GetComponentVersion; - hComp->SendCommand = PROXY_SendCommand; - hComp->GetConfig = PROXY_GetConfig; - hComp->SetConfig = PROXY_SetConfig; - hComp->GetState = PROXY_GetState; - hComp->GetExtensionIndex = PROXY_GetExtensionIndex; - hComp->FreeBuffer = PROXY_FreeBuffer; - hComp->ComponentRoleEnum = PROXY_ComponentRoleEnum; - hComp->AllocateBuffer = PROXY_AllocateBuffer; - hComp->ComponentTunnelRequest = PROXY_ComponentTunnelRequest; - hComp->UseEGLImage = PROXY_UseEGLImage; - - pCompPrv->hRemoteComp = hRemoteComp; - -#ifdef USE_ION - pCompPrv->bUseIon = OMX_TRUE; - pCompPrv->bMapIonBuffers = OMX_TRUE; - - pCompPrv->ion_fd = ion_open(); - if(pCompPrv->ion_fd == 0) - { - DOMX_ERROR("ion_open failed!!!"); - return OMX_ErrorInsufficientResources; - } -#endif - - KPI_OmxCompInit(hComponent); - - EXIT: - if (eError != OMX_ErrorNone) - RPC_InstanceDeInit(hRemoteComp); - DOMX_EXIT("eError: %d", eError); - - return eError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_UTIL_GetStride() - * @brief Gets stride on this port. Used to determine whether buffer is 1D or 2D - * @param hRemoteComp [IN] : Remote component handle. - * @param nPortIndex [IN] : Port index. - * @param nStride [OUT] : Stride returned by the component. - * @return OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -OMX_ERRORTYPE RPC_UTIL_GetStride(OMX_COMPONENTTYPE * hRemoteComp, - OMX_U32 nPortIndex, OMX_U32 * nStride) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_PARAM_PORTDEFINITIONTYPE sPortDef; - - /*Initializing Structure */ - sPortDef.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); - sPortDef.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - sPortDef.nVersion.s.nVersionMinor = OMX_VER_MINOR; - sPortDef.nVersion.s.nRevision = 0x0; - sPortDef.nVersion.s.nStep = 0x0; - sPortDef.nPortIndex = nPortIndex; - - eRPCError = - RPC_GetParameter(hRemoteComp, OMX_IndexParamPortDefinition, - (OMX_PTR) (&sPortDef), NULL, &eCompReturn); - PROXY_checkRpcError(); - - if (sPortDef.eDomain == OMX_PortDomainVideo) - { - *nStride = sPortDef.format.video.nStride; - } else if (sPortDef.eDomain == OMX_PortDomainImage) - { - *nStride = sPortDef.format.image.nStride; - } else if (sPortDef.eDomain == OMX_PortDomainMax && nPortIndex == 0) - { - /*Temp - just for testing sample */ - *nStride = LINUX_PAGE_SIZE; - } else - { - *nStride = 0; - } - - EXIT: - return eError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_UTIL_GetNumLines() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE RPC_UTIL_GetNumLines(OMX_COMPONENTTYPE * hRemoteComp, - OMX_U32 nPortIndex, OMX_U32 * nNumOfLines) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_ERRORTYPE eCompReturn; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_BOOL bUseEnhancedPortReconfig = OMX_FALSE; - - OMX_PARAM_PORTDEFINITIONTYPE portDef; - OMX_CONFIG_RECTTYPE sRect; - - DOMX_ENTER(""); - - /*initializing Structure */ - portDef.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); - portDef.nVersion.s.nVersionMajor = 0x1; - portDef.nVersion.s.nVersionMinor = 0x1; - portDef.nVersion.s.nRevision = 0x0; - portDef.nVersion.s.nStep = 0x0; - - portDef.nPortIndex = nPortIndex; - - sRect.nSize = sizeof(OMX_CONFIG_RECTTYPE); - sRect.nVersion.s.nVersionMajor = 0x1; - sRect.nVersion.s.nVersionMinor = 0x1; - sRect.nVersion.s.nRevision = 0x0; - sRect.nVersion.s.nStep = 0x0; - - sRect.nPortIndex = nPortIndex; - sRect.nLeft = 0; - sRect.nTop = 0; - sRect.nHeight = 0; - sRect.nWidth = 0; - -#ifdef USE_ENHANCED_PORTRECONFIG - bUseEnhancedPortReconfig = OMX_TRUE; -#endif - eRPCError = RPC_GetParameter(hRemoteComp, - OMX_TI_IndexParam2DBufferAllocDimension, - (OMX_PTR) & sRect, NULL, &eCompReturn); - if (eRPCError == RPC_OMX_ErrorNone) - { - DOMX_DEBUG(" PROXY_UTIL Get Parameter Successful"); - eError = eCompReturn; - } else - { - DOMX_ERROR("RPC_GetParameter returned error 0x%x", eRPCError); - eError = OMX_ErrorUndefined; - goto EXIT; - } - - if (eCompReturn == OMX_ErrorNone && bUseEnhancedPortReconfig == OMX_FALSE) - { - *nNumOfLines = sRect.nHeight; - } else if (eCompReturn == OMX_ErrorUnsupportedIndex || bUseEnhancedPortReconfig == OMX_TRUE) - { - eRPCError = - RPC_GetParameter(hRemoteComp, - OMX_IndexParamPortDefinition, (OMX_PTR) & portDef, - NULL, &eCompReturn); - - if (eRPCError == RPC_OMX_ErrorNone) - { - DOMX_DEBUG(" PROXY_UTIL Get Parameter Successful"); - eError = eCompReturn; - } else - { - DOMX_ERROR("RPC_GetParameter returned error 0x%x", - eRPCError); - eError = OMX_ErrorUndefined; - goto EXIT; - } - - if (eCompReturn == OMX_ErrorNone) - { - - //start with 1 meaning 1D buffer - *nNumOfLines = 1; - - if (portDef.eDomain == OMX_PortDomainVideo) - { - *nNumOfLines = - portDef.format.video.nFrameHeight; - //DOMX_DEBUG("Port definition Type is video..."); - //DOMX_DEBUG("&&Colorformat is:%p", portDef.format.video.eColorFormat); - //DOMX_DEBUG("nFrameHeight is:%d", portDef.format.video.nFrameHeight); - //*nNumOfLines = portDef.format.video.nFrameHeight; - - //if((portDef.format.video.eColorFormat == OMX_COLOR_FormatYUV420PackedSemiPlanar) || - // (portDef.format.video.eColorFormat == OMX_COLOR_FormatYUV420Planar)) - //{ - //DOMX_DEBUG("Setting FrameHeight as Number of lines..."); - //*nNumOfLines = portDef.format.video.nFrameHeight; - //} - } else if (portDef.eDomain == OMX_PortDomainImage) - { - DOMX_DEBUG - ("Image DOMAIN TILER SUPPORT for NV12 format only"); - *nNumOfLines = - portDef.format.image.nFrameHeight; - } else if (portDef.eDomain == OMX_PortDomainAudio) - { - DOMX_DEBUG("Audio DOMAIN TILER SUPPORT"); - } else if (portDef.eDomain == OMX_PortDomainOther) - { - DOMX_DEBUG("Other DOMAIN TILER SUPPORT"); - } else - { //this is the sample component test - //Temporary - just to get check functionality - DOMX_DEBUG("Sample component TILER SUPPORT"); - *nNumOfLines = 4; - } - } else - { - DOMX_ERROR(" ERROR IN RECOVERING UV POINTER"); - } - } else - { - DOMX_ERROR(" ERROR IN RECOVERING UV POINTER"); - } - - DOMX_DEBUG("Port Number: %d :: NumOfLines %d", nPortIndex, - *nNumOfLines); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - - -/* ===========================================================================*/ -/** - * @name _RPC_IsProxyComponent() - * @brief This function calls GetComponentVersion API on the component and - * based on the component name decidec whether the component is a proxy - * or real component. The naming component convention assumed is - * <OMX>.<Company Name>.<Core Name>.<Domain>.<Component Details> with - * all characters in upper case for e.g. OMX.TI.DUCATI1.VIDEO.H264E - * @param hComponent [IN] : The component handle - * bIsProxy [OUT] : Set to true is handle is for a proxy component - * @return OMX_ErrorNone = Successful - * - **/ -/* ===========================================================================*/ -OMX_ERRORTYPE _RPC_IsProxyComponent(OMX_HANDLETYPE hComponent, - OMX_BOOL * bIsProxy) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_S8 cComponentName[MAXNAMESIZE] = { 0 } - , cCoreName[32] = - { - 0}; - OMX_VERSIONTYPE sCompVer, sSpecVer; - OMX_UUIDTYPE sCompUUID; - OMX_U32 i = 0, ret = 0; - - eError = - OMX_GetComponentVersion(hComponent, (OMX_STRING) cComponentName, - &sCompVer, &sSpecVer, &sCompUUID); - PROXY_assert(eError == OMX_ErrorNone, eError, ""); - ret = - sscanf((char *)cComponentName, "%*[^'.'].%*[^'.'].%[^'.'].%*s", - cCoreName); - PROXY_assert(ret == 1, OMX_ErrorBadParameter, - "Incorrect component name"); - for (i = 0; i < CORE_MAX; i++) - { - if (strcmp((char *)cCoreName, Core_Array[i]) == 0) - break; - } - PROXY_assert(i < CORE_MAX, OMX_ErrorBadParameter, - "Unknown core name"); - - /* If component name indicates remote core, it means proxy - component */ - if ((i == CORE_SYSM3) || (i == CORE_APPM3) || (i == CORE_TESLA)) - *bIsProxy = OMX_TRUE; - else - *bIsProxy = OMX_FALSE; - - EXIT: - return eError; -} diff --git a/domx/domx/omx_rpc.h b/domx/domx/omx_rpc.h deleted file mode 100755 index 84c00d0..0000000 --- a/domx/domx/omx_rpc.h +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc.h - * @brief This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\ - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - -#ifndef OMXRPC_H -#define OMXRPC_H - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <stdio.h> -#include <OMX_Types.h> -#include <OMX_Core.h> - - -/****************************************************************** - * DATA TYPES - ******************************************************************/ - - - /******************************************************************************* -* Enumerated Types -*******************************************************************************/ - typedef enum RPC_OMX_ERRORTYPE - { - RPC_OMX_ErrorNone = 0, - - /* OMX Error Mapped */ - RPC_OMX_ErrorInsufficientResources = 0x81000, - RPC_OMX_ErrorUndefined = 0x81001, - RPC_OMX_ErrorBadParameter = 0x81005, - RPC_OMX_ErrorHardware = 0x81009, - RPC_OMX_ErrorUnsupportedIndex = 0x8101A, - RPC_OMX_ErrorTimeout = 0x81011, - /* END OF OMX Error */ - - /* RPC Specific Error - to depricate */ - RPC_OMX_ErrorUnknown = 0x70000, - RPC_OMX_ErrorProccesorInit = 0x70001, - RPC_OMX_InvalidRPCCmd = 0x70002, - RPC_OMX_ErrorHLOS = 0x70003, - RPC_OMX_ErrorInvalidMsg = 0x70004, - - /* RCM Specific */ - RPC_OMX_RCM_ErrorExecFail = 0x70005, - RPC_OMX_RCM_ErrorExecDpcFail = 0x70006, - RPC_OMX_RCM_ErrorTimeout = 0x70007, - RPC_OMX_RCM_ServerFail = 0x70008, - RPC_OMX_RCM_ClientFail = 0x70009, - - } RPC_OMX_ERRORTYPE; - - -/**************************************************************** - * PUBLIC DECLARATIONS Defined here, used elsewhere - -****************************************************************/ -/* ===========================================================================*/ -/** - * @name RPC_InstanceInit() - * @brief RPC instance init is used to bring up a instance of a client - this should be ideally invokable from any core - * For this the parameters it would require are - * Heap ID - this needs to be configured at startup (CFG) and indicates the heaps available for a RCM client to pick from - * Server - this contains the RCM server name that the client should connect to - * rcmHndl - Contains the Client once the call is completed - * rcmParams - - * These values can be picked up from the RPC handle. But an unique identifier is required -Server - * @param cComponentName : Pointer to the Components Name that is requires the RCM client to be initialized - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ - RPC_OMX_ERRORTYPE RPC_InstanceInit(OMX_STRING cComponentName, - OMX_HANDLETYPE * phRPCCtx); - - - -/* ===========================================================================*/ -/** - * @name RPC_InstanceDeInit() - * @brief This function Removes or deinitializes RCM client instances. This also manages the number of active users - * of a given RCM client - * @param cComponentName : Pointer to the Components Name that is active user of the RCM client to be deinitialized - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ - RPC_OMX_ERRORTYPE RPC_InstanceDeInit(OMX_HANDLETYPE hRPCCtx); - - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif diff --git a/domx/domx/omx_rpc/inc/omx_rpc_internal.h b/domx/domx/omx_rpc/inc/omx_rpc_internal.h deleted file mode 100755 index b33bf2d..0000000 --- a/domx/domx/omx_rpc/inc/omx_rpc_internal.h +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc_internal.h - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\inc - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - - -#ifndef OMXRPC_INTERNAL_H -#define OMXRPC_INTERNAL_H - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -/* ----- system and platform files ----------------------------*/ -#include <pthread.h> - -#include <OMX_Component.h> -#include <OMX_Core.h> -#include <OMX_Audio.h> -#include <OMX_Video.h> -#include <OMX_Types.h> -#include <OMX_Index.h> -#include <OMX_TI_Index.h> -#include <OMX_TI_Common.h> - -/*-------program files ----------------------------------------*/ -#include "omx_rpc.h" - - -/****************************************************************** - * DEFINES - CONSTANTS - ******************************************************************/ -/* *********************** OMX RPC DEFINES***********************************/ - -/*This defines the maximum number of remote functions that can be registered*/ -#define RPC_OMX_MAX_FUNCTION_LIST 21 -/*Packet size for each message*/ -#define RPC_PACKET_SIZE 0x12C - - - -/******************************************************************************* -* Enumerated Types -*******************************************************************************/ - - typedef enum OMX_RPC_CORE_TYPE - { - OMX_RPC_CORE_TESLA = 0, - OMX_RPC_CORE_APPM3 = 1, - OMX_RPC_CORE_SYSM3 = 2, - RPC_CORE_CHIRON = 3, - OMX_RPC_CORE_MAX = 4 - } OMX_RPC_CORE_TYPE; - - - -/*===============================================================*/ -/** RPC_OMX_FXN_IDX_TYPE : A unique function index for each OMX function - */ -/*===============================================================*/ - typedef enum RPC_OMX_FXN_IDX_TYPE - { - - RPC_OMX_FXN_IDX_GET_HANDLE = 0, - RPC_OMX_FXN_IDX_SET_PARAMETER = 1, - RPC_OMX_FXN_IDX_GET_PARAMETER = 2, - RPC_OMX_FXN_IDX_USE_BUFFER = 3, - RPC_OMX_FXN_IDX_FREE_HANDLE = 4, - RPC_OMX_FXN_IDX_SET_CONFIG = 5, - RPC_OMX_FXN_IDX_GET_CONFIG = 6, - RPC_OMX_FXN_IDX_GET_STATE = 7, - RPC_OMX_FXN_IDX_SEND_CMD = 8, - RPC_OMX_FXN_IDX_GET_VERSION = 9, - RPC_OMX_FXN_IDX_GET_EXT_INDEX = 10, - RPC_OMX_FXN_IDX_FILLTHISBUFFER = 11, - RPC_OMX_FXN_IDX_FILLBUFFERDONE = 12, - RPC_OMX_FXN_IDX_FREE_BUFFER = 13, - RPC_OMX_FXN_IDX_EMPTYTHISBUFFER = 14, - RPC_OMX_FXN_IDX_EMPTYBUFFERDONE = 15, - RPC_OMX_FXN_IDX_EVENTHANDLER = 16, - RPC_OMX_FXN_IDX_ALLOCATE_BUFFER = 17, - RPC_OMX_FXN_IDX_COMP_TUNNEL_REQUEST = 18, - RPC_OMX_FXN_IDX_MAX = RPC_OMX_MAX_FUNCTION_LIST - } RPC_OMX_FXN_IDX_TYPE; - - - -/*===============================================================*/ -/** RPC_OMX_MAP_INFO_TYPE : Tells the no. of buffers that the kernel has to - map to remote core. - */ -/*===============================================================*/ - typedef enum RPC_OMX_MAP_INFO_TYPE - { - RPC_OMX_MAP_INFO_NONE = 0, - RPC_OMX_MAP_INFO_ONE_BUF = 1, - RPC_OMX_MAP_INFO_TWO_BUF = 2, - RPC_OMX_MAP_INFO_THREE_BUF = 3, - RPC_OMX_MAP_INFO_MAX = 0x7FFFFFFF - } RPC_OMX_MAP_INFO_TYPE; - - - -/******************************************************************************* -* STRUCTURES -*******************************************************************************/ - -/*===============================================================*/ -/** RPC_OMX_CONTEXT : RPC context structure - * - * @ param fd_omx : File descriptor corresponding to this - * instance on remote core. - * @ param fd_killcb : File descriptor used to shut down the - * callback thread. - * @ param cbThread : Callback thread. - * @ param pMsgPipe : Array of message pipes. One for each OMX - * function. Used to post and receive the - * return messages of each function. - * @ param hRemoteHandle : Handle to the context structure on the - * remote core. - * @ param hActualRemoteCompHandle : Actual component handle on remote core. - * @ param pAppData : App data of RPC caller - * - */ -/*===============================================================*/ - typedef struct RPC_OMX_CONTEXT - { - OMX_S32 fd_omx; - OMX_S32 fd_killcb; - pthread_t cbThread; - OMX_PTR pMsgPipe[RPC_OMX_MAX_FUNCTION_LIST]; - OMX_HANDLETYPE hRemoteHandle; - OMX_HANDLETYPE hActualRemoteCompHandle; - OMX_PTR pAppData; - } RPC_OMX_CONTEXT; - -#ifdef __cplusplus -} -#endif -#endif diff --git a/domx/domx/omx_rpc/inc/omx_rpc_skel.h b/domx/domx/omx_rpc/inc/omx_rpc_skel.h deleted file mode 100755 index b36281c..0000000 --- a/domx/domx/omx_rpc/inc/omx_rpc_skel.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc_skel.h - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\inc - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - - -#ifndef OMX_RPC_SKELH -#define OMX_RPC_SKELH - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ - -#include "../inc/omx_rpc_internal.h" -#include "../inc/omx_rpc_stub.h" - - RPC_OMX_ERRORTYPE RPC_SKEL_EmptyBufferDone(void *data); - RPC_OMX_ERRORTYPE RPC_SKEL_FillBufferDone(void *data); - RPC_OMX_ERRORTYPE RPC_SKEL_EventHandler(void *data); - -/*Empty SKEL*/ - RPC_OMX_ERRORTYPE RPC_SKEL_GetHandle(uint32_t size, uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_SetParameter(uint32_t size, - uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_GetParameter(uint32_t size, - uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_FreeHandle(uint32_t size, uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_EmptyThisBuffer(uint32_t size, - uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_FillThisBuffer(uint32_t size, - uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_UseBuffer(uint32_t size, uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_FreeBuffer(uint32_t size, uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_SetConfig(uint32_t size, uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_GetConfig(uint32_t size, uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_GetState(uint32_t size, uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_SendCommand(uint32_t size, - uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_GetComponentVersion(uint32_t size, - uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_GetExtensionIndex(uint32_t size, - uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_AllocateBuffer(uint32_t size, - uint32_t * data); - RPC_OMX_ERRORTYPE RPC_SKEL_ComponentTunnelRequest(uint32_t size, - uint32_t * data); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/domx/domx/omx_rpc/inc/omx_rpc_stub.h b/domx/domx/omx_rpc/inc/omx_rpc_stub.h deleted file mode 100755 index fd06506..0000000 --- a/domx/domx/omx_rpc/inc/omx_rpc_stub.h +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc_stub.h - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\inc - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - -#ifndef OMX_RPC_STUBH -#define OMX_RPC_STUBH - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include "omx_rpc.h" -#include "omx_rpc_internal.h" - - RPC_OMX_ERRORTYPE RPC_GetHandle(OMX_HANDLETYPE hRPCCtx, - OMX_STRING cComponentName, OMX_PTR pAppData, - OMX_CALLBACKTYPE * pCallBacks, OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_FreeHandle(OMX_HANDLETYPE hRPCCtx, - OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_UseBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, OMX_U32 nPortIndex, - OMX_PTR pAppPrivate, OMX_U32 nSizeBytes, OMX_U8 * pBuffer, - OMX_U32 * pBufHeaderRemote, OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_SetParameter(OMX_HANDLETYPE hRPCCtx, - OMX_INDEXTYPE nParamIndex, OMX_PTR pCompParam, - OMX_PTR pLocBufNeedMap, OMX_U32 nNumOfLocalBuf, OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_GetParameter(OMX_HANDLETYPE hRPCCtx, - OMX_INDEXTYPE nParamIndex, OMX_PTR pCompParam, - OMX_PTR pLocBufNeedMap, OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_FillThisBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_BUFFERHEADERTYPE * pBufferHdr, OMX_U32 BufHdrRemote, - OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_EmptyThisBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_BUFFERHEADERTYPE * pBufferHdr, OMX_U32 BufHdrRemote, - OMX_ERRORTYPE * nCmdStatus,OMX_BOOL bMapBuffer); - - RPC_OMX_ERRORTYPE RPC_FreeBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_U32 BufHdrRemote, - OMX_U32 pBuffer, OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_SetConfig(OMX_HANDLETYPE hRPCCtx, - OMX_INDEXTYPE nConfigIndex, OMX_PTR pCompConfig, - OMX_PTR pLocBufNeedMap, OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_GetConfig(OMX_HANDLETYPE hRPCCtx, - OMX_INDEXTYPE nConfigIndex, OMX_PTR pCompConfig, - OMX_PTR pLocBufNeedMap, OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_GetComponentVersion(OMX_HANDLETYPE hRPCCtx, - OMX_STRING pComponentName, OMX_VERSIONTYPE * pComponentVersion, - OMX_VERSIONTYPE * pSpecVersion, OMX_UUIDTYPE * pComponentUUID, - OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_SendCommand(OMX_HANDLETYPE hRPCCtx, - OMX_COMMANDTYPE eCmd, OMX_U32 nParam, OMX_PTR pCmdData, - OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_GetState(OMX_HANDLETYPE hRPCCtx, - OMX_STATETYPE * pState, OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_GetExtensionIndex(OMX_HANDLETYPE hComponent, - OMX_STRING cParameterName, OMX_INDEXTYPE * pIndexType, - OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_AllocateBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, - OMX_IN OMX_U32 nPortIndex, OMX_U32 * pBufHeaderRemote, - OMX_PTR pAppPrivate, OMX_U32 nSizeBytes, - OMX_ERRORTYPE * nCmdStatus); - - RPC_OMX_ERRORTYPE RPC_ComponentTunnelRequest(OMX_HANDLETYPE hRPCCtx, - OMX_IN OMX_U32 nPort, OMX_HANDLETYPE hTunneledremoteHandle, - OMX_U32 nTunneledPort, - OMX_INOUT OMX_TUNNELSETUPTYPE * pTunnelSetup, - OMX_ERRORTYPE * nCmdStatus); - -/*Empty Stubs*/ - OMX_ERRORTYPE RPC_EventHandler(OMX_HANDLETYPE hRPCCtx, - OMX_PTR pAppData, OMX_EVENTTYPE eEvent, OMX_U32 nData1, - OMX_U32 nData2, OMX_PTR pEventData); - OMX_ERRORTYPE RPC_EmptyBufferDone(OMX_HANDLETYPE hRPCCtx, - OMX_PTR pAppData, OMX_BUFFERHEADERTYPE * pBuffer); - OMX_ERRORTYPE RPC_FillBufferDone(OMX_HANDLETYPE hRPCCtx, - OMX_PTR pAppData, OMX_BUFFERHEADERTYPE * pBuffer); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/domx/domx/omx_rpc/inc/omx_rpc_utils.h b/domx/domx/omx_rpc/inc/omx_rpc_utils.h deleted file mode 100755 index d8334c9..0000000 --- a/domx/domx/omx_rpc/inc/omx_rpc_utils.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc_utils.h - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\inc - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - -#ifndef OMX_RPC_UTILSH -#define OMX_RPC_UTILSH - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include "omx_rpc.h" -#include "omx_rpc_internal.h" - -#include <timm_osal_trace.h> - -#define DOMX_ERROR(fmt,...) TIMM_OSAL_Error(fmt, ##__VA_ARGS__) -#define DOMX_WARN(fmt,...) TIMM_OSAL_Warning(fmt, ##__VA_ARGS__) -#define DOMX_PROF(fmt,...) TIMM_OSAL_Profiling(fmt, ##__VA_ARGS__) -#define DOMX_INFO(fmt,...) TIMM_OSAL_Info(fmt, ##__VA_ARGS__) -#define DOMX_DEBUG(fmt,...) TIMM_OSAL_Debug(fmt, ##__VA_ARGS__) -#define DOMX_ENTER(fmt,...) TIMM_OSAL_Entering(fmt, ##__VA_ARGS__) -#define DOMX_EXIT(fmt,...) TIMM_OSAL_Exiting(fmt, ##__VA_ARGS__) - - -/****************************************************************** - * MACROS - ASSERTS - ******************************************************************/ -#define RPC_assert RPC_paramCheck -#define RPC_require RPC_paramCheck -#define RPC_ensure RPC_paramCheck - -#define RPC_paramCheck(C, V, S) do { \ - if (!(C)) { eRPCError = V;\ - if(S) DOMX_ERROR("failed check:" #C" - returning error: 0x%x - %s",V,S);\ - else DOMX_ERROR("failed check:" #C" - returning error: 0x%x",V); \ - goto EXIT; } \ - } while(0) - -/* ************************* OFFSET DEFINES ******************************** */ -#define GET_PARAM_DATA_OFFSET (sizeof(RPC_OMX_HANDLE) + sizeof(OMX_INDEXTYPE) + sizeof(OMX_U32) /*4 bytes for offset*/ ) -#define USE_BUFFER_DATA_OFFSET (sizeof(OMX_U32)*5) - -/****************************************************************** - * MACROS - ******************************************************************/ -#define RPC_UTIL_GETSTRUCTSIZE(PTR) *((OMX_U32*)PTR) - -/****************************************************************** - * MACROS - COMMON MARSHALLING UTILITIES - ******************************************************************/ -#define RPC_SETFIELDVALUE(MSGBODY, POS, VALUE, TYPE) do { \ - *((TYPE *) ((OMX_U32)MSGBODY+POS)) = (TYPE)VALUE; \ - POS += sizeof(TYPE); \ - } while(0) - -#define RPC_SETFIELDOFFSET(MSGBODY, POS, OFFSET, TYPE) do { \ - *((TYPE *) ((OMX_U32)MSGBODY+POS)) = OFFSET; \ - POS += sizeof(TYPE); \ - } while(0) - -#define RPC_SETFIELDCOPYGEN(MSGBODY, POS, PTR, SIZE) do { \ - TIMM_OSAL_Memcpy((OMX_U8*)((OMX_U32)MSGBODY+POS), PTR, SIZE); \ - POS += SIZE; \ - } while (0) - -#define RPC_SETFIELDCOPYTYPE(MSGBODY, POS, PSTRUCT, TYPE) do { \ - *((TYPE *)((OMX_U32)MSGBODY+POS)) = *PSTRUCT; \ - POS += sizeof(TYPE); \ - } while (0) - -/****************************************************************** - * MACROS - COMMON UNMARSHALLING UTILITIES - ******************************************************************/ -#define RPC_GETFIELDVALUE(MSGBODY, POS, VALUE, TYPE) do { \ - VALUE = *((TYPE *) ((OMX_U32)MSGBODY+POS)); \ - POS += sizeof(TYPE); \ - } while(0) - -#define RPC_GETFIELDOFFSET(MSGBODY, POS, OFFSET, TYPE) do { \ - OFFSET = *((TYPE *) ((OMX_U32)MSGBODY+POS)); \ - POS += sizeof(TYPE); \ - } while(0) - -#define RPC_GETFIELDCOPYGEN(MSGBODY, POS, PTR, SIZE) do { \ - TIMM_OSAL_Memcpy(PTR, (OMX_U8*)((OMX_U32)MSGBODY+POS), SIZE); \ - POS += SIZE; \ - } while(0) - -#define RPC_GETFIELDCOPYTYPE(MSGBODY, POS, PSTRUCT, TYPE) do { \ - *PSTRUCT = *((TYPE *)((OMX_U32)MSGBODY+POS)); \ - POS += sizeof(TYPE); \ - } while(0) - -#define RPC_GETFIELDPATCHED(MSGBODY, OFFSET, PTR, TYPE) \ -PTR = (TYPE *) (MSGBODY+OFFSET); - -/****************************************************************** - * FUNCTIONS - ******************************************************************/ - RPC_OMX_ERRORTYPE RPC_UnMapBuffer(OMX_U32 mappedBuffer); - RPC_OMX_ERRORTYPE RPC_MapBuffer(OMX_U32 mappedBuffer); - RPC_OMX_ERRORTYPE RPC_FlushBuffer(OMX_U8 * pBuffer, OMX_U32 size, - OMX_U32 nTargetCoreId); - RPC_OMX_ERRORTYPE RPC_InvalidateBuffer(OMX_U8 * pBuffer, - OMX_U32 size, OMX_U32 nTargetCoreId); - - RPC_OMX_ERRORTYPE RPC_UTIL_GetTargetServerName(OMX_STRING - ComponentName, OMX_STRING ServerName); - RPC_OMX_ERRORTYPE RPC_UTIL_GetLocalServerName(OMX_STRING - ComponentName, OMX_STRING * ServerName); - RPC_OMX_ERRORTYPE RPC_UTIL_GenerateLocalServerName(OMX_STRING - cServerName); - RPC_OMX_ERRORTYPE RPC_UTIL_GetTargetCore(OMX_STRING cComponentName, - OMX_U32 * nCoreId); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/domx/domx/omx_rpc/src/omx_rpc.c b/domx/domx/omx_rpc/src/omx_rpc.c deleted file mode 100755 index 0743491..0000000 --- a/domx/domx/omx_rpc/src/omx_rpc.c +++ /dev/null @@ -1,410 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc_stub.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC Stub implementations. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\src - * - * @rev 1.0 - */ - - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -/* ----- system and platform files ----------------------------*/ -#include <errno.h> -//#include <errno-base.h> - -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/eventfd.h> -#include <unistd.h> -#include <string.h> -#include <stdio.h> - -#include <OMX_Types.h> -#include <timm_osal_interfaces.h> -#include <timm_osal_trace.h> - - -/*-------program files ----------------------------------------*/ -#include "omx_rpc.h" -#include "omx_proxy_common.h" -#include "omx_rpc_stub.h" -#include "omx_rpc_skel.h" -#include "omx_rpc_internal.h" -#include "omx_rpc_utils.h" - -#include "rpmsg_omx_defs.h" - -#define RPC_MSGPIPE_SIZE (4) -#define RPC_MSG_SIZE_FOR_PIPE (sizeof(OMX_PTR)) -#define MAX_ATTEMPTS 15 - -#define RPC_getPacket(nPacketSize, pPacket) do { \ - pPacket = TIMM_OSAL_Malloc(nPacketSize, TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); \ - RPC_assert(pPacket != NULL, RPC_OMX_ErrorInsufficientResources, \ - "Error Allocating RCM Message Frame"); \ - } while(0) - -#define RPC_freePacket(pPacket) do { \ - if(pPacket != NULL) TIMM_OSAL_Free(pPacket); \ - } while(0) - -OMX_U8 pBufferError[RPC_PACKET_SIZE]; - -void *RPC_CallbackThread(void *data); - - -/* ===========================================================================*/ -/** -* @name RPC_InstanceInit() -* @brief RPC instance init is used for initialization. It is called once for -* every instance of an OMX component. -* @param cComponentName [IN] : Name of the component. -* @param phRPCCtx [OUT] : RPC Context structure - to be filled in and returned -* @return RPC_OMX_ErrorNone = Successful -*/ -/* ===========================================================================*/ - -RPC_OMX_ERRORTYPE RPC_InstanceInit(OMX_STRING cComponentName, - OMX_HANDLETYPE * phRPCCtx) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - RPC_OMX_CONTEXT *pRPCCtx = NULL; - OMX_S32 status = 0; - struct omx_conn_req sReq = { .name = "OMX" }; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - OMX_U32 i = 0, nAttempts = 0; - - *(RPC_OMX_CONTEXT **) phRPCCtx = NULL; - - //pthread_t cbThread; - -// sReq.name = "OMX"; - - /*pRPCCtx contains context information for each instance */ - pRPCCtx = - (RPC_OMX_CONTEXT *) TIMM_OSAL_Malloc(sizeof(RPC_OMX_CONTEXT), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - RPC_assert(pRPCCtx != NULL, RPC_OMX_ErrorInsufficientResources, - "Malloc failed"); - TIMM_OSAL_Memset(pRPCCtx, 0, sizeof(RPC_OMX_CONTEXT)); - - /*Assuming that open maintains an internal count for multi instance */ - DOMX_DEBUG("Calling open on the device"); - while (1) - { - pRPCCtx->fd_omx = open("/dev/rpmsg-omx1", O_RDWR); - if(pRPCCtx->fd_omx >= 0 || errno != ENOENT || nAttempts == MAX_ATTEMPTS) - break; - DOMX_DEBUG("errno from open= %d, REATTEMPTING OPEN!!!!",errno); - nAttempts++; - usleep(1000000); - } - if(pRPCCtx->fd_omx < 0) - { - DOMX_ERROR("Can't open device, errorno from open = %d",errno); - eError = RPC_OMX_ErrorInsufficientResources; - goto EXIT; - } - DOMX_DEBUG("Open was successful, pRPCCtx->fd_omx = %d", - pRPCCtx->fd_omx); -//AD -// strncpy(sReq.name, cComponentName, OMX_MAX_STRINGNAME_SIZE); - - DOMX_DEBUG("Calling ioctl"); - status = ioctl(pRPCCtx->fd_omx, OMX_IOCCONNECT, &sReq); - RPC_assert(status >= 0, RPC_OMX_ErrorInsufficientResources, - "Can't connect"); - - for (i = 0; i < RPC_OMX_MAX_FUNCTION_LIST; i++) - { - eError = - TIMM_OSAL_CreatePipe(&(pRPCCtx->pMsgPipe[i]), - RPC_MSGPIPE_SIZE, RPC_MSG_SIZE_FOR_PIPE, 1); - RPC_assert(eError == TIMM_OSAL_ERR_NONE, - RPC_OMX_ErrorInsufficientResources, - "Pipe creation failed"); - } - - DOMX_DEBUG("Creating event fd"); - pRPCCtx->fd_killcb = eventfd(0, 0); - RPC_assert(pRPCCtx->fd_killcb >= 0, - RPC_OMX_ErrorInsufficientResources, "Can't create kill fd"); - /*Create a listener/server thread to listen for Ducati callbacks */ - DOMX_DEBUG("Create listener thread"); - status = - pthread_create(&(pRPCCtx->cbThread), NULL, RPC_CallbackThread, - pRPCCtx); - RPC_assert(status == 0, RPC_OMX_ErrorInsufficientResources, - "Can't create cb thread"); - - EXIT: - if (eRPCError != RPC_OMX_ErrorNone) - { - RPC_InstanceDeInit(pRPCCtx); - } - else - { - *(RPC_OMX_CONTEXT **) phRPCCtx = pRPCCtx; - } - return eRPCError; -} - - - -/* ===========================================================================*/ -/** -* @name RPC_InstanceDeInit() -* @brief RPC instance deinit is used for tear down. It is called once when an -* instance of OMX component is going down. -* @param phRPCCtx [IN] : RPC Context structure. -* @return RPC_OMX_ErrorNone = Successful -*/ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_InstanceDeInit(OMX_HANDLETYPE hRPCCtx) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - RPC_OMX_CONTEXT *pRPCCtx = (RPC_OMX_CONTEXT *) hRPCCtx; - OMX_S32 status = 0; - OMX_U32 i = 0; - OMX_U64 nKillEvent = 1; - - RPC_assert(hRPCCtx != NULL, RPC_OMX_ErrorUndefined, - "NULL context handle supplied to RPC Deinit"); - - if (pRPCCtx->fd_killcb) - { - status = - write(pRPCCtx->fd_killcb, &nKillEvent, sizeof(OMX_U64)); - if (status <= 0) - { - DOMX_ERROR - ("Write to kill fd failed - cb thread may not exit"); - eRPCError = RPC_OMX_ErrorUndefined; - } else if (pRPCCtx->cbThread) - { - DOMX_DEBUG("Waiting for cb thread to exit"); - status = pthread_join(pRPCCtx->cbThread, NULL); - if (status != 0) - { - DOMX_ERROR("Join for cb thread failed"); - eRPCError = RPC_OMX_ErrorUndefined; - } - } - DOMX_DEBUG("Closing the kill fd"); - status = close(pRPCCtx->fd_killcb); - pRPCCtx->fd_killcb = 0; - if (status != 0) - { - DOMX_ERROR("Close failed on kill fd"); - eRPCError = RPC_OMX_ErrorUndefined; - } - } - - for (i = 0; i < RPC_OMX_MAX_FUNCTION_LIST; i++) - { - if (pRPCCtx->pMsgPipe[i]) - { - eError = TIMM_OSAL_DeletePipe(pRPCCtx->pMsgPipe[i]); - pRPCCtx->pMsgPipe[i] = NULL; - if (eError != TIMM_OSAL_ERR_NONE) - { - DOMX_ERROR("Pipe deletion failed"); - eRPCError = RPC_OMX_ErrorUndefined; - } - } - } - - DOMX_DEBUG("Closing the omx fd"); - if (pRPCCtx->fd_omx) - { - status = close(pRPCCtx->fd_omx); - pRPCCtx->fd_omx = 0; - if (status != 0) - { - DOMX_ERROR("Close failed on omx fd"); - eRPCError = RPC_OMX_ErrorUndefined; - } - } - - TIMM_OSAL_Free(pRPCCtx); - - EXIT: - return eRPCError; -} - - - -/* ===========================================================================*/ -/** -* @name RPC_CallbackThread() -* @brief This is the entry function of the thread which keeps spinning, waiting -* for messages from Ducati. -* @param data [IN] : The RPC Context structure is passed here. -* @return RPC_OMX_ErrorNone = Successful -*/ -/* ===========================================================================*/ -void *RPC_CallbackThread(void *data) -{ - OMX_PTR pBuffer = NULL; - RPC_OMX_CONTEXT *pRPCCtx = (RPC_OMX_CONTEXT *) data; - fd_set readfds; - OMX_S32 maxfd = 0, status = 0; - OMX_U32 nFxnIdx = 0, nPacketSize = RPC_PACKET_SIZE, nPos = 0; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - OMX_COMPONENTTYPE *hComp = NULL; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_PTR pBuff = pBufferError; - - maxfd = - (pRPCCtx->fd_killcb > - pRPCCtx->fd_omx ? pRPCCtx->fd_killcb : pRPCCtx->fd_omx) + 1; - while (1) - { - FD_ZERO(&readfds); - FD_SET(pRPCCtx->fd_omx, &readfds); - FD_SET(pRPCCtx->fd_killcb, &readfds); - - DOMX_DEBUG("Waiting for messages from remote core"); - status = select(maxfd, &readfds, NULL, NULL, NULL); - RPC_assert(status > 0, RPC_OMX_ErrorUndefined, - "select failed"); - - if (FD_ISSET(pRPCCtx->fd_killcb, &readfds)) - { - DOMX_DEBUG("Recd. kill message - exiting the thread"); - break; - } - - if (FD_ISSET(pRPCCtx->fd_omx, &readfds)) - { - DOMX_DEBUG("Recd. omx message"); - RPC_getPacket(nPacketSize, pBuffer); - status = read(pRPCCtx->fd_omx, pBuffer, nPacketSize); - if(status < 0) - { - if(errno == ENXIO) - { - for(nFxnIdx = 0; nFxnIdx < RPC_OMX_MAX_FUNCTION_LIST; nFxnIdx++) - { - ((struct omx_packet *) pBufferError)->result = OMX_ErrorHardware; - TIMM_OSAL_WriteToPipe(pRPCCtx->pMsgPipe[nFxnIdx], &pBuff, RPC_MSG_SIZE_FOR_PIPE, TIMM_OSAL_SUSPEND); - if(eError != TIMM_OSAL_ERR_NONE) - DOMX_ERROR("Write to pipe failed"); - } - /*Indicate fatal error and exit*/ - RPC_assert(0, RPC_OMX_ErrorHardware, - "Remote processor fatal error"); - } - else - { - RPC_assert(0, RPC_OMX_ErrorUndefined, - "read failed"); - } - } - - nPos = 0; - nFxnIdx = ((struct omx_packet *) pBuffer)->fxn_idx; - /*Indices from static table will have bit 31 set */ - if (nFxnIdx & 0x80000000) - nFxnIdx &= 0x0FFFFFFF; - RPC_assert(nFxnIdx < RPC_OMX_MAX_FUNCTION_LIST, - RPC_OMX_ErrorUndefined, - "Bad function index recd"); - switch (nFxnIdx) - { - case RPC_OMX_FXN_IDX_EVENTHANDLER: - RPC_SKEL_EventHandler(((struct omx_packet *) - pBuffer)->data); - RPC_freePacket(pBuffer); - pBuffer = NULL; - break; - case RPC_OMX_FXN_IDX_EMPTYBUFFERDONE: - RPC_SKEL_EmptyBufferDone(((struct omx_packet *) - pBuffer)->data); - RPC_freePacket(pBuffer); - pBuffer = NULL; - break; - case RPC_OMX_FXN_IDX_FILLBUFFERDONE: - RPC_SKEL_FillBufferDone(((struct omx_packet *) - pBuffer)->data); - RPC_freePacket(pBuffer); - pBuffer = NULL; - break; - default: - eError = - TIMM_OSAL_WriteToPipe(pRPCCtx-> - pMsgPipe[nFxnIdx], &pBuffer, - RPC_MSG_SIZE_FOR_PIPE, TIMM_OSAL_SUSPEND); - RPC_assert(eError == TIMM_OSAL_ERR_NONE, - RPC_OMX_ErrorUndefined, - "Write to pipe failed"); - break; - } - } -EXIT: - if (eRPCError != RPC_OMX_ErrorNone) - { - //AD TODO: Send error CB to client and then go back in loop to wait for killfd - if (pBuffer != NULL) - { - RPC_freePacket(pBuffer); - pBuffer = NULL; - } - /*Report all hardware errors as fatal and exit from listener thread*/ - if (eRPCError == RPC_OMX_ErrorHardware) - { - /*Implicit detail: pAppData is proxy component handle updated during - RPC_GetHandle*/ - hComp = (OMX_COMPONENTTYPE *) pRPCCtx->pAppData; - if(hComp != NULL) - { - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - /*Indicate fatal error. Users are expected to cleanup the OMX instance - to ensure all resources are cleaned up.*/ - pCompPrv->proxyEventHandler(hComp, pCompPrv->pILAppData, OMX_EventError, - OMX_ErrorHardware, 0, NULL); - } - break; - } - } - } - return (void*)0; -} diff --git a/domx/domx/omx_rpc/src/omx_rpc_config.c b/domx/domx/omx_rpc/src/omx_rpc_config.c deleted file mode 100755 index 8b13789..0000000 --- a/domx/domx/omx_rpc/src/omx_rpc_config.c +++ /dev/null @@ -1 +0,0 @@ - diff --git a/domx/domx/omx_rpc/src/omx_rpc_platform.c b/domx/domx/omx_rpc/src/omx_rpc_platform.c deleted file mode 100755 index 8b13789..0000000 --- a/domx/domx/omx_rpc/src/omx_rpc_platform.c +++ /dev/null @@ -1 +0,0 @@ - diff --git a/domx/domx/omx_rpc/src/omx_rpc_skel.c b/domx/domx/omx_rpc/src/omx_rpc_skel.c deleted file mode 100755 index 5b8d423..0000000 --- a/domx/domx/omx_rpc/src/omx_rpc_skel.c +++ /dev/null @@ -1,329 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc_skel.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC Skeleton implementations. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ - -#include <stdio.h> -#include <string.h> - -#include <timm_osal_interfaces.h> -#include <OMX_TI_Common.h> - -#include "omx_rpc.h" -#include "omx_proxy_common.h" -#include "omx_rpc_skel.h" -#include "omx_rpc_utils.h" -#include "omx_rpc_internal.h" - -/* FUNCTION LIST*/ -/* -RPC_OMX_ERRORTYPE RPC_SKEL_EmptyBufferDone(uint32_t size, uint32_t *data) -RPC_OMX_ERRORTYPE RPC_SKEL_FillBufferDone(uint32_t size, uint32_t *data) -RPC_OMX_ERRORTYPE RPC_SKEL_EventHandler(uint32_t size, uint32_t *data) -*/ - - -/* ===========================================================================*/ -/** - * @name RPC_SKEL_FillBufferDone() - * @brief Skeleton for OMX_AllocateBuffer() - * @param size : Size of the incoming RCM message (parameter used in the RCM alloc call) - * @param *data : Pointer to the RCM message/buffer received - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_SKEL_EmptyBufferDone(void *data) -{ - - OMX_HANDLETYPE hComp; - RPC_OMX_ERRORTYPE tRPCError = RPC_OMX_ErrorNone; - OMX_U32 nfilledLen = 0; - OMX_U32 nOffset = 0; - OMX_U32 nFlags = 0; - OMX_U32 bufferHdr; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_U32 nPos = 0; - //RPC_OMX_MESSAGE *recdMsg; - OMX_U8 *pMsgBody = NULL; - //recdMsg = (RPC_OMX_MESSAGE *) (data); - - pMsgBody = data; //&recdMsg->msgBody[0]; - - DOMX_ENTER(""); - - //Marshalled:[>hComp|>bufferHdr|>nFilledLen|>nOffset|>nFlags] - - RPC_GETFIELDVALUE(pMsgBody, nPos, hComp, OMX_HANDLETYPE); - pHandle = (OMX_COMPONENTTYPE *) hComp; - pCompPrv = (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - RPC_GETFIELDVALUE(pMsgBody, nPos, bufferHdr, OMX_U32); - - RPC_GETFIELDVALUE(pMsgBody, nPos, nfilledLen, OMX_U32); - RPC_GETFIELDVALUE(pMsgBody, nPos, nOffset, OMX_U32); - RPC_GETFIELDVALUE(pMsgBody, nPos, nFlags, OMX_U32); - - tRPCError = - pCompPrv->proxyEmptyBufferDone(hComp, bufferHdr, nfilledLen, - nOffset, nFlags); - - DOMX_EXIT(""); - return tRPCError; -} - -/* ===========================================================================*/ -/** - * @name RPC_SKEL_FillBufferDone() - * @brief Skeleton for OMX_AllocateBuffer() - * @param size : Size of the incoming RCM message (parameter used in the RCM alloc call) - * @param *data : Pointer to the RCM message/buffer received - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_SKEL_FillBufferDone(void *data) -{ - - OMX_HANDLETYPE hComp; - RPC_OMX_ERRORTYPE tRPCError = RPC_OMX_ErrorNone; - OMX_U32 nfilledLen = 0; - OMX_U32 nOffset = 0; - OMX_U32 nFlags = 0; - OMX_TICKS nTimeStamp; - OMX_U32 bufferHdr; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_U32 nPos = 0; - //RPC_OMX_MESSAGE *recdMsg; - OMX_U8 *pMsgBody = NULL; - OMX_HANDLETYPE hMarkTargetComponent = NULL; - OMX_PTR pMarkData = NULL; - //recdMsg = (RPC_OMX_MESSAGE *) (data); - - pMsgBody = data; //&recdMsg->msgBody[0]; - - DOMX_ENTER(""); - - //Marshalled:[>hComp|>bufferHdr|>nFilledLen|>nOffset|>nFlags|>nTimeStamp] - - RPC_GETFIELDVALUE(pMsgBody, nPos, hComp, OMX_HANDLETYPE); - pHandle = (OMX_COMPONENTTYPE *) hComp; - pCompPrv = (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - RPC_GETFIELDVALUE(pMsgBody, nPos, bufferHdr, OMX_U32); - RPC_GETFIELDVALUE(pMsgBody, nPos, nfilledLen, OMX_U32); - RPC_GETFIELDVALUE(pMsgBody, nPos, nOffset, OMX_U32); - RPC_GETFIELDVALUE(pMsgBody, nPos, nFlags, OMX_U32); - RPC_GETFIELDVALUE(pMsgBody, nPos, nTimeStamp, OMX_TICKS); - RPC_GETFIELDVALUE(pMsgBody, nPos, hMarkTargetComponent, - OMX_HANDLETYPE); - RPC_GETFIELDVALUE(pMsgBody, nPos, pMarkData, OMX_PTR); - - tRPCError = - pCompPrv->proxyFillBufferDone(hComp, bufferHdr, nfilledLen, - nOffset, nFlags, nTimeStamp, hMarkTargetComponent, pMarkData); - - DOMX_EXIT(""); - return tRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_SKEL_EventHandler() - * @brief Skeleton for OMX_AllocateBuffer() - * @param size : Size of the incoming RCM message (parameter used in the RCM alloc call) - * @param *data : Pointer to the RCM message/buffer received - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_SKEL_EventHandler(void *data) -{ - OMX_HANDLETYPE hComp; - RPC_OMX_ERRORTYPE tRPCError = RPC_OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_EVENTTYPE eEvent; - OMX_U32 nData1; - OMX_U32 nData2; - OMX_PTR pEventData; - OMX_U32 nPos = 0; - //RPC_OMX_MESSAGE *recdMsg; - OMX_U8 *pMsgBody = NULL; - //recdMsg = (RPC_OMX_MESSAGE *) (data); - pMsgBody = data; //&recdMsg->msgBody[0]; - - DOMX_ENTER(""); - - //Marshalled:[>hComp|>eEvent|>nData1|>nData2|>pEventData] - - RPC_GETFIELDVALUE(pMsgBody, nPos, hComp, OMX_HANDLETYPE); - pHandle = (OMX_COMPONENTTYPE *) hComp; - pCompPrv = (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - RPC_GETFIELDVALUE(pMsgBody, nPos, eEvent, OMX_EVENTTYPE); - RPC_GETFIELDVALUE(pMsgBody, nPos, nData1, OMX_U32); - RPC_GETFIELDVALUE(pMsgBody, nPos, nData2, OMX_U32); - RPC_GETFIELDVALUE(pMsgBody, nPos, pEventData, OMX_PTR); - - DOMX_DEBUG - ("\n**__**Got eventhandler from Remote Core succesffuly - values are : **__**"); - DOMX_DEBUG - ("hComp :0x%x,eEvent: 0x%x,nData1: 0x%x,nData2: 0x%x,pEventData: 0x%x", - hComp, eEvent, nData1, nData2, pEventData); - DOMX_DEBUG("Just Before Entering Proxy Event handler call"); - - tRPCError = - pCompPrv->proxyEventHandler(hComp, pCompPrv->pILAppData, eEvent, - nData1, nData2, pEventData); - - DOMX_EXIT(""); - return tRPCError; - -} - -/* ===========================================================================*/ -/** - * @name EMPTY-SKEL - * @brief - * @param - * @return - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_SKEL_GetHandle(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_SetParameter(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_GetParameter(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_FreeHandle(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_EmptyThisBuffer(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_FillThisBuffer(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_UseBuffer(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_FreeBuffer(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_SetConfig(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_GetConfig(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_GetState(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_SendCommand(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_GetComponentVersion(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_GetExtensionIndex(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_AllocateBuffer(uint32_t size, uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_SKEL_ComponentTunnelRequest(uint32_t size, - uint32_t * data) -{ - return RPC_OMX_ErrorNone; -} diff --git a/domx/domx/omx_rpc/src/omx_rpc_stub.c b/domx/domx/omx_rpc/src/omx_rpc_stub.c deleted file mode 100755 index 0c28ba1..0000000 --- a/domx/domx/omx_rpc/src/omx_rpc_stub.c +++ /dev/null @@ -1,1489 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc_stub.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC Stub implementations. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 30-Apr-2010 Abhishek Ranka : Fixed GetExtension issue - *! - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <errno.h> -#include <string.h> -#include <stdio.h> -#include <unistd.h> - -#include "omx_rpc.h" -#include "omx_rpc_utils.h" -#include "omx_proxy_common.h" -#include "omx_rpc_stub.h" -#include <OMX_TI_Common.h> -#include <timm_osal_interfaces.h> - -#include <linux/rpmsg_omx.h> -#include "rpmsg_omx_defs.h" - -/****************************************************************** - * EXTERNS - ******************************************************************/ - -/****************************************************************** - * MACROS - LOCAL - ******************************************************************/ - -//#define RPC_MSGPIPE_SIZE (4) -#define RPC_MSG_SIZE_FOR_PIPE (sizeof(OMX_PTR)) - -/* When this is defined ETB/FTB calls are made in sync mode. Undefining will - * result in these calls being sent via async mode. Sync mode leads to correct - * functionality as per OMX spec but has a slight performance penalty. Async - * mode sacrifices strict adherence to spec for some gain in performance. */ -#define RPC_SYNC_MODE - - -#define RPC_getPacket(nPacketSize, pPacket) do { \ - pPacket = TIMM_OSAL_Malloc(nPacketSize, TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); \ - RPC_assert(pPacket != NULL, RPC_OMX_ErrorInsufficientResources, \ - "Error Allocating RCM Message Frame"); \ - TIMM_OSAL_Memset(pPacket, 0, nPacketSize); \ - } while(0) - -#define RPC_freePacket(pPacket) do { \ - if(pPacket != NULL) TIMM_OSAL_Free(pPacket); \ - } while(0) - -#define RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, nSize) do { \ - status = write(hCtx->fd_omx, pPacket, nPacketSize); \ - RPC_freePacket(pPacket); \ - pPacket = NULL; \ - if(status < 0 && errno == ENXIO) { \ - RPC_assert(0, RPC_OMX_ErrorHardware, "Write failed - Ducati in faulty state"); \ - } \ - if(status != (signed)nPacketSize) { \ - DOMX_ERROR("Write failed returning status = 0x%x",status); \ - RPC_assert(0, RPC_OMX_ErrorUndefined, "Write failed"); \ - } \ - eError = TIMM_OSAL_ReadFromPipe(hCtx->pMsgPipe[nFxnIdx], &pRetPacket, \ - RPC_MSG_SIZE_FOR_PIPE, (TIMM_OSAL_U32 *)(&nSize), TIMM_OSAL_SUSPEND); \ - RPC_assert(eError == TIMM_OSAL_ERR_NONE, eError, \ - "Read failed"); \ - } while(0) - -/*Set bit 31 on fxn idx as it is static function*/ -#define RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize) do { \ - pOmxPacket = (struct omx_packet *)pPacket; \ - pData = pOmxPacket->data; \ - pOmxPacket->desc |= OMX_DESC_MSG << OMX_DESC_TYPE_SHIFT; \ - pOmxPacket->msg_id = 0; \ - pOmxPacket->flags = OMX_POOLID_JOBID_DEFAULT; \ - pOmxPacket->fxn_idx = (nFxnIdx | 0x80000000); \ - pOmxPacket->result = 0; \ - pOmxPacket->data_size = nPacketSize; \ - } while(0) - -//Async to be checked later - most probably same as sync but without the read -#if 0 - -#define RPC_sendPacket_async(HRCM, pPacket, nFxnIdx) do { \ - pPacket->nFxnIdx = nFxnIdx; \ - status = RcmClient_execCmd(HRCM, pPacket); \ - if(status < 0) { \ - RPC_freePacket(HRCM, pPacket); \ - pPacket = NULL; \ - RPC_assert(0, RPC_OMX_RCM_ErrorExecFail, \ - "RcmClient_exec failed"); \ - } \ - } while(0) - -#define RPC_checkAsyncErrors(rcmHndl, pPacket) do { \ - status = RcmClient_checkForError(rcmHndl, &pPacket); \ - if(status < 0) { \ - RPC_freePacket(rcmHndl, pPacket); \ - pPacket = NULL; \ - } \ - RPC_assert(status >= 0, RPC_OMX_RCM_ClientFail, \ - "Async error check returned error"); \ - } while(0) - -#endif -/* ===========================================================================*/ -/** - * @name RPC_GetHandle() - * @brief Remote invocation stub for OMX_GetHandle - * @param hRPCCtx [OUT] : The RPC context handle. - * @param cComponentName [IN] : Name of the component that is to be created - * on Remote core. - * @param pAppData [IN] : The AppData passed by the user. - * @param pCallBacks [IN] : The callback pointers passed by the caller. - * @param eCompReturn [OUT] : This is return value returned by the remote - * component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_GetHandle(OMX_HANDLETYPE hRPCCtx, - OMX_STRING cComponentName, OMX_PTR pAppData, - OMX_CALLBACKTYPE * pCallBacks, OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = - NULL, pRetData = NULL; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = NULL; - OMX_HANDLETYPE hActualComp = NULL; - OMX_S32 status = 0; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - DOMX_DEBUG("RPC_GetHandle: Recieved GetHandle request from %s", - cComponentName); - - nFxnIdx = RPC_OMX_FXN_IDX_GET_HANDLE; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - DOMX_DEBUG("Packing data"); - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDCOPYGEN(pData, nPos, cComponentName, - OMX_MAX_STRINGNAME_SIZE); - RPC_SETFIELDVALUE(pData, nPos, pAppData, OMX_PTR); - - DOMX_DEBUG("Sending data"); - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - if (*eCompReturn == OMX_ErrorNone) - { - pRetData = ((struct omx_packet *) pRetPacket)->data; - RPC_GETFIELDVALUE(pRetData, nPos, hComp, OMX_HANDLETYPE); - DOMX_DEBUG("Remote Handle 0x%x", hComp); - hCtx->hRemoteHandle = hComp; - /* The handle received above is used for all communications - with the remote component but is not the actual component - handle (it is actually the rpc context handle which - contains lot of other info). The handle recd. below is the - actual remote component handle. This is used at present for - mark buffer implementation since in that case it is not - feasible to send the context handle */ - RPC_GETFIELDVALUE(pRetData, nPos, hActualComp, - OMX_HANDLETYPE); - DOMX_DEBUG("Actual Remote Comp Handle 0x%x", hActualComp); - hCtx->hActualRemoteCompHandle = hActualComp; - } - - /* Save context information */ - hCtx->pAppData = pAppData; - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_FreeHandle() - * @brief Remote invocation stub for OMX_FreeHandle - * @param hRPCCtx [IN] : The RPC context handle. - * @param eCompReturn [OUT] : Return value returned by the remote component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_FreeHandle(OMX_HANDLETYPE hRPCCtx, - OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = NULL; - OMX_S32 status = 0; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_FREE_HANDLE; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; - -} - - - -/* ===========================================================================*/ -/** - * @name RPC_SetParameter() - * @brief Remote invocation stub for OMX_SetParameter - * @param hRPCCtx [IN] : The RPC context handle. - * @param nParamIndex [IN] : Same as nParamIndex received at the proxy. - * @param pCompParam [IN] : Same as pCompParam recieved at the proxy. - * @param eCompReturn [OUT] : Return value returned by the remote component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_SetParameter(OMX_HANDLETYPE hRPCCtx, - OMX_INDEXTYPE nParamIndex, OMX_PTR pCompParam, - OMX_PTR pLocBufNeedMap, OMX_U32 nNumOfLocalBuf, OMX_ERRORTYPE * eCompReturn) -{ - - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_U32 structSize = 0; - struct omx_packet *pOmxPacket = NULL; - - nFxnIdx = RPC_OMX_FXN_IDX_SET_PARAMETER; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - if (pLocBufNeedMap != NULL && (pLocBufNeedMap - pCompParam) >= 0 ) { - if (nNumOfLocalBuf == 1) { - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_ONE_BUF, - RPC_OMX_MAP_INFO_TYPE); - } - else if (nNumOfLocalBuf == 2) { - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_TWO_BUF, - RPC_OMX_MAP_INFO_TYPE); - } - nOffset = (pLocBufNeedMap - pCompParam) + - sizeof(RPC_OMX_MAP_INFO_TYPE) + sizeof(OMX_U32) + - sizeof(OMX_HANDLETYPE) + sizeof(OMX_INDEXTYPE); - } else { - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - } - - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nParamIndex, OMX_INDEXTYPE); - structSize = RPC_UTIL_GETSTRUCTSIZE(pCompParam); - RPC_SETFIELDCOPYGEN(pData, nPos, pCompParam, structSize); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_GetParameter() - * @brief Remote invocation stub for OMX_GetParameter - * @param hRPCCtx [IN] : The RPC context handle. - * @param nParamIndex [IN] : Same as nParamIndex received at the proxy. - * @param pCompParam [IN] : Same as pCompParam recieved at the proxy. - * @param eCompReturn [OUT] : Return value returned by the remote component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_GetParameter(OMX_HANDLETYPE hRPCCtx, - OMX_INDEXTYPE nParamIndex, OMX_PTR pCompParam, - OMX_PTR pLocBufNeedMap, OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = - NULL, pRetData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nDataOffset = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_U32 structSize = 0; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_GET_PARAMETER; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - if (pLocBufNeedMap != NULL && (pLocBufNeedMap - pCompParam) >= 0 ) { - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_ONE_BUF, - RPC_OMX_MAP_INFO_TYPE); - nOffset = (pLocBufNeedMap - pCompParam) + - sizeof(RPC_OMX_MAP_INFO_TYPE) + sizeof(OMX_U32) + - sizeof(OMX_HANDLETYPE) + sizeof(OMX_INDEXTYPE); - } else { - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - } - - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nParamIndex, OMX_INDEXTYPE); - nDataOffset = nPos; - structSize = RPC_UTIL_GETSTRUCTSIZE(pCompParam); - RPC_SETFIELDCOPYGEN(pData, nPos, pCompParam, structSize); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - if (*eCompReturn == OMX_ErrorNone) - { - pRetData = ((struct omx_packet *) pRetPacket)->data; - /*pCompParam is returned in the same location in which it was sent */ - RPC_GETFIELDCOPYGEN(pRetData, nDataOffset, pCompParam, - structSize); - } - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - //In case of Error Hardware this packet gets freed in omx_rpc.c - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_SetConfig() - * @brief Remote invocation stub for OMX_SetConfig - * @param hRPCCtx [IN] : The RPC context handle. - * @param nConfigIndex [IN] : Same as nConfigIndex received at the proxy. - * @param pCompConfig [IN] : Same as pCompConfig recieved at the proxy. - * @param eCompReturn [OUT] : Return value returned by the remote component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_SetConfig(OMX_HANDLETYPE hRPCCtx, - OMX_INDEXTYPE nConfigIndex, OMX_PTR pCompConfig, - OMX_PTR pLocBufNeedMap, OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_U32 structSize = 0; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_SET_CONFIG; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - if (pLocBufNeedMap != NULL && (pLocBufNeedMap - pCompConfig) >= 0 ) { - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_ONE_BUF, - RPC_OMX_MAP_INFO_TYPE); - nOffset = (pLocBufNeedMap - pCompConfig) + - sizeof(RPC_OMX_MAP_INFO_TYPE) + sizeof(OMX_U32) + - sizeof(OMX_HANDLETYPE) + sizeof(OMX_INDEXTYPE); - } else { - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - } - - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nConfigIndex, OMX_INDEXTYPE); - structSize = RPC_UTIL_GETSTRUCTSIZE(pCompConfig); - RPC_SETFIELDCOPYGEN(pData, nPos, pCompConfig, structSize); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - -/* ===========================================================================*/ -/** - * @name RPC_GetConfig() - * @brief Remote invocation stub for OMX_GetConfig - * @param hRPCCtx [IN] : The RPC context handle. - * @param nConfigIndex [IN] : Same as nConfigIndex received at the proxy. - * @param pCompConfig [IN] : Same as pCompConfig recieved at the proxy. - * @param eCompReturn [OUT] : Return value returned by the remote component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_GetConfig(OMX_HANDLETYPE hRPCCtx, - OMX_INDEXTYPE nConfigIndex, OMX_PTR pCompConfig, - OMX_PTR pLocBufNeedMap, OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = - NULL, pRetData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0, nDataOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_U32 structSize = 0; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_GET_CONFIG; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - if (pLocBufNeedMap != NULL && (pLocBufNeedMap - pCompConfig) >= 0 ) { - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_ONE_BUF, - RPC_OMX_MAP_INFO_TYPE); - nOffset = (pLocBufNeedMap - pCompConfig) + - sizeof(RPC_OMX_MAP_INFO_TYPE) + sizeof(OMX_U32) + - sizeof(OMX_HANDLETYPE) + sizeof(OMX_INDEXTYPE); - } else { - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - } - - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nConfigIndex, OMX_INDEXTYPE); - nDataOffset = nPos; - structSize = RPC_UTIL_GETSTRUCTSIZE(pCompConfig); - RPC_SETFIELDCOPYGEN(pData, nPos, pCompConfig, structSize); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - if (*eCompReturn == RPC_OMX_ErrorNone) - { - pRetData = ((struct omx_packet *) pRetPacket)->data; - /*pCompParam is returned in the same location in which it was sent */ - RPC_GETFIELDCOPYGEN(pRetData, nDataOffset, pCompConfig, - structSize); - } - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_SendCommand() - * @brief Remote invocation stub for OMX_SendCommand - * @param hRPCCtx [IN] : The RPC context handle. - * @param eCmd [IN] : Same as eCmd received at the proxy. - * @param nParam [IN] : Same as nParam recieved at the proxy. - * @param pCmdData [IN] : Same as pCmdData recieved at the proxy. - * @param eCompReturn [OUT] : Return value returned by the remote component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_SendCommand(OMX_HANDLETYPE hRPCCtx, - OMX_COMMANDTYPE eCmd, OMX_U32 nParam, OMX_PTR pCmdData, - OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_U32 structSize = 0; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_SEND_CMD; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, eCmd, OMX_COMMANDTYPE); - RPC_SETFIELDVALUE(pData, nPos, nParam, OMX_U32); - - if (pCmdData != NULL && eCmd == OMX_CommandMarkBuffer) - { - /*The RPC_UTIL_GETSTRUCTSIZE will not work here since OMX_MARKTYPE structure - does not have nSize field */ - structSize = sizeof(OMX_MARKTYPE); - RPC_SETFIELDCOPYGEN(pData, nPos, pCmdData, structSize); - } else if (pCmdData != NULL) - { - structSize = RPC_UTIL_GETSTRUCTSIZE(pCmdData); - RPC_SETFIELDCOPYGEN(pData, nPos, pCmdData, structSize); - } - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_GetState() - * @brief Remote invocation stub for OMX_GetState - * @param hRPCCtx [IN] : The RPC context handle. - * @param pState [OUT] : State variable, to be filled in and returned by - * the remote component.. - * @param eCompReturn [OUT] : Return value returned by the remote component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_GetState(OMX_HANDLETYPE hRPCCtx, OMX_STATETYPE * pState, - OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = - NULL, pRetData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_GET_STATE; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - if (*eCompReturn == OMX_ErrorNone) - { - pRetData = ((struct omx_packet *) pRetPacket)->data; - RPC_GETFIELDCOPYTYPE(pRetData, nPos, pState, OMX_STATETYPE); - } - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_GetComponentVersion() - * @brief Remote invocation stub for OMX_GetComponentVersion - * @param hRPCCtx [IN] : The RPC context handle. - * @param pComponentName [OUT] : Component name, to be filled in and returned - * by the remote component. - * @param pComponentVersion [OUT] : Component version info, to be filled in and - * returned by the remote component. - * @param pSpecVersion [OUT] : Spec version info, to be filled in and - * returned by the remote component. - * @param pComponentUUID [OUT] : Component UUID info, to be filled in and - * returned by the remote component (optional). - * @param eCompReturn [OUT] : Return value returned by the remote - * component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_GetComponentVersion(OMX_HANDLETYPE hRPCCtx, - OMX_STRING pComponentName, OMX_VERSIONTYPE * pComponentVersion, - OMX_VERSIONTYPE * pSpecVersion, OMX_UUIDTYPE * pComponentUUID, - OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = - NULL, pRetData = NULL; - OMX_S32 status = 0; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_GET_VERSION; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - if (*eCompReturn == OMX_ErrorNone) - { - pRetData = ((struct omx_packet *) pRetPacket)->data; - RPC_GETFIELDCOPYGEN(pRetData, nPos, pComponentName, - OMX_MAX_STRINGNAME_SIZE); - RPC_GETFIELDCOPYTYPE(pRetData, nPos, pComponentVersion, - OMX_VERSIONTYPE); - RPC_GETFIELDCOPYTYPE(pRetData, nPos, pSpecVersion, - OMX_VERSIONTYPE); - memcpy(pComponentUUID,(OMX_UUIDTYPE *)( (OMX_U32)pRetData + nPos), sizeof(OMX_UUIDTYPE)); - } - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_GetExtensionIndex() - * @brief Remote invocation stub for OMX_GetExtensionIndex - * @param hRPCCtx [IN] : The RPC context handle. - * @param cParameterName [IN] : The parameter name sent by the user. - * @param pIndexType [OUT] : Index type returned by the remote component. - * @param eCompReturn [OUT] : Return value returned by the remote component. - * @return RPC_OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_GetExtensionIndex(OMX_HANDLETYPE hRPCCtx, - OMX_STRING cParameterName, OMX_INDEXTYPE * pIndexType, - OMX_ERRORTYPE * eCompReturn) -{ - - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = - NULL, pRetData = NULL; - OMX_S32 status = 0; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - struct omx_packet *pOmxPacket = NULL; - - nFxnIdx = RPC_OMX_FXN_IDX_GET_EXT_INDEX; - - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDCOPYGEN(pData, nPos, cParameterName, - OMX_MAX_STRINGNAME_SIZE); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - if (*eCompReturn == OMX_ErrorNone) - { - pRetData = ((struct omx_packet *) pRetPacket)->data; - RPC_GETFIELDCOPYTYPE(pRetData, nPos, pIndexType, - OMX_INDEXTYPE); - } - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - return eRPCError; - -} - -/* ***************************** DATA APIs ******************************** */ - -/* ===========================================================================*/ -/** - * @name RPC_AllocateBuffer() - * @brief Remote invocation stub for OMX_AllcateBuffer() - * @param size : Size of the incoming RCM message (parameter used in the RCM alloc call) - * @param *data : Pointer to the RCM message/buffer received - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_AllocateBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, OMX_IN OMX_U32 nPortIndex, - OMX_U32 * pBufHeaderRemote, OMX_PTR pAppPrivate, OMX_U32 nSizeBytes, - OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = - NULL, pRetData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_TI_PLATFORMPRIVATE *pPlatformPrivate = NULL; - OMX_BUFFERHEADERTYPE *pBufferHdr = *ppBufferHdr; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_ALLOCATE_BUFFER; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nPortIndex, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pAppPrivate, OMX_PTR); - RPC_SETFIELDVALUE(pData, nPos, nSizeBytes, OMX_U32); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - if (*eCompReturn == OMX_ErrorNone) - { - pRetData = ((struct omx_packet *) pRetPacket)->data; - RPC_GETFIELDVALUE(pRetData, nPos, *pBufHeaderRemote, OMX_U32); - //save platform private before overwriting - pPlatformPrivate = (*ppBufferHdr)->pPlatformPrivate; - //RPC_GETFIELDCOPYTYPE(pData, nPos, pBufferHdr, OMX_BUFFERHEADERTYPE); - /*Copying each field of the header separately due to padding issues in - the buffer header structure */ - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nSize, OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nVersion, - OMX_VERSIONTYPE); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->pBuffer, - OMX_U8 *); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nAllocLen, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nFilledLen, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nOffset, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->pAppPrivate, - OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->pPlatformPrivate, OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->pInputPortPrivate, OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->pOutputPortPrivate, OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->hMarkTargetComponent, OMX_HANDLETYPE); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->pMarkData, - OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nTickCount, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nTimeStamp, - OMX_TICKS); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nFlags, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->nInputPortIndex, OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->nOutputPortIndex, OMX_U32); - - (*ppBufferHdr)->pPlatformPrivate = pPlatformPrivate; - -#ifdef TILER_BUFF - DOMX_DEBUG(" Copying plat pvt. "); - //if (offset != 0) - { - RPC_GETFIELDCOPYTYPE(pRetData, nPos, - (OMX_TI_PLATFORMPRIVATE - *) ((*ppBufferHdr)->pPlatformPrivate), - OMX_TI_PLATFORMPRIVATE); - DOMX_DEBUG("Done copying plat pvt., aux buf = 0x%x", - ((OMX_TI_PLATFORMPRIVATE - *) ((*ppBufferHdr)->pPlatformPrivate))-> - pAuxBuf1); - } -#endif - - } else - { - //DOMX_DEBUG("OMX Error received: 0x%x", - // pRPCMsg->msgHeader.nOMXReturn); - } - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - -/* ===========================================================================*/ -/** - * @name RPC_UseBuffer() - * @brief Remote invocation stub for OMX_AllcateBuffer() - * @param hComp: This is the handle on the Remote core, the proxy will replace - it's handle with actual OMX Component handle that recides on the specified core - * @param ppBufferHdr: - * @param nPortIndex: - * @param pAppPrivate: - * @param eCompReturn: This is return value that will be supplied by Proxy to the caller. - * This is actual return value returned by the Remote component - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_UseBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, OMX_U32 nPortIndex, - OMX_PTR pAppPrivate, OMX_U32 nSizeBytes, OMX_U8 * pBuffer, - OMX_U32 * pBufHeaderRemote, OMX_ERRORTYPE * eCompReturn) -{ - - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = - NULL, pRetData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_TI_PLATFORMPRIVATE *pPlatformPrivate = NULL; - OMX_BUFFERHEADERTYPE *pBufferHdr = *ppBufferHdr; - struct omx_packet *pOmxPacket = NULL; - RPC_OMX_MAP_INFO_TYPE eMapInfo = RPC_OMX_MAP_INFO_NONE; - OMX_PTR pMetaDataBuffer = NULL; - OMX_U32 a =32; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_USE_BUFFER; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - DOMX_DEBUG("Marshaling data"); - /*Buffer mapping required */ - eMapInfo = RPC_OMX_MAP_INFO_ONE_BUF; - if (((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)-> - pAuxBuf1 != NULL) - eMapInfo = RPC_OMX_MAP_INFO_TWO_BUF; - if (((OMX_TI_PLATFORMPRIVATE *)pBufferHdr->pPlatformPrivate)-> - pMetaDataBuffer != NULL) - eMapInfo = RPC_OMX_MAP_INFO_THREE_BUF; - - /*Offset is the location of the buffer pointer from the start of the data packet */ - nOffset = - sizeof(RPC_OMX_MAP_INFO_TYPE) + sizeof(OMX_U32) + - sizeof(OMX_HANDLETYPE) + sizeof(OMX_U32) + sizeof(OMX_PTR) + - sizeof(OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, eMapInfo, RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nPortIndex, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pAppPrivate, OMX_PTR); - RPC_SETFIELDVALUE(pData, nPos, nSizeBytes, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, pBuffer, OMX_U32); - DOMX_DEBUG("eMapInfo = %x",eMapInfo); - if (eMapInfo >= RPC_OMX_MAP_INFO_TWO_BUF) - { - RPC_SETFIELDVALUE(pData, nPos, - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr-> - pPlatformPrivate)->pAuxBuf1, OMX_U32); - DOMX_DEBUG("UV buffer fd= %d",((OMX_TI_PLATFORMPRIVATE *)pBufferHdr->pPlatformPrivate)->pAuxBuf1); - } - - if (eMapInfo >= RPC_OMX_MAP_INFO_THREE_BUF) - { - RPC_SETFIELDVALUE(pData, nPos, - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr-> - pPlatformPrivate)->pMetaDataBuffer, OMX_U32); - DOMX_DEBUG("Metadata buffer = %d",((OMX_TI_PLATFORMPRIVATE *)pBufferHdr->pPlatformPrivate)->pMetaDataBuffer); - } - - DOMX_DEBUG("About to send packet"); - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - DOMX_DEBUG("Remote call returned"); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - if (*eCompReturn == OMX_ErrorNone) - { - pRetData = ((struct omx_packet *) pRetPacket)->data; - RPC_GETFIELDVALUE(pRetData, nPos, *pBufHeaderRemote, OMX_U32); - //save platform private before overwriting - pPlatformPrivate = (*ppBufferHdr)->pPlatformPrivate; - - /*Copying each field of the header separately due to padding issues in - the buffer header structure */ - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nSize, OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nVersion, - OMX_VERSIONTYPE); - /* - Do not expect buffer pointer - local buffer pointer is already - present in the local header. - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->pBuffer, - OMX_U8 *); - */ - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nAllocLen, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nFilledLen, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nOffset, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->pAppPrivate, - OMX_PTR); - //Do not expect PlatformPrivate from Ducati - //RPC_GETFIELDVALUE(pRetData, nPos,pBufferHdr->pPlatformPrivate, OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->pInputPortPrivate, OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->pOutputPortPrivate, OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->hMarkTargetComponent, OMX_HANDLETYPE); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->pMarkData, - OMX_PTR); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nTickCount, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nTimeStamp, - OMX_TICKS); - RPC_GETFIELDVALUE(pRetData, nPos, pBufferHdr->nFlags, - OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->nInputPortIndex, OMX_U32); - RPC_GETFIELDVALUE(pRetData, nPos, - pBufferHdr->nOutputPortIndex, OMX_U32); - - //Do not expect PlatformPrivate from Ducati - /* - (*ppBufferHdr)->pPlatformPrivate = pPlatformPrivate; - - DOMX_DEBUG(" Copying plat pvt. "); - RPC_GETFIELDCOPYTYPE(pRetData, nPos, - (OMX_TI_PLATFORMPRIVATE *) ((*ppBufferHdr)-> - pPlatformPrivate), OMX_TI_PLATFORMPRIVATE);*/ - - /*Resetting size as it might be diff on Ducati due to padding issues */ - pBufferHdr->nSize = sizeof(OMX_BUFFERHEADERTYPE); - } - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - -/* ===========================================================================*/ -/** - * @name RPC_FreeBuffer() - * @brief Remote invocation stub for OMX_AllcateBuffer() - * @param size : Size of the incoming RCM message (parameter used in the RCM alloc call) - * @param *data : Pointer to the RCM message/buffer received - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_FreeBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_U32 BufHdrRemote, OMX_U32 pBuffer, - OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = NULL; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - struct omx_packet *pOmxPacket = NULL; - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_FREE_BUFFER; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*Offset is the location of the buffer pointer from the start of the data packet */ - nOffset = sizeof(RPC_OMX_MAP_INFO_TYPE) + sizeof(OMX_U32) + - sizeof(OMX_HANDLETYPE) + sizeof(OMX_U32) + sizeof(OMX_U32); - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_ONE_BUF, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nPortIndex, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, BufHdrRemote, OMX_U32); - /* Buffer is being sent separately only to catch NULL buffer errors - in PA mode */ - RPC_SETFIELDVALUE(pData, nPos, pBuffer, OMX_U32); - - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - -/* ===========================================================================*/ -/** - * @name RPC_EmptyThisBuffer() - * @brief - * @param size : Size of the incoming RCM message (parameter used in the RCM alloc call) - * @param *data : Pointer to the RCM message/buffer received - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ - -RPC_OMX_ERRORTYPE RPC_EmptyThisBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_BUFFERHEADERTYPE * pBufferHdr, OMX_U32 BufHdrRemote, - OMX_ERRORTYPE * eCompReturn, OMX_BOOL bMapBuffer) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_U8 *pAuxBuf1 = NULL; - struct omx_packet *pOmxPacket = NULL; - RPC_OMX_MAP_INFO_TYPE eMapInfo = RPC_OMX_MAP_INFO_NONE; -#ifdef RPC_SYNC_MODE - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = NULL; -#endif - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_EMPTYTHISBUFFER; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - if(bMapBuffer == OMX_TRUE) - { - pAuxBuf1 = ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)->pAuxBuf1; - /*Buffer mapping required */ - if (((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)->pAuxBuf1 == NULL) - eMapInfo = RPC_OMX_MAP_INFO_ONE_BUF; - else - eMapInfo = RPC_OMX_MAP_INFO_TWO_BUF; - /*Offset is the location of the buffer pointer from the start of the data packet */ - nOffset = - sizeof(RPC_OMX_MAP_INFO_TYPE) + sizeof(OMX_U32) + - sizeof(OMX_HANDLETYPE) + sizeof(OMX_BUFFERHEADERTYPE *) + 3*sizeof(OMX_U32) + - sizeof(OMX_TICKS) + sizeof(OMX_HANDLETYPE) + sizeof(OMX_PTR) + 3*sizeof(OMX_U32); - } - - RPC_SETFIELDVALUE(pData, nPos, eMapInfo, RPC_OMX_MAP_INFO_TYPE); - - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, - (OMX_BUFFERHEADERTYPE *) BufHdrRemote, OMX_BUFFERHEADERTYPE *); - - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nFilledLen, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nOffset, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nFlags, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nTimeStamp, OMX_TICKS); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->hMarkTargetComponent, - OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->pMarkData, OMX_PTR); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nAllocLen, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nOutputPortIndex, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nInputPortIndex, OMX_U32); - - if(bMapBuffer == OMX_TRUE) - { - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->pBuffer, OMX_U32); - if (eMapInfo == RPC_OMX_MAP_INFO_TWO_BUF) - { - RPC_SETFIELDVALUE(pData, nPos, - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)->pAuxBuf1, OMX_U32); - } - } - - DOMX_DEBUG(" pBufferHdr = %x BufHdrRemote %x", pBufferHdr, - BufHdrRemote); - -#ifdef RPC_SYNC_MODE - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); -#else - RPC_sendPacket_async(hCtx->ClientHndl[RCM_DEFAULT_CLIENT], pPacket, - nFxnIdx); - RPC_checkAsyncErrors(hCtx->ClientHndl[RCM_DEFAULT_CLIENT], pPacket); - - *eCompReturn = OMX_ErrorNone; -#endif - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - -/* ===========================================================================*/ -/** - * @name RPC_FillThisBuffer() - * @brief Remote invocation stub for OMX_AllcateBuffer() - * @param size : Size of the incoming RCM message (parameter used in the RCM alloc call) - * @param *data : Pointer to the RCM message/buffer received - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_FillThisBuffer(OMX_HANDLETYPE hRPCCtx, - OMX_BUFFERHEADERTYPE * pBufferHdr, OMX_U32 BufHdrRemote, - OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - OMX_U8 *pAuxBuf1 = NULL; - struct omx_packet *pOmxPacket = NULL; -#ifdef RPC_SYNC_MODE - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = NULL; -#endif - - DOMX_ENTER(""); - - nFxnIdx = RPC_OMX_FXN_IDX_FILLTHISBUFFER; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*No buffer mapping required */ - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, - RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, nOffset, OMX_U32); - - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, - (OMX_BUFFERHEADERTYPE *) BufHdrRemote, OMX_BUFFERHEADERTYPE *); - - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nFilledLen, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nOffset, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nFlags, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nAllocLen, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nOutputPortIndex, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, pBufferHdr->nInputPortIndex, OMX_U32); - - DOMX_DEBUG(" pBufferHdr = %x BufHdrRemote %x", pBufferHdr, - BufHdrRemote); - -#ifdef RPC_SYNC_MODE - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - -#else - RPC_sendPacket_async(hCtx->ClientHndl[RCM_DEFAULT_CLIENT], pPacket, - nFxnIdx); - RPC_checkAsyncErrors(hCtx->ClientHndl[RCM_DEFAULT_CLIENT], pPacket); - - *eCompReturn = OMX_ErrorNone; -#endif - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket && *eCompReturn != OMX_ErrorHardware) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; -} - - -/* ***************************** EMPTY APIs ******************************** */ - -/* ===========================================================================*/ -/** - * @name EMPTY-STUB - * @brief - * @param - * @return - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE RPC_EventHandler(OMX_HANDLETYPE hRPCCtx, OMX_PTR pAppData, - OMX_EVENTTYPE eEvent, OMX_U32 nData1, OMX_U32 nData2, OMX_PTR pEventData) -{ - return RPC_OMX_ErrorNone; -} - -OMX_ERRORTYPE RPC_EmptyBufferDone(OMX_HANDLETYPE hRPCCtx, OMX_PTR pAppData, - OMX_BUFFERHEADERTYPE * pBuffer) -{ - return RPC_OMX_ErrorNone; -} - -OMX_ERRORTYPE RPC_FillBufferDone(OMX_HANDLETYPE hRPCCtx, OMX_PTR pAppData, - OMX_BUFFERHEADERTYPE * pBuffer) -{ - return RPC_OMX_ErrorNone; -} - -RPC_OMX_ERRORTYPE RPC_ComponentTunnelRequest(OMX_HANDLETYPE hRPCCtx, - OMX_IN OMX_U32 nPort, OMX_HANDLETYPE hTunneledRemoteHandle, - OMX_U32 nTunneledPort, OMX_INOUT OMX_TUNNELSETUPTYPE * pTunnelSetup, - OMX_ERRORTYPE * eCompReturn) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - OMX_U32 nPacketSize = RPC_PACKET_SIZE; - RPC_OMX_CONTEXT *hCtx = hRPCCtx; - OMX_HANDLETYPE hComp = hCtx->hRemoteHandle; - RPC_OMX_CONTEXT *hTunneledCtx = hTunneledRemoteHandle; - OMX_HANDLETYPE hTunneledComp = hTunneledCtx->hRemoteHandle; - RPC_OMX_FXN_IDX_TYPE nFxnIdx; - struct omx_packet *pOmxPacket = NULL; - OMX_U32 nPos = 0, nSize = 0, nOffset = 0; - OMX_S32 status = 0; -#ifdef RPC_SYNC_MODE - TIMM_OSAL_PTR pPacket = NULL, pRetPacket = NULL, pData = NULL; -#endif - - printf(" Entering rpc:domx_stub.c:ComponentTunnelRequest\n"); - - nFxnIdx = RPC_OMX_FXN_IDX_COMP_TUNNEL_REQUEST; - RPC_getPacket(nPacketSize, pPacket); - RPC_initPacket(pPacket, pOmxPacket, pData, nFxnIdx, nPacketSize); - - /*Pack the values into a packet*/ - //Marshalled:[>ParentComp|>ParentPort|>TunnelComp|>TunneledPort>TunnelSetup] - RPC_SETFIELDVALUE(pData, nPos, RPC_OMX_MAP_INFO_NONE, RPC_OMX_MAP_INFO_TYPE); - RPC_SETFIELDVALUE(pData, nPos, hComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nPort, OMX_U32); - RPC_SETFIELDVALUE(pData, nPos, hTunneledComp, OMX_HANDLETYPE); - RPC_SETFIELDVALUE(pData, nPos, nTunneledPort, OMX_U32); - printf("\n after RPC_sendPacket_sync"); - RPC_sendPacket_sync(hCtx, pPacket, nPacketSize, nFxnIdx, pRetPacket, - nSize); - - printf("\n after RPC_sendPacket_sync: *eCompReturn : 0x%x\n", (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result)); - *eCompReturn = (OMX_ERRORTYPE) (((struct omx_packet *) pRetPacket)->result); - - EXIT: - if (pPacket) - RPC_freePacket(pPacket); - if (pRetPacket) - RPC_freePacket(pRetPacket); - - DOMX_EXIT(""); - return eRPCError; - -} diff --git a/domx/domx/omx_rpc/src/omx_rpc_utils.c b/domx/domx/omx_rpc/src/omx_rpc_utils.c deleted file mode 100755 index b1e47a8..0000000 --- a/domx/domx/omx_rpc/src/omx_rpc_utils.c +++ /dev/null @@ -1,446 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_rpc_utils.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework RPC. - * - * @path \WTSD_DucatiMMSW\framework\domx\omx_rpc\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 29-Mar-2010 Abhishek Ranka : Revamped DOMX implementation - *! - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <string.h> -#include <stdio.h> - -#include "omx_rpc.h" -#include "omx_rpc_internal.h" -#include "omx_rpc_utils.h" -#include <MultiProc.h> -#include <ProcMgr.h> - -extern char rcmservertable[MAX_PROC][MAX_SERVER_NAME_LENGTH]; -extern char Core_Array[MAX_PROC][MAX_CORENAME_LENGTH]; - -/* ===========================================================================*/ -/** - * @name EMPTY-STUB - * @brief - * @param - * @return - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_UTIL_GetTargetServerName(OMX_STRING ComponentName, - OMX_STRING ServerName) -{ - OMX_U8 count = 0; - OMX_U8 i = 0; - OMX_U8 servertable_idx = 0; - OMX_STRING str; - char Core[MAX_CORENAME_LENGTH]; - - DOMX_ENTER(""); - DOMX_DEBUG(" Calling Component Name %s", ComponentName); - - while (*ComponentName != '\0') - { - if (*ComponentName == '.') - { - count++; - if (count == 2) - { - ComponentName++; - str = ComponentName; - - while (*str != '.') - { - Core[i] = *str; - i++; - str++; - } - Core[i] = '\0'; - break; - } - - } - - ComponentName++; - } - - DOMX_DEBUG(" CORE NAME RECOVERED: %s", Core); - DOMX_DEBUG - ("____________________________________________________________"); - DOMX_DEBUG("Recovering Server Table Index"); - for (i = 0; i < CORE_MAX; i++) - { - - if (strcmp(Core, Core_Array[i]) == 0) - { - servertable_idx = i; - DOMX_DEBUG("Recovered Server table index = %d", i); - break; - } - } - strncpy(ServerName, (OMX_STRING) rcmservertable[servertable_idx], - MAX_SERVER_NAME_LENGTH); - DOMX_DEBUG(" ServerName recovered = %s", ServerName); - - return RPC_OMX_ErrorNone; -} - -/* ===========================================================================*/ -/** - * @name EMPTY-STUB - * @brief - * @param - * @return - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_UTIL_GetLocalServerName(OMX_STRING ComponentName, - OMX_STRING * ServerName) -{ -/* Implementation returns only current core ID - But this is a place holder to abstract out the -default server and other additional servers available on the current core. This additional servers -should be available in the RPC global that is indexed using the calling component name*/ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_U8 servertable_idx = 0; - - servertable_idx = MultiProc_getId(NULL); //This can be replace with the mechanism to obtain new addition rcm servers - if (MultiProc_INVALIDID != servertable_idx) - *ServerName = rcmservertable[servertable_idx]; - else - eRPCError = RPC_OMX_ErrorUndefined; - - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_UTIL_GenerateLocalServerName() - * @brief This function generates a server name to be used while creating the - * RCM server. The name is based on the pid so that eacj process gets a - * unique server name. - * @param cServerName - This is filled in and returned with a valid value. - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_UTIL_GenerateLocalServerName(OMX_STRING cServerName) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_S32 pid = 0; - OMX_U32 nProcId = 0; - - pid = getpid(); - /*Using pid as the server name, thus limiting to only 1 server per process. - This limitaion is partly enforce by syslink as well since max size of server - name is 32 so only pid can fit into the name */ - sprintf(cServerName, "%ld", pid); - - nProcId = MultiProc_getId(NULL); - if (MultiProc_INVALIDID != nProcId) - /*Fill the server table with the newly generated name */ - strncpy(rcmservertable[nProcId], cServerName, - MAX_SERVER_NAME_LENGTH); - else - eRPCError = RPC_OMX_ErrorUndefined; - - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_UTIL_GetTargetCore() - * @brief This function gets the target core id by parsing the component name. - * It is assumed that component names follow the convention - * <OMX>.<Company Name>.<Core Name>.<Domain>.<Component Details> with - * all characters in upper case for e.g. OMX.TI.DUCATI1.VIDEO.H264E - * @param cComponentName - Name of the component. - * @param nCoreId - Core ID, this is filled in and returned. - * @return RPC_OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_UTIL_GetTargetCore(OMX_STRING cComponentName, - OMX_U32 * nCoreId) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_S8 cCoreName[MAX_SERVER_NAME_LENGTH] = { 0 }; - OMX_S32 ret = 0; - OMX_U32 i = 0; - - ret = - sscanf(cComponentName, "%*[^'.'].%*[^'.'].%[^'.'].%*s", - cCoreName); - RPC_assert(ret == 1, RPC_OMX_ErrorBadParameter, - "Incorrect component name"); - - for (i = 0; i < CORE_MAX; i++) - { - if (strcmp((char *)cCoreName, Core_Array[i]) == 0) - break; - } - RPC_assert(i < CORE_MAX, RPC_OMX_ErrorBadParameter, - "Unknown core name"); - *nCoreId = i; - - EXIT: - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name EMPTY-STUB - * @brief the Api creates the RCM client on the target core(where the component sits). -This happens in the context of the Default RCM server on the target core. -The RCM server name to connect for this client will be the default RCM server on the calling core. -This can be provided as an option as the name that you pass in the string server is used as the RCM server name -input to the client create call. -@Default_RcmServer - The default rcm server on the target core -@Server - The name of the server on the calling core to connect to - * @param - * @return - * - */ -/* ===========================================================================*/ -/* -RPC_OMX_ERRORTYPE RPC_GetTargetClient(OMX_STRING Default_RcmServer, OMX_STRING server, rcmhHndl) -{ - - -} -*/ - -/* ===========================================================================*/ -/** - * @name EMPTY-STUB - * @brief - * @param - * @return - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_MapBuffer(OMX_U32 mappedBuffer) -{ - DOMX_ENTER(""); - DOMX_DEBUG("Empty implementation "); - //PlaceHolder for Mapping Buffers - Cuurently no implementation here - return RPC_OMX_ErrorNone; -} - -/* ===========================================================================*/ -/** - * @name EMPTY-STUB - * @brief - * @param - * @return - * - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_UnMapBuffer(OMX_U32 mappedBuffer) -{ - DOMX_ENTER(""); - DOMX_DEBUG("Empty implementation "); - //PlaceHolder for UnMapping Buffers - Cuurently no implementation here - return RPC_OMX_ErrorNone; -} - -/* ===========================================================================*/ -/** - * @name RPC_FlushBuffer - * @brief Used to flush buffers from cache to memory. Used when buffers are - * being transferred across processor boundaries. - * @param pBuffer : Pointer to the data that has to be flushed. - * size : Size of the data to be flushed. - * nTargetCoreId : Core to which buffer is being transferred. - * @return RPC_OMX_ErrorNone : Success. - * RPC_OMX_ErrorUndefined : Flush operation failed. - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_FlushBuffer(OMX_U8 * pBuffer, OMX_U32 size, - OMX_U32 nTargetCoreId) -{ - DOMX_ENTER(""); - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_S32 nStatus = 0; - - DOMX_DEBUG("About to flush %d bytes", size); - nStatus = ProcMgr_flushMemory((OMX_PTR) pBuffer, size, - (ProcMgr_ProcId) nTargetCoreId); - RPC_assert(nStatus >= 0, RPC_OMX_ErrorUndefined, - "Cache flush failed"); - - EXIT: - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_InvalidateBuffer - * @brief Used to flush buffers from cache to memory. Used when buffers are - * being transferred across processor boundaries. - * @param pBuffer : Pointer to the data that has to be flushed. - * size : Size of the data to be flushed. - * nTargetCoreId : Core to which buffer is being transferred. - * @return RPC_OMX_ErrorNone : Success. - * RPC_OMX_ErrorUndefined : Invalidate operation failed. - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_InvalidateBuffer(OMX_U8 * pBuffer, OMX_U32 size, - OMX_U32 nTargetCoreId) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_S32 nStatus = 0; - DOMX_ENTER(""); - - DOMX_DEBUG("About to invalidate %d bytes", size); - nStatus = ProcMgr_invalidateMemory((OMX_PTR) pBuffer, size, - (ProcMgr_ProcId) nTargetCoreId); - RPC_assert(nStatus >= 0, RPC_OMX_ErrorUndefined, - "Cache invalidate failed"); - - EXIT: - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_Util_AcquireJobId - * @brief Used to get a new job id from syslink - all messages sent with the - * same job id will be processed serially. Messages with different job id - * will be processed parallely. - * @param hRPCCtx : RPC context handle. - * pJobId : Pointer to job id - this'll be filled in and returned. - * @return RPC_OMX_ErrorNone : Success. - * Any other : Operation failed. - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_Util_AcquireJobId(RPC_OMX_CONTEXT * hRPCCtx, - OMX_U16 * pJobId) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_S32 nStatus = 0; - DOMX_ENTER(""); - - nStatus = - RcmClient_acquireJobId(hRPCCtx->ClientHndl[RCM_DEFAULT_CLIENT], - pJobId); - RPC_assert(nStatus >= 0, RPC_OMX_ErrorUndefined, - "Acquire job id failed"); - - EXIT: - DOMX_EXIT("eRPCError = %d", eRPCError); - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_Util_ReleaseJobId - * @brief Used to release job id to syslink. Once release, this job id cannot be - * reused. - * @param hRPCCtx : RPC context handle. - * nJobId : Job ID to be released. - * @return RPC_OMX_ErrorNone : Success. - * Any other : Operation failed. - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_Util_ReleaseJobId(RPC_OMX_CONTEXT * hRPCCtx, - OMX_U16 nJobId) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_S32 nStatus = 0; - DOMX_ENTER(""); - - nStatus = - RcmClient_releaseJobId(hRPCCtx->ClientHndl[RCM_DEFAULT_CLIENT], - nJobId); - RPC_assert(nStatus >= 0, RPC_OMX_ErrorUndefined, - "Release job id failed"); - - EXIT: - DOMX_EXIT("eRPCError = %d", eRPCError); - return eRPCError; -} - - - -/* ===========================================================================*/ -/** - * @name RPC_Util_GetPoolId - * @brief Used to get pool id. Messages sent with same pool id will get - * processed at the same priority on remote core. - * @param hRPCCtx : RPC context handle. - * pPoolId : Pointer to pool id - this'll be filled in and - * returned. - * @return RPC_OMX_ErrorNone : Success. - * Any other : Operation failed. - */ -/* ===========================================================================*/ -RPC_OMX_ERRORTYPE RPC_Util_GetPoolId(RPC_OMX_CONTEXT * hRPCCtx, - OMX_U16 * pPoolId) -{ - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - DOMX_ENTER(""); - - *pPoolId = 0x8001; - -//EXIT: - DOMX_EXIT("eRPCError = %d", eRPCError); - return eRPCError; -} diff --git a/domx/domx/profiling/inc/profile.h b/domx/domx/profiling/inc/profile.h deleted file mode 100644 index 352a91c..0000000 --- a/domx/domx/profiling/inc/profile.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file profile.h -* The header file defines the trace events definitions. -* @path platform\hardware\ti\domx\domx\profiling\inc\ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 1.0: Created the first draft version - * ========================================================================= */ - -#ifndef _PROFILE_H_ -#define _PROFILE_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* #ifdef __cplusplus */ - -#include <OMX_Types.h> -#include <OMX_Component.h> - -#include "omx_rpc_utils.h" -#include "omx_proxy_common.h" - -enum KPI_BUFFER_EVENT { - KPI_BUFFER_ETB = 1, - KPI_BUFFER_FTB = 2, - KPI_BUFFER_EBD = 3, - KPI_BUFFER_FBD = 4 -}; - -/** - * OMX monitoring component init. Registers component - */ -void KPI_OmxCompInit(OMX_HANDLETYPE hComponent); - -/** - * OMX monitoring component deinit. Unregisters component - */ -void KPI_OmxCompDeinit(OMX_HANDLETYPE hComponent); - -/** - * OMA monitoring buffer event trace. Traces FTB/ETB/FBD/EBD event - */ -void KPI_OmxCompBufferEvent(enum KPI_BUFFER_EVENT event, OMX_HANDLETYPE hComponent, PROXY_BUFFER_INFO* pBuffer); - -#ifdef __cplusplus -} -#endif /* #ifdef __cplusplus */ - -#endif /* #ifndef _PROFILE_H_ */ diff --git a/domx/domx/profiling/src/profile.c b/domx/domx/profiling/src/profile.c deleted file mode 100644 index bc050b7..0000000 --- a/domx/domx/profiling/src/profile.c +++ /dev/null @@ -1,299 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file profile.c - * This file contains methods to profile DOMX - * - * @path ...\hardware\ti\domx\domx\profiling\inc - * - * @rev 1.0 - */ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -/* ----- system and platform files ----------------------------*/ -#include <stdlib.h> -#include <string.h> -#include <time.h> - -#ifdef _Android -#include <cutils/properties.h> -#endif - -#include <OMX_Types.h> -#include <OMX_Component.h> - -/*-------program files ----------------------------------------*/ -#include "omx_rpc_utils.h" -#include "omx_proxy_common.h" -#include "profile.h" - - -/****************************************************************** - * DEFINES - CONSTANTS - ******************************************************************/ -/* Events that can be dynamically enabled */ -enum KPI_STATUS { - KPI_BUFFER_EVENTS = 1 -}; - -/* OMX buffer events per component */ -typedef struct { - OMX_HANDLETYPE hComponent; - OMX_U32 count_ftb; - OMX_U32 count_fbd; - OMX_U32 count_etb; - OMX_U32 count_ebd; - char name[50]; -} kpi_omx_component; - -/* we trace up to MAX_OMX_COMP components */ -#define MAX_OMX_COMP 8 - - -/*************************************************************** - * kpi_omx_monitor - * ------------------------------------------------------------- - * Contains up to 8 components data - * - ***************************************************************/ -kpi_omx_component kpi_omx_monitor[MAX_OMX_COMP]; /* we trace up to MAX_OMX_COMP components */ -OMX_U32 kpi_omx_monitor_cnt = 0; /* no component yet */ -unsigned int kpi_status = 0; - - -/* ===========================================================================*/ -/** - * @name KPI_GetTime() - * @brief Compute time since boot to timestamp events - * @param void - * @return OMX_U64 = time since boot in us - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_U64 KPI_GetTime(void) -{ - struct timespec tp; - - clock_gettime(CLOCK_MONOTONIC, &tp); - return (tp.tv_sec * 1000000 + tp.tv_nsec / 1000); -} - -/* ===========================================================================*/ -/** - * @name KPI_OmxCompKpiUpdateStatus() - * @brief Update dynamic activation of traces - * @param void - * @return void - * @sa TBD - * - */ -/* ===========================================================================*/ -void KPI_OmxCompKpiUpdateStatus(void) -{ - char *val = getenv("DEBUG_DOMX_KPI_STATUS"); - - if (val) - { - kpi_status = strtol(val, NULL, 0); - } -#ifdef _Android - else - { - char value[PROPERTY_VALUE_MAX]; - int val; - - property_get("debug.domx.kpi_status", value, "0"); - val = atoi(value); - if (val >= 0) - kpi_status = val; - } -#endif -} - -/* ===========================================================================*/ -/** - * @name KPI_OmxCompInit() - * @brief Prepare monitoring structure for new component starting - * @param void - * @return void - * @sa TBD - * - */ -/* ===========================================================================*/ -void KPI_OmxCompInit(OMX_HANDLETYPE hComponent) -{ - OMX_VERSIONTYPE nVersionComp; - OMX_VERSIONTYPE nVersionSpec; - OMX_UUIDTYPE compUUID; - char compName[OMX_MAX_STRINGNAME_SIZE]; - char* p; - OMX_U32 omx_cnt; - struct timespec tp; - - /* Check if some profiling events have been enabled/disabled */ - KPI_OmxCompKpiUpdateStatus(); - - if ( !(kpi_status & KPI_BUFFER_EVENTS) ) - return; - - /* First init: clear kpi_omx_monitor components */ - if( kpi_omx_monitor_cnt == 0) { - for (omx_cnt = 0; omx_cnt < MAX_OMX_COMP; omx_cnt++) { - /*clear handler registry */ - kpi_omx_monitor[omx_cnt].hComponent = 0; - } - } - - /* find an empty monitoring structure */ - for( omx_cnt = 0; omx_cnt < MAX_OMX_COMP; omx_cnt++ ) { - if( kpi_omx_monitor[omx_cnt].hComponent == 0 ) break; - } - - /* too omany components started, do not monitor */ - if( omx_cnt >= MAX_OMX_COMP) return; - - /* current comp num and update */ - kpi_omx_monitor_cnt++; - - /* register the component handle */ - kpi_omx_monitor[omx_cnt].hComponent = hComponent; - - /* reset event counts */ - kpi_omx_monitor[omx_cnt].count_ftb = 0; - kpi_omx_monitor[omx_cnt].count_fbd = 0; - kpi_omx_monitor[omx_cnt].count_etb = 0; - kpi_omx_monitor[omx_cnt].count_ebd = 0; - - /* register the component name */ - ((OMX_COMPONENTTYPE*) hComponent)->GetComponentVersion(hComponent, compName, &nVersionComp, &nVersionSpec, &compUUID); - - /* get the end of the string compName... */ - p = compName + strlen( compName ) - 1; - while( (*p != '.' ) && (p != compName) ) p--; - strncpy(kpi_omx_monitor[omx_cnt].name, p + 1, 6); - - /* trace component init */ - DOMX_PROF("<KPI> OMX %-6s Init %-8lld", kpi_omx_monitor[omx_cnt].name, KPI_GetTime()); - - return; -} - -/* ===========================================================================*/ -/** - * @name KPI_OmxCompDeinit() - * @brief Reset monitoring structure for component stopping - * @param void - * @return void - * @sa TBD - * - */ -/* ===========================================================================*/ -void KPI_OmxCompDeinit( OMX_HANDLETYPE hComponent) -{ - OMX_U32 omx_cnt; - - if ( !(kpi_status & KPI_BUFFER_EVENTS) ) - return; - - if( kpi_omx_monitor_cnt == 0) return; - - /* identify the component from the registry */ - for( omx_cnt = 0; omx_cnt < MAX_OMX_COMP; omx_cnt++ ) { - if( kpi_omx_monitor[omx_cnt].hComponent == hComponent ) break; - } - - /* trace component init */ - DOMX_PROF( "<KPI> OMX %-6s Deinit %-8lld", kpi_omx_monitor[omx_cnt].name, KPI_GetTime()); - - /* unregister the component */ - kpi_omx_monitor[omx_cnt].hComponent = 0; - - kpi_omx_monitor_cnt--; - - return; -} - -/* ===========================================================================*/ -/** - * @name KPI_OmxCompBufferEvent() - * @brief Trace FTB/ETB/FBD/EBD events - * @param void - * @return void - * @sa TBD - * - */ -/* ===========================================================================*/ -void KPI_OmxCompBufferEvent(enum KPI_BUFFER_EVENT event, OMX_HANDLETYPE hComponent, PROXY_BUFFER_INFO* pBuffer) -{ - OMX_U32 omx_cnt; - - if ( !(kpi_status & KPI_BUFFER_EVENTS) ) - return; - - if (kpi_omx_monitor_cnt == 0) return; - - /* identify the component from the registry */ - for (omx_cnt = 0; omx_cnt < MAX_OMX_COMP; omx_cnt++) { - if( kpi_omx_monitor[omx_cnt].hComponent == hComponent ) break; - } - - /* Update counts and trace the event */ - if( omx_cnt < MAX_OMX_COMP ) { - /* trace the event, we trace remote address to correlate to Ducati trace */ - switch(event) { - case KPI_BUFFER_ETB: - DOMX_PROF("ETB %-6s %-4u %-8lld x%-8x", kpi_omx_monitor[omx_cnt].name, \ - (unsigned int)++kpi_omx_monitor[omx_cnt].count_etb, KPI_GetTime(), (unsigned int)pBuffer->pBufHeaderRemote); - break; - case KPI_BUFFER_FTB: - DOMX_PROF("FTB %-6s %-4u %-8lld x%-8x", kpi_omx_monitor[omx_cnt].name, \ - (unsigned int)++kpi_omx_monitor[omx_cnt].count_ftb, KPI_GetTime(), (unsigned int)pBuffer->pBufHeaderRemote); - break; - case KPI_BUFFER_EBD: - DOMX_PROF("EBD %-6s %-4u %-8lld x%-8x", kpi_omx_monitor[omx_cnt].name, \ - (unsigned int)++kpi_omx_monitor[omx_cnt].count_ebd, KPI_GetTime(), (unsigned int)pBuffer->pBufHeaderRemote); - break; - /* we add timestamp metadata because this is a unique identifier of buffer among all SW layers */ - case KPI_BUFFER_FBD: - DOMX_PROF("FBD %-6s %-4u %-8lld x%-8x %lld", kpi_omx_monitor[omx_cnt].name, \ - (unsigned int)++kpi_omx_monitor[omx_cnt].count_fbd, KPI_GetTime(), (unsigned int)pBuffer->pBufHeaderRemote, pBuffer->pBufHeader->nTimeStamp); - break; - - } - } - - return; -} diff --git a/domx/domx/rpmsg_omx_defs.h b/domx/domx/rpmsg_omx_defs.h deleted file mode 100644 index d3df1f5..0000000 --- a/domx/domx/rpmsg_omx_defs.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * OMX offloading remote processor driver - */ - -#ifndef RPMSG_OMX_DEFS_H -#define RPMSG_OMX_DEFS_H - -#include <linux/rpmsg_omx.h> - -//AD - from SDO -/* - * ======== OMX_Packet ======== - * - * OMX_Packet.desc: the package descriptor field. Note that the - * format is different for out-bound and in-bound messages. - * - * out-bound message descriptor - * - * Bits Description - * -------------------------------------------------------------------- - * [15:12] reserved - * [11:8] omx message type - * [7:0] omx client protocol version - * - * - * in-bound message descriptor - * - * Bits Description - * -------------------------------------------------------------------- - * [15:12] reserved - * [11:8] omx server status code - * [7:0] omx server protocol version - */ -/* message type values */ -#define OMX_DESC_MSG 0x1 // exec sync command -#define OMX_DESC_SYM_ADD 0x3 // symbol add message -#define OMX_DESC_SYM_IDX 0x4 // query symbox index -#define OMX_DESC_CMD 0x5 // exec non-blocking command. -#define OMX_DESC_TYPE_MASK 0x0F00 // field mask -#define OMX_DESC_TYPE_SHIFT 8 // field shift width - -/* omx server status codes must be 0 - 15, it has to fit in a 4-bit field */ -#define OMXSERVER_STATUS_SUCCESS ((uint16_t)0) // success -#define OMXSERVER_STATUS_INVALID_FXN ((uint16_t)1) // invalid fxn index -#define OMXSERVER_STATUS_SYMBOL_NOT_FOUND ((uint16_t)2) // symbol not found -#define OMXSERVER_STATUS_INVALID_MSG_TYPE ((uint16_t)3) // invalid msg type -#define OMXSERVER_STATUS_MSG_FXN_ERR ((uint16_t)4) // msg function error -#define OMXSERVER_STATUS_ERROR ((uint16_t)5) // general failure -#define OMXSERVER_STATUS_UNPROCESSED ((uint16_t)6) // unprocessed message - -#define OMX_POOLID_JOBID_DEFAULT (0x00008000) -#define OMX_INVALIDFXNIDX ((uint32_t)(0xFFFFFFFF)) - -#endif /* RPMSG_OMX_DEFS_H */ diff --git a/domx/make/build.mk b/domx/make/build.mk deleted file mode 100644 index 2faeffa..0000000 --- a/domx/make/build.mk +++ /dev/null @@ -1,379 +0,0 @@ -# -# Copyright 2001-2009 Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# dspbridge/mpu_api/make/build.mk -# -# DSP-BIOS Bridge build rules. - -# ALL PATHS IN MAKEFILE MUST BE RELATIVE TO ITS DIRECTORY - -CDEFS += $(CMDDEFS) # Add command line definitions -CDEFS += $(PROCFAMILY) # Processor Family e.g. 3430 -CDEFS += $(CMDDEFS_START) # Definitions from start.mk -# ---------------------------------------------------------- -# REMOVE LEADING AND TRAILING SPACES FROM MAKEFILE MACROS -# ---------------------------------------------------------- - -TARGETNAME := $(strip $(TARGETNAME)) -TARGETTYPE := $(strip $(TARGETTYPE)) -SUBMODULES := $(strip $(SUBMODULES)) -SOURCES := $(strip $(SOURCES)) -INCLUDES := $(strip $(INCLUDES)) -LIBINCLUDES := $(strip $(LIBINCLUDES)) - -SH_SONAME := $(strip $(SH_SONAME)) -ST_LIBS := $(strip $(ST_LIBS)) -SH_LIBS := $(strip $(SH_LIBS)) - -CFLAGS := $(strip $(CFLAGS)) -CDEFS := $(strip $(CDEFS)) -EXEC_ARGS := $(strip $(EXEC_ARGS)) -ST_LIB_ARGS := $(strip $(ST_LIB_ARGS)) -SH_LIB_ARGS := $(strip $(SH_LIB_ARGS)) - -# ---------------------------------------------------------- -# COMPILER OPTIONS -# ---------------------------------------------------------- - -# Preprocessor : dependency file generation -ifndef NODEPENDS -ifndef nodepends -CFLAGS += -MD -endif -endif - -# Overall -CFLAGS += -pipe -# Preprocessor -CFLAGS += -# Debugging -ifeq ($(BUILD),deb) -CFLAGS += -g -else -CFLAGS += -fomit-frame-pointer -endif -# Warnings -CFLAGS += -Wall -Wno-trigraphs -Werror-implicit-function-declaration #-Wno-format -# Optimizations -#CFLAGS += -O2 -fno-strict-aliasing -#CFLAGS += -Os -fno-strict-aliasing -CFLAGS += -fno-strict-aliasing -# Machine dependent - -ifeq ($(PROCFAMILY),OMAP_3430) -CFLAGS += -mapcs -mno-sched-prolog -mabi=aapcs-linux -mno-thumb-interwork -march=armv7-a -msoft-float -Uarm -D"KBUILD_STR(s)=\#s" -D"KBUILD_BASENAME=KBUILD_STR($(basename $(TARGETNAME)))" -D"KBUILD_MODNAME=KBUILD_STR($(basename $(TARGETNAME)))" -DMODULE -D__LINUX_ARM_ARCH__=7 -endif - -ifeq ($(PROCFAMILY),OMAP_4430) -CFLAGS += -mapcs -mno-sched-prolog -mabi=aapcs-linux -mno-thumb-interwork -march=armv7-a -msoft-float -Uarm -D"KBUILD_STR(s)=\#s" -D"KBUILD_BASENAME=KBUILD_STR($(basename $(TARGETNAME)))" -D"KBUILD_MODNAME=KBUILD_STR($(basename $(TARGETNAME)))" -DMODULE -D__LINUX_ARM_ARCH__=7 -endif - -# Code generation -CFLAGS += -fno-common -# Macros -CFLAGS += -DLINUX $(addprefix -D, $(CDEFS)) - -ifdef __KERNEL__ -CFLAGS += -D__KERNEL__ -fno-builtin -endif - -# ---------------------------------------------------------- -# OBJECTS -# ---------------------------------------------------------- - -BUILDDIR = .obj/ - -# setup the target - check the given type - make sure we have the -# correct suffix on it -# TARGETNAME should not have a suffix on it - give an error if it does -#ifneq ($(suffix $(TARGETNAME)),) -# $(error TARGETNAME can not have a suffix) -#endif -ifeq ($(TARGETTYPE),SH_LIB) - TARGET := $(basename $(TARGETNAME)).so -else -ifeq ($(TARGETTYPE),MODULE) - TARGET := $(basename $(TARGETNAME)).o - TARGETKO := $(addsuffix .ko,$(basename $(TARGET))) - TARGETMOD := $(addsuffix .mod,$(basename $(TARGET))) -else -ifeq ($(TARGETTYPE),ST_LIB) - TARGET := $(basename $(TARGETNAME)).a -else -ifeq ($(TARGETTYPE),EXEC) - TARGET := $(basename $(TARGETNAME)).out -else -ifneq ($(TARGETTYPE),) -TARGET := $(error Invalid TARGETTYPE) -endif -endif -endif -endif -endif - -#LIBINCLUDES += $(TARGETDIR) $(TGTROOT)/lib $(TGTROOT)/usr/lib -LIBINCLUDES += $(TARGETDIR)/lib $(TARGETDIR)/usr/lib -SRCDIRS := $(sort $(dir $(SOURCES))) -OBJDIRS := $(addprefix $(BUILDDIR),$(SRCDIRS)) $(BUILDDIR) - -BASEOBJ := $(addsuffix .o,$(basename $(SOURCES))) -OBJECTS := $(addprefix $(BUILDDIR), $(BASEOBJ)) - -ST_LIBNAMES := $(addsuffix .a, $(addprefix lib, $(ST_LIBS))) -DL_LIBNAMES := $(addsuffix .so, $(addprefix lib, $(SH_LIBS))) - -vpath %.a $(LIBINCLUDES) $(TGTROOT)/lib $(TGTROOT)/usr/lib -vpath %.so $(LIBINCLUDES) $(TGTROOT)/lib $(TGTROOT)/usr/lib - -# ---------------------------------------------------------- -# BUILD ARGUMENTS -# ---------------------------------------------------------- - -MAPFILE := -Wl,-Map,$(TARGET).map -INCPATH := $(addprefix -I, . $(INCLUDES)) $(LINUXINCLUDE) -LIBPATH := $(addprefix -L, $(LIBINCLUDES)) -LIBFILE := $(addprefix -l, $(ST_LIBS) $(SH_LIBS)) $(LIB_OBJS) - -ifeq ($(TARGETTYPE),SH_LIB) -CFLAGS += -fpic -TARGETARGS := $(SH_LIB_ARGS) -nostartfiles -nodefaultlibs -nostdlib -shared -Wl -ifneq ($(SH_SONAME),) -TARGETARGS += -Wl,-soname,$(SH_SONAME) -endif -endif - -ifeq ($(TARGETTYPE),MODULE) -TARGETARGS := $(SH_LIB_ARGS) -nostartfiles -nodefaultlibs -nostdlib -Wl,-r -ifneq ($(SH_SONAME),) -TARGETARGS += -Wl,-soname,$(SH_SONAME) -endif -endif - -ifeq ($(TARGETTYPE),ST_LIB) -TARGETARGS := $(ST_LIB_ARGS) -nostartfiles -nodefaultlibs -nostdlib -Wl,-r -endif - -ifeq ($(TARGETTYPE),EXEC) -TARGETARGS := $(EXEC_ARGS) -endif - -.PHONY : all $(SUBMODULES) clean cleantrg SHELLERR Debug - -# ========================================================== -# all -# ========================================================== -all : $(CHECKSHELL) $(SUBMODULES) - -# ========================================================== -# Make submodules -# ========================================================== -$(SUBMODULES): -ifndef NORECURSE -ifndef norecurse - $(MAKE) -C $@ $(filter-out $(SUBMODULES),$(MAKECMDGOALS)) -endif -endif - -ifneq ($(TARGETTYPE),) - -# if this is driver module level , build KO file too -ifneq ($(TOPLEVEL),) -all : $(OBJDIRS) $(TARGETKO) -else -all : $(OBJDIRS) $(TARGET) -endif - -# ========================================================== -# Create directories -# ========================================================== -$(OBJDIRS) $(TARGETDIR) : - @$(call MKDIR, $@) - -# ========================================================== -# Product 2.6.x kernel module based on target -# ========================================================== - -# Link module .o with vermagic .o -$(TARGETKO): $(TARGETMOD).o $(TARGET) - $(LD) -EL -r -o $@ $^ - -# Compile vermagic -$(TARGETMOD).o: $(TARGETMOD).c - $(CC) -c $(TARGETARGS) $(CFLAGS) $(INCPATH) -o $@ $< - -# Generate Module vermagic -$(TARGETMOD).c: $(TARGET) - $(MODPOST) $(TARGET) -# removed - need to be done as a pre-step to building -# $(MAKE) -C $(KRNLSRC) modules - -# ========================================================== -# Build target -# ========================================================== -$(TARGET):$(OBJECTS) $(ST_LIBNAMES) $(DL_LIBNAMES) -# @$(SHELLCMD) echo Building $@ -# $(CC) $(TARGETARGS) $(CFLAGS) $(LIBPATH) $(MAPFILE) -o $@ $(BASEOBJ) $(LIBFILE) -# $(CC) $(TARGETARGS) $(CFLAGS) $(LIBPATH) $(MAPFILE) -o $@ $(OBJECTS) $(LIBFILE) -ifeq ($(TARGETTYPE),ST_LIB) - $(AR) r $@ $(OBJECTS) -else - $(CC) $(TARGETARGS) $(CFLAGS) $(LIBPATH) $(MAPFILE) -o $@ $(OBJECTS) $(LIBFILE) -endif - -# ========================================================== -# Compile .c file -# ========================================================== -$(BUILDDIR)%.o:%.c -# echo Compiling $(patsubst $(BUILDDIR)%.o,%.c, $@) - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $(patsubst $(BUILDDIR)%.o,%.c, $@) - -# ========================================================== -# Compile .S file -# ========================================================== -$(BUILDDIR)%.o:%.S -# echo Compiling $(patsubst $(BUILDDIR)%.o,%.S, $@) - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $(patsubst $(BUILDDIR)%.o,%.S, $@) - -endif # ifneq ($(TARGETTYPE),) - -# ---------------------------------------------------------- -# install - install the files -# ---------------------------------------------------------- -install:: $(TARGETDIR) $(SUBMODULES) $(TARGET) -ifdef HOSTRELEASE -ifdef SH_SONAME - $(INSTALL) -D $(TARGET) $(TARGETDIR)/$(HOSTRELEASE)/$(SH_SONAME) - $(RM) -f $(TARGETDIR)/$(HOSTRELEASE)/$(TARGET) - ln -s $(SH_SONAME) $(TARGETDIR)/$(HOSTRELEASE)/$(TARGET) -else -ifneq ($(TOPLEVEL),) - $(INSTALL) -D $(TARGETKO) $(TARGETDIR)/$(HOSTRELEASE)/$(TARGETKO) -else - $(INSTALL) -D $(TARGET) $(TARGETDIR)/$(HOSTRELEASE)/$(TARGET) -endif -endif -endif -ifdef 0 # removed - components shouldn't put things in the production fs -ifdef ROOTFSRELEASE - $(call MKDIR, $(ROOTFSDIR)/$(ROOTFSRELEASE)) -ifdef SH_SONAME - $(STRIP) --strip-unneeded -xgo $(ROOTFSDIR)/$(ROOTFSRELEASE)/$(SH_SONAME) $(TARGET) - $(RM) -f $(ROOTFSDIR)/$(ROOTFSRELEASE)/$(TARGET) - ln -s $(SH_SONAME) $(ROOTFSDIR)/$(ROOTFSRELEASE)/$(TARGET) -else -ifneq ($(TOPLEVEL),) - $(STRIP) --strip-unneeded -xgo $(ROOTFSDIR)/$(ROOTFSRELEASE)/$(TARGETKO) $(TARGETKO) -else - $(STRIP) --strip-unneeded -xgo $(ROOTFSDIR)/$(ROOTFSRELEASE)/$(TARGET) $(TARGET) -endif -endif -endif -endif - -# ---------------------------------------------------------- -# clean - Remove build directory and target files -# Linux : Removes object and dependency files in build folder -# DOS : Removes object dirs in build folder -# ---------------------------------------------------------- -clean : $(SUBMODULES) -ifneq ($(TARGETTYPE),) -ifneq ($(OBJECTS),) - - $(call RM,-f $(OBJECTS)) - - $(call RM,-f $(OBJECTS:.o=.d)) - - $(call RMDIR,-f $(BUILDDIR)) -endif - - $(call RM,-f $(TARGET)) - - $(call RM,-f $(TARGET).map) - - $(call RM,-f $(TARGETKO)) - - $(call RM,-f $(TARGETMOD).c) - - $(call RM,-f $(TARGETMOD).o) - - $(call RM,-f $(TARGETMOD).d) -ifneq ($(TOPLEVEL),) - - @$(call RM,-f $(TARGETKO)) - - @$(call RM,-f $(TARGETMOD).c) - - @$(call RM,-f $(TARGETMOD).o) - - @$(call RM,-f $(TARGETMOD).d) -endif -endif - -cleantrg : $(SUBMODULES) -ifneq ($(TARGETTYPE),) - - @$(call RM, $(TARGET)) - - @$(call RM, $(TARGET).map) -ifneq ($(TOPLEVEL),) - - @$(call RM, $(TARGETKO)) - - @$(call RM, $(TARGETMOD).c) - - @$(call RM, $(TARGETMOD).o) - - @$(call RM, $(TARGETMOD).d) -endif -endif - -# ---------------------------------------------------------- -# Include dependency files generated by preprocessor. -# -# Dependency files are placed in main object directory because -# dependent files' paths for same source file varies with the -# directory from where gmake is run -# ---------------------------------------------------------- -ifndef NODEPENDS -ifndef nodepends -ifneq ($(OBJECTS),) --include $(OBJECTS:.o=.d) -endif -endif -endif - -# ---------------------------------------------------------- -# Generate fatal error if make variable SHELL is incorrect -# ---------------------------------------------------------- -SHELLERR:: - @$(SHELLCMD) echo Fatal error: SHELL set to $(SHELL) instead of $(MYSHELL) - @$(SHELLCMD) echo set $(MYSHELL) to correct path and CASE SENSITIVE FILE NAME and EXTENSTION - @$(SHELLCMD) echo of your command shell - $(ERR) - - -# ---------------------------------------------------------- -# For debugging script -# ---------------------------------------------------------- -Debug::$(SUBMODULES) - @$(SHELLCMD) echo SHELL: $(SHELL) - @$(SHELLCMD) echo - @$(SHELLCMD) echo CDEFS: $(CDEFS) - @$(SHELLCMD) echo - @$(SHELLCMD) echo CONFIG_SHELL: $(CONFIG_SHELL) - @$(SHELLCMD) echo - @$(SHELLCMD) echo CURDIR: $(CURDIR) - @$(SHELLCMD) echo - @$(SHELLCMD) echo SRCDIRS: $(SRCDIRS) - @$(SHELLCMD) echo - @$(SHELLCMD) echo OBJDIRS: $(OBJDIRS) - @$(SHELLCMD) echo - @$(SHELLCMD) echo OBJECTS: $(OBJECTS) - @$(SHELLCMD) echo - @$(SHELLCMD) echo BUILDDIR: $(BUILDDIR) - @$(SHELLCMD) echo - @$(SHELLCMD) echo TARGETDIR TARGETNAME: $(TARGET) - @$(SHELLCMD) echo - @$(SHELLCMD) echo MAKEDIR: $(MAKEDIR) - @$(SHELLCMD) echo - @$(SHELLCMD) echo INCLUDES: $(INCLUDES) - @$(SHELLCMD) echo - @$(SHELLCMD) echo DL_LIBNAMES: $(DL_LIBNAMES) - @$(SHELLCMD) echo - @$(SHELLCMD) echo LIBFILE: $(LIBFILE) - @$(SHELLCMD) echo - diff --git a/domx/make/start.mk b/domx/make/start.mk deleted file mode 100644 index 57921ac..0000000 --- a/domx/make/start.mk +++ /dev/null @@ -1,101 +0,0 @@ -# -# Copyright 2001-2009 Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# dspbridge/mpu_api/make/start.mk -# -# DSP-BIOS Bridge build rules. -# - -# make sure we have a rootdir -ifndef PROJROOT -$(error Error: variable PROJROOT not defined) -endif - -# make sure we have a bridgeroot -#ifndef BRIDGEROOT -#$(error Error: variable BRIDGEROOT not defined) -#endif - - -CMDDEFS = -CMDDEFS_START = - - -CROSS=arm-none-linux-gnueabi- -PROCFAMILY=OMAP_4430 - - -ifndef PROCFAMILY -$(error Error: PROCFAMILY can not be determined from Kernel .config) -endif - -ifndef TARGETDIR -TARGETDIR=$(PROJROOT)/target -endif - - - -#default (first) target should be "all" -#make sure the target directories are created -#all: $(HOSTDIR) $(ROOTFSDIR) $(TARGETDIR) -#all: $(TARGETDIR) - -CONFIG_SHELL := /bin/bash - -SHELL := $(CONFIG_SHELL) - -# Current version of gmake (3.79.1) cannot run windows shell's internal commands -# We need to invoke command interpreter explicitly to do so. -# for winnt it is cmd /c <command> -SHELLCMD:= - -ifneq ($(SHELL),$(CONFIG_SHELL)) -CHECKSHELL:=SHELLERR -else -CHECKSHELL:= -endif - -# Error string to generate fatal error and abort gmake -ERR = $(error Makefile generated fatal error while building target "$@") - -CP := cp - -MAKEFLAGS = r - -QUIET := &> /dev/null - -# Should never be := -RM = rm $(1) -MV = mv $(1) $(2) -RMDIR = rm -r $(1) -MKDIR = mkdir -p $(1) -INSTALL = install - -# Current Makefile directory -MAKEDIR := $(CURDIR) - -# Implicit rule search not needed for *.d, *.c, *.h -%.d: -%.c: -%.h: - -# Tools -CC := $(CROSS)gcc -AR := $(CROSS)ar -LD := $(CROSS)ld -STRIP := $(CROSS)strip - - diff --git a/domx/mm_osal/Android.mk b/domx/mm_osal/Android.mk deleted file mode 100644 index ee4719a..0000000 --- a/domx/mm_osal/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - src/timm_osal.c \ - src/timm_osal_events.c \ - src/timm_osal_memory.c \ - src/timm_osal_mutex.c \ - src/timm_osal_pipes.c \ - src/timm_osal_semaphores.c \ - src/timm_osal_task.c \ - src/timm_osal_trace.c - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/inc - -LOCAL_SHARED_LIBRARIES := \ - libdl \ - liblog \ - libc \ - libcutils - -LOCAL_CFLAGS += -DOMAP_2430 -DOMX_DEBUG -D_Android -D_POSIX_VERSION_1_ -#LOCAL_CFLAGS += -DTIMM_OSAL_DEBUG_TRACE_DETAIL=1 # quiet - -LOCAL_MODULE := libmm_osal -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/domx/mm_osal/Makefile b/domx/mm_osal/Makefile deleted file mode 100644 index a83814f..0000000 --- a/domx/mm_osal/Makefile +++ /dev/null @@ -1,61 +0,0 @@ - -include $(PROJROOT)/make/start.mk - - - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = libmm_osal - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = SH_LIB - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = lib - -# install directory relative to the root filesystem -ROOTFSRELEASE = lib - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ - src/timm_osal.c \ - src/timm_osal_events.c \ - src/timm_osal_memory.c \ - src/timm_osal_mutex.c \ - src/timm_osal_pipes.c \ - src/timm_osal_semaphores.c \ - src/timm_osal_task.c \ - src/timm_osal_trace.c - - - -# Search path for include files - -INCLUDES = \ - inc/ \ - - - -ST_LIBS = -SH_LIBS = -#pthread -#pthread rt utils procmgr ipc rcm notify -#SH_LIBS += sysmgr sysmemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk - diff --git a/domx/mm_osal/inc/timm_osal_error.h b/domx/mm_osal/inc/timm_osal_error.h deleted file mode 100755 index 37b20e7..0000000 --- a/domx/mm_osal/inc/timm_osal_error.h +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_timm_osal_error.h -* The osal header file defines the error codes -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_ERROR_H_ -#define _TIMM_OSAL_ERROR_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#include "timm_osal_types.h" - -/** A unique ID for each component*/ - typedef TIMM_OSAL_U16 TIMM_OSAL_COMPID; - -/** TIMM_OSAL_ERROR is a 32 bits unsigned integer. - * Each error code can be broken up into three fields as given below: - * - Type of error (2 bits): NO_ERROR: 00, WARNING: 01, FATAL_ERROR: 10 - * - Component ID (14 bits): A unique ID which indicates which of the component generated the error - * - Error ID (16 bits): The specific error generated by a component - */ - typedef TIMM_OSAL_U32 TIMM_OSAL_ERRORTYPE; - -#define TIMM_OSAL_OK 0 -#define TIMM_OSAL_WAR 1 -#define TIMM_OSAL_ERR 2 - - -/* Macro to process TIMM_OSAL_ERROR */ - -/** This macro tests if the provided M4OSA_ERR is a warning or not*/ -#define TIMM_OSAL_IS_WARNING(error) ((((error)>>30) == TIMM_OSAL_WAR) ? 1:0) - -/** This macro tests if the provided M4OSA_ERR is a fatal error or not*/ -#define TIMM_OSAL_IS_ERROR(error) ((((error)>>30) == TIMM_OSAL_ERR) ? 1:0) - -/** This macro returns an error code accroding to the 3 provided fields: - * @arg Type: (IN) [TIMM_OSAL_U32] Type of error to put in the error code - * @arg compID: (IN) [TIMM_OSAL_U32] CompID to put in the error code - * @arg errorID: (IN) [TIMM_OSAL_U32] ErrorID to put in the error code*/ -#define TIMM_OSAL_ERR_CREATE(type, compID, errorID)\ - (((type)<<30)+(((compID)&0x003FFF)<<16)+((errorID)&0x00FFFF)) - -/** This macro extracts the 3 fields from the error: - * @arg error: (IN) [TIMM_OSAL_ERRORTYPE] Error code - * @arg type: (OUT) [TIMM_OSAL_U32] Type of error in the error code - * @arg compID: (OUT) [TIMM_OSAL_U32] CompID to put in the error code - * @arg errorID: (OUT) [TIMM_OSAL_U32] ErrorID to put in the error code*/ -#define TIMM_OSAL_ERR_SPLIT(error, type, compID, errorID)\ - { type=(TIMM_OSAL_U32)((error)>>30);\ - compID=(TIMM_OSAL_U32)(((error)>>16)&0x003FFF);\ - (TIMM_OSAL_U32)(errorID=(error)&0x00FFFF); } - -/* Component IDs */ -#define TIMM_OSAL_COMP_GENERAL 0x00 -#define TIMM_OSAL_COMP_MEMORY 0x01 -#define TIMM_OSAL_COMP_PIPES 0x02 -#define TIMM_OSAL_COMP_EVENTS 0x03 -#define TIMM_OSAL_COMP_SEMAPHORES 0x04 -#define TIMM_OSAL_COMP_TASK 0x05 - -/* Definition of common error codes */ -/** there is no error*/ -#define TIMM_OSAL_ERR_NONE ((TIMM_OSAL_ERRORTYPE) 0x00000000) - - -/** There is no more memory available*/ -#define TIMM_OSAL_ERR_ALLOC ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000001)) -#define TIMM_OSAL_ERR_OUT_OF_RESOURCE ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000002)) - -/** Time out */ -#define TIMM_OSAL_WAR_TIMEOUT ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_WAR,TIMM_OSAL_COMP_GENERAL,0x000003)) -#define TIMM_OSAL_ERR_PARAMETER ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000004)) -#define TIMM_OSAL_ERR_NOT_READY ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000005)) -#define TIMM_OSAL_ERR_OMX ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000006)) -#define TIMM_OSAL_ERR_PIPE_FULL ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000007)) -#define TIMM_OSAL_ERR_PIPE_EMPTY ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000008)) -#define TIMM_OSAL_ERR_PIPE_DELETED ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000009)) -#define TIMM_OSAL_ERR_PIPE_RESET ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x00000A)) -#define TIMM_OSAL_ERR_GROUP_DELETED ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x00000B)) -#define TIMM_OSAL_ERR_UNKNOWN ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x00000C)) - - -#define TIMM_OSAL_ERR_SEM_CREATE_FAILED ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_SEMAPHORE,0x000001)) - -/*Added during Linux Porting*/ -#define TIMM_OSAL_ERR_NO_PERMISSIONS ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x00000D)) -#define TIMM_OSAL_ERR_RESOURCE_EXISTS ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x00000E)) -#define TIMM_OSAL_ERR_RESOURCE_REMOVED ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x00000F)) -#define TIMM_OSAL_ERR_SYSTEM_LIMIT_EXCEEDED ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000010)) -#define TIMM_OSAL_ERR_NOT_SUPPORTED ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000011)) -#define TIMM_OSAL_ERR_SIGNAL_CAUGHT ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000012)) -#define TIMM_OSAL_ERR_TIMEOUT ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_GENERAL,0x000013)) - - - -#define TIMM_OSAL_COMP_MSG_Q 0x06 -#define TIMM_OSAL_ERR_MSG_SIZE_MISMATCH ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_MSG_Q,0x000001)) -#define TIMM_OSAL_ERR_MSG_TYPE_NOT_FOUND ((TIMM_OSAL_ERRORTYPE) TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR,TIMM_OSAL_COMP_MSG_Q,0x000002)) - - -/* -#define GOTO_EXIT_IF(_Cond,_ErrorCode) { \ - if ((_Cond)) { \ - status = _ErrorCode; \ - printf ("Error :: %s : %s : %d :: Exiting because : %s\n", \ - __FILE__, __FUNCTION__, __LINE__, #_Cond); \ - goto EXIT; \ - } \ -} -*/ - -#define SWITCH_CASE(_Case, _ErrCode, _ErrMsg)\ - case _Case:\ - TIMM_OSAL_Error(_ErrMsg);\ - bReturnStatus = _ErrCode;\ - break; - -#define SWITCH_DEFAULT_CASE(_ErrCode, _ErrMsg )\ - default:\ - TIMM_OSAL_Error(_ErrMsg);\ - bReturnStatus = _ErrCode;\ - break; - - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /*_TIMM_OSAL_ERROR_H_*/ diff --git a/domx/mm_osal/inc/timm_osal_events.h b/domx/mm_osal/inc/timm_osal_events.h deleted file mode 100755 index 20a4d84..0000000 --- a/domx/mm_osal/inc/timm_osal_events.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_defines.h -* The osal header file defines -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_EVENTS_H_ -#define _TIMM_OSAL_EVENTS_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#include "timm_osal_types.h" - - typedef enum TIMM_OSAL_EVENT_OPERATION - { - TIMM_OSAL_EVENT_AND, - TIMM_OSAL_EVENT_AND_CONSUME, - TIMM_OSAL_EVENT_OR, - TIMM_OSAL_EVENT_OR_CONSUME - } TIMM_OSAL_EVENT_OPERATION; - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_EventCreate(TIMM_OSAL_PTR * pEvents); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_EventDelete(TIMM_OSAL_PTR pEvents); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_EventSet(TIMM_OSAL_PTR pEvents, - TIMM_OSAL_U32 uEventFlag, TIMM_OSAL_EVENT_OPERATION eOperation); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_EventRetrieve(TIMM_OSAL_PTR pEvents, - TIMM_OSAL_U32 uRequestedEvents, - TIMM_OSAL_EVENT_OPERATION eOperation, - TIMM_OSAL_U32 * pRetrievedEvents, TIMM_OSAL_U32 uTimeOut); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_EVENTS_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_interfaces.h b/domx/mm_osal/inc/timm_osal_interfaces.h deleted file mode 100755 index dd3fd81..0000000 --- a/domx/mm_osal/inc/timm_osal_interfaces.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_memory.h -* The osal header file defines -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_INTERFACES_H_ -#define _TIMM_OSAL_INTERFACES_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/******************************************************************************* -* External interface -*******************************************************************************/ -#include "timm_osal_types.h" -#include "timm_osal_error.h" -#include "timm_osal_memory.h" -#include "timm_osal_pipes.h" -#include "timm_osal_events.h" -#include "timm_osal_semaphores.h" -#include "timm_osal_mutex.h" -#include "timm_osal_task.h" -#include "timm_osal_osal.h" - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_INTERFACES_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_memory.h b/domx/mm_osal/inc/timm_osal_memory.h deleted file mode 100755 index ed21636..0000000 --- a/domx/mm_osal/inc/timm_osal_memory.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_memory.h -* The osal header file defines -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_MEMORY_H_ -#define _TIMM_OSAL_MEMORY_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/******************************************************************************* -* Includes -*******************************************************************************/ - -#include "timm_osal_types.h" -#include "timm_osal_error.h" - - -/* Enumeration Flag for Memory Segmenation Id */ - typedef enum TIMMOSAL_MEM_SEGMENTID - { - - TIMMOSAL_MEM_SEGMENT_EXT = 0, - TIMMOSAL_MEM_SEGMENT_INT, - TIMMOSAL_MEM_SEGMENT_UNCACHED - } TIMMOSAL_MEM_SEGMENTID; - - -/******************************************************************************* -* External interface -*******************************************************************************/ - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_CreateMemoryPool(void); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_DeleteMemoryPool(void); - - TIMM_OSAL_PTR TIMM_OSAL_Malloc(TIMM_OSAL_U32 size, - TIMM_OSAL_BOOL bBlockContiguous, TIMM_OSAL_U32 unBlockAlignment, - TIMMOSAL_MEM_SEGMENTID tMemSegId); - - void TIMM_OSAL_Free(TIMM_OSAL_PTR pData); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_Memset(TIMM_OSAL_PTR pBuffer, - TIMM_OSAL_U8 uValue, TIMM_OSAL_U32 uSize); - - TIMM_OSAL_S32 TIMM_OSAL_Memcmp(TIMM_OSAL_PTR pBuffer1, - TIMM_OSAL_PTR pBuffer2, TIMM_OSAL_U32 uSize); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_Memcpy(TIMM_OSAL_PTR pBufDst, - TIMM_OSAL_PTR pBufSrc, TIMM_OSAL_U32 uSize); - - TIMM_OSAL_U32 TIMM_OSAL_GetMemCounter(void); - -#define TIMM_OSAL_MallocExtn(size, bBlockContiguous, unBlockAlignment, tMemSegId, hHeap) \ - TIMM_OSAL_Malloc(size, bBlockContiguous, unBlockAlignment, tMemSegId ) - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_DEFINES_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_mutex.h b/domx/mm_osal/inc/timm_osal_mutex.h deleted file mode 100755 index 1d12c91..0000000 --- a/domx/mm_osal/inc/timm_osal_mutex.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_defines.h -* The osal header file defines -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_MUTEX_H_ -#define _TIMM_OSAL_MUTEX_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/******************************************************************************* -* Includes -*******************************************************************************/ - -#include "timm_osal_types.h" - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_MutexCreate(TIMM_OSAL_PTR * pMutex); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_MutexDelete(TIMM_OSAL_PTR pMutex); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_MutexObtain(TIMM_OSAL_PTR pMutex, - TIMM_OSAL_U32 uTimeOut); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_MutexRelease(TIMM_OSAL_PTR pMutex); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_MUTEX_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_osal.h b/domx/mm_osal/inc/timm_osal_osal.h deleted file mode 100755 index a4e0e9e..0000000 --- a/domx/mm_osal/inc/timm_osal_osal.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_osal.h -* The osal header file defines -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_OSAL_H_ -#define _TIMM_OSAL_OSAL_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/******************************************************************************* -* Includes -*******************************************************************************/ - -#include "timm_osal_types.h" - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_Init(void); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_Deinit(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_OSAL_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_pipes.h b/domx/mm_osal/inc/timm_osal_pipes.h deleted file mode 100755 index 79d7d61..0000000 --- a/domx/mm_osal/inc/timm_osal_pipes.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_defines.h -* The osal header file defines -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_PIPES_H_ -#define _TIMM_OSAL_PIPES_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#include "timm_osal_types.h" - -/* -* Defined for Pipe timeout value -*/ - TIMM_OSAL_ERRORTYPE TIMM_OSAL_CreatePipe(TIMM_OSAL_PTR * pPipe, - TIMM_OSAL_U32 pipeSize, - TIMM_OSAL_U32 messageSize, TIMM_OSAL_U8 isFixedMessage); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_DeletePipe(TIMM_OSAL_PTR pPipe); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_WriteToPipe(TIMM_OSAL_PTR pPipe, - void *pMessage, TIMM_OSAL_U32 size, TIMM_OSAL_S32 timeout); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_WriteToFrontOfPipe(TIMM_OSAL_PTR pPipe, - void *pMessage, TIMM_OSAL_U32 size, TIMM_OSAL_S32 timeout); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_ReadFromPipe(TIMM_OSAL_PTR pPipe, - void *pMessage, - TIMM_OSAL_U32 size, - TIMM_OSAL_U32 * actualSize, TIMM_OSAL_S32 timeout); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_ClearPipe(TIMM_OSAL_PTR pPipe); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_IsPipeReady(TIMM_OSAL_PTR pPipe); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_GetPipeReadyMessageCount(TIMM_OSAL_PTR - pPipe, TIMM_OSAL_U32 * count); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_PIPES_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_semaphores.h b/domx/mm_osal/inc/timm_osal_semaphores.h deleted file mode 100755 index 86037d7..0000000 --- a/domx/mm_osal/inc/timm_osal_semaphores.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_defines.h -* The osal header file defines -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_SEMAPHORE_H_ -#define _TIMM_OSAL_SEMAPHORE_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/******************************************************************************* -* Includes -*******************************************************************************/ - -#include "timm_osal_types.h" - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreCreate(TIMM_OSAL_PTR * - pSemaphore, TIMM_OSAL_U32 uInitCount); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreDelete(TIMM_OSAL_PTR - pSemaphore); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreObtain(TIMM_OSAL_PTR - pSemaphore, TIMM_OSAL_U32 uTimeOut); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreRelease(TIMM_OSAL_PTR - pSemaphore); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreReset(TIMM_OSAL_PTR pSemaphore, - TIMM_OSAL_U32 uInitCount); - TIMM_OSAL_ERRORTYPE TIMM_OSAL_GetSemaphoreCount(TIMM_OSAL_PTR - pSemaphore, TIMM_OSAL_U32 * count); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_SEMAPHORE_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_task.h b/domx/mm_osal/inc/timm_osal_task.h deleted file mode 100755 index 6f67a82..0000000 --- a/domx/mm_osal/inc/timm_osal_task.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_task.h -* The osal header file defines -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_TASK_H_ -#define _TIMM_OSAL_TASK_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/******************************************************************************* -* Includes -*******************************************************************************/ - -#include "timm_osal_types.h" - -/******************************************************************************* -* Tasks -*******************************************************************************/ - -/** -* prototype for the task function -*/ - /*typedef void (*TIMM_OSAL_TaskProc)(TIMM_OSAL_U32 argc, TIMM_OSAL_PTR argv);*//*Nucleus */ - - typedef void *(*TIMM_OSAL_TaskProc) (void *arg); /*Linux */ - - - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_CreateTask(TIMM_OSAL_PTR * pTask, - TIMM_OSAL_TaskProc pFunc, - TIMM_OSAL_U32 uArgc, - TIMM_OSAL_PTR pArgv, - TIMM_OSAL_U32 uStackSize, - TIMM_OSAL_U32 uPriority, TIMM_OSAL_S8 * pName); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_DeleteTask(TIMM_OSAL_PTR pTask); - - TIMM_OSAL_ERRORTYPE TIMM_OSAL_SleepTask(TIMM_OSAL_U32 mSec); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_TASK_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_trace.h b/domx/mm_osal/inc/timm_osal_trace.h deleted file mode 100755 index 412c5a9..0000000 --- a/domx/mm_osal/inc/timm_osal_trace.h +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_trace.h -* The timm_osal_types header file defines the primative osal type definitions. -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_TRACES_H_ -#define _TIMM_OSAL_TRACES_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/******************************************************************************* -* Traces -*******************************************************************************/ - - -/****************************************************************************** -* Debug Trace defines -******************************************************************************/ - - typedef enum TIMM_OSAL_TRACEGRP_TYPE - { - TIMM_OSAL_TRACEGRP_SYSTEM = 1, - TIMM_OSAL_TRACEGRP_OMXBASE = (1 << 1), - TIMM_OSAL_TRACEGRP_DOMX = (1 << 2), - TIMM_OSAL_TRACEGRP_OMXVIDEOENC = (1 << 3), - TIMM_OSAL_TRACEGRP_OMXVIDEODEC = (1 << 4), - TIMM_OSAL_TRACEGRP_OMXCAM = (1 << 5), - TIMM_OSAL_TRACEGRP_OMXIMGDEC = (1 << 6), - TIMM_OSAL_TRACEGRP_DRIVERS = (1 << 7), - TIMM_OSAL_TRACEGRP_SIMCOPALGOS = (1 << 8) - } TIMM_OSAL_TRACEGRP; - - typedef enum TIMM_OSAL_TRACE_LEVEL_TYPE - { - TIMM_OSAL_TRACE_LEVEL_ERROR = 1, - TIMM_OSAL_TRACE_LEVEL_WARNING = 2, - TIMM_OSAL_TRACE_LEVEL_PROFILING = 3, - TIMM_OSAL_TRACE_LEVEL_INFO = 4, - TIMM_OSAL_TRACE_LEVEL_DEBUG = 5, - TIMM_OSAL_TRACE_LEVEL_ENTERING = 6, - TIMM_OSAL_TRACE_LEVEL_EXITING = TIMM_OSAL_TRACE_LEVEL_ENTERING - } TIMM_OSAL_TRACE_LEVEL; - - -/** -* The OSAL debug trace level can be set at runtime by defining the environment -* variable TIMM_OSAL_DEBUG_TRACE_LEVEL=<Level>. The default level is 1 -* The debug levels are: -* Level 0 - No trace -* Level 1 - Error [Errors] -* Level 2 - Warning [Warnings that are useful to know about] -* Level 3 - Profiling [performance analysis trace that must not impact use case perf] -* Level 4 - Info [General information] -* Level 5 - Debug [most-commonly used statement for us developers] -* Level 6 - Trace ["ENTERING <function>" and "EXITING <function>" statements] -* -* Example: if TIMM_OSAL_DEBUG_TRACE_LEVEL=3, then level 1,2 and 3 traces messages -* are enabled. -*/ - -/** - * Information about the trace location/type, passed as a single pointer to - * internal trace function. Not part of the public API - */ - typedef struct - { - const char *file; - const char *function; - const int line; - const short level; - const short tracegrp; /* TIMM_OSAL_TRACEGRP */ - } __TIMM_OSAL_TRACE_LOCATION; - - -/** - * Trace level update function. Updates trace level if env variable - * or Android property is set. Env variable has precedence over it - */ - void TIMM_OSAL_UpdateTraceLevel(void); - -/** - * Trace implementation function. Not part of public API. Default - * implementation uses printf(), but you can use LD_PRELOAD to plug in - * alternative trace system at runtime. - */ - void __TIMM_OSAL_TraceFunction(const __TIMM_OSAL_TRACE_LOCATION * loc, - const char *fmt, ...); - -/** - * Internal trace macro. Not part of public API. - */ -#define __TIMM_OSAL_Trace(level, tracegrp, fmt, ...) \ - do { \ - static const __TIMM_OSAL_TRACE_LOCATION loc = { \ - __FILE__, __FUNCTION__, __LINE__, (level), (tracegrp) \ - }; \ - __TIMM_OSAL_TraceFunction(&loc, fmt "\n", ##__VA_ARGS__); \ - } while(0) - -/** -* TIMM_OSAL_Error() -- Fatal errors -*/ -#define TIMM_OSAL_Error(fmt,...) TIMM_OSAL_ErrorExt(TIMM_OSAL_TRACEGRP_SYSTEM, fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_Warning() -- Warnings that are useful to know about -*/ -#define TIMM_OSAL_Warning(fmt,...) TIMM_OSAL_WarningExt(TIMM_OSAL_TRACEGRP_SYSTEM, fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_Profiling() -- performance analysis trace that must not impact use case perf] -*/ -#define TIMM_OSAL_Profiling(fmt,...) TIMM_OSAL_ProfilingExt(TIMM_OSAL_TRACEGRP_SYSTEM, fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_Info() -- general information -*/ -#define TIMM_OSAL_Info(fmt,...) TIMM_OSAL_InfoExt(TIMM_OSAL_TRACEGRP_SYSTEM, fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_Debug() -- debug traces, most-commonly useful for developers -*/ -#define TIMM_OSAL_Debug(fmt,...) TIMM_OSAL_DebugExt(TIMM_OSAL_TRACEGRP_SYSTEM, fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_Entering() -- "ENTERING <function>" statements -* TIMM_OSAL_Exiting() -- "EXITING <function>" statements -*/ -#define TIMM_OSAL_Entering(fmt,...) TIMM_OSAL_EnteringExt(TIMM_OSAL_TRACEGRP_SYSTEM, fmt, ##__VA_ARGS__) -#define TIMM_OSAL_Exiting(fmt,...) TIMM_OSAL_ExitingExt(TIMM_OSAL_TRACEGRP_SYSTEM, fmt, ##__VA_ARGS__) - -/******************************************************************************* -** New Trace to be used by Applications -*******************************************************************************/ - -/** -* TIMM_OSAL_ErrorExt() -- Fatal errors -*/ -#define TIMM_OSAL_ErrorExt(tracegrp, fmt, ...) __TIMM_OSAL_Trace(TIMM_OSAL_TRACE_LEVEL_ERROR, tracegrp, "ERROR: " fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_WarningExt() -- Warnings that are useful to know about -*/ -#define TIMM_OSAL_WarningExt(tracegrp, fmt, ...) __TIMM_OSAL_Trace(TIMM_OSAL_TRACE_LEVEL_WARNING, tracegrp, "WARNING: " fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_ProfilingExt() -- performance analysis trace that must not impact use case perf] -*/ -#define TIMM_OSAL_ProfilingExt(tracegrp, fmt, ...) __TIMM_OSAL_Trace(TIMM_OSAL_TRACE_LEVEL_PROFILING, tracegrp, "PROFILING: " fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_InfoExt() -- general information -*/ -#define TIMM_OSAL_InfoExt(tracegrp, fmt, ...) __TIMM_OSAL_Trace(TIMM_OSAL_TRACE_LEVEL_INFO, tracegrp, "INFO: " fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_DebugExt() -- most-commonly used statement for us developers -*/ -#define TIMM_OSAL_DebugExt(tracegrp, fmt, ...) __TIMM_OSAL_Trace(TIMM_OSAL_TRACE_LEVEL_DEBUG, tracegrp, "TRACE: " fmt, ##__VA_ARGS__) - -/** -* TIMM_OSAL_EnteringExt() -- "ENTERING <function>" statements -* TIMM_OSAL_ExitingExt() -- "EXITING <function>" statements -*/ -#define TIMM_OSAL_EnteringExt(tracegrp, fmt, ...) __TIMM_OSAL_Trace(TIMM_OSAL_TRACE_LEVEL_ENTERING, tracegrp, "ENTER: " fmt, ##__VA_ARGS__) -#define TIMM_OSAL_ExitingExt(tracegrp, fmt, ...) __TIMM_OSAL_Trace(TIMM_OSAL_TRACE_LEVEL_EXITING, tracegrp, "EXIT: " fmt, ##__VA_ARGS__) - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_TRACES_H_ */ diff --git a/domx/mm_osal/inc/timm_osal_types.h b/domx/mm_osal/inc/timm_osal_types.h deleted file mode 100755 index 882148d..0000000 --- a/domx/mm_osal/inc/timm_osal_types.h +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_types.h -* The timm_osal_types header file defines the primative osal type definitions. -* @path -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -#ifndef _TIMM_OSAL_TYPES_H_ -#define _TIMM_OSAL_TYPES_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - - - -#ifdef __KERNEL__ -#include <linux/types.h> -#else -#include <stdint.h> -#endif - - typedef int8_t TIMM_OSAL_S8; /*INT8 */ - typedef int16_t TIMM_OSAL_S16; /*INT16 */ - typedef int32_t TIMM_OSAL_S32; /*INT32 */ - -#define TIMM_OSAL_INT8_MIN 0xFF -#define TIMM_OSAL_INT8_MAX 0x7F - -#define TIMM_OSAL_INT16_MIN 0xFFFF -#define TIMM_OSAL_INT16_MAX 0x7FFF - -#define TIMM_OSAL_INT32_MIN 0xFFFFFFFF -#define TIMM_OSAL_INT32_MAX 0x7FFFFFFF - - typedef uint8_t TIMM_OSAL_U8; /*UINT8 */ - typedef uint16_t TIMM_OSAL_U16; /*UINT16 */ - typedef uint32_t TIMM_OSAL_U32; /*UINT32 */ - -#define TIMM_OSAL_UINT8_MIN 0 -#define TIMM_OSAL_UINT8_MAX 0xFF - -#define TIMM_OSAL_UINT16_MIN 0 -#define TIMM_OSAL_UINT16_MAX 0xFFFF - -#define TIMM_OSAL_UINT32_MIN 0 -#define TIMM_OSAL_UINT32_MAX 0xFFFFFFFF - - - typedef char TIMM_OSAL_CHAR; - /*CHAR*/ typedef void *TIMM_OSAL_HANDLE; - typedef void *TIMM_OSAL_PTR; - - typedef enum TIMM_OSAL_BOOL - { - TIMM_OSAL_FALSE = 0, - TIMM_OSAL_TRUE = !TIMM_OSAL_FALSE, - TIMM_OSAL_BOOL_MAX = 0x7FFFFFFF - } TIMM_OSAL_BOOL; - -#define TIMM_OSAL_SUSPEND 0xFFFFFFFFUL -#define TIMM_OSAL_NO_SUSPEND 0x0 -#define TIMM_OSAL_TIMED_OUT 0x7FFFFFFFUL - - -#define SUCCESS 0 -#define NO_SUCCESS -1 - -#define ERROR 1 -/* -#define TRUE 0 -#define FALSE 1 -*/ -#define URGENT_MESSAGE 2 -#define NORMAL_MESSAGE 1 - - -#define TIMM_OSAL_NULL 0 - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _TIMM_OSAL_TYPES_H_ */ diff --git a/domx/mm_osal/src/timm_osal.c b/domx/mm_osal/src/timm_osal.c deleted file mode 100755 index 85fdb66..0000000 --- a/domx/mm_osal/src/timm_osal.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file tiimm_osal.c -* This file contains methods that provides the functionality -* initializing/deinitializing the osal. -* -* @path \ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 20-Oct-2008 Maiya ShreeHarsha:Linux specific changes - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -/****************************************************************************** -* Includes -******************************************************************************/ -#include "timm_osal_types.h" -#include "timm_osal_error.h" -#include "timm_osal_memory.h" -/*#include "timm_osal_trace.h"*/ - - -/****************************************************************************** -* Function Prototypes -******************************************************************************/ - -/**************************************************************** -* PRIVATE DECLARATIONS : only used in this file -****************************************************************/ -/*--------data declarations -----------------------------------*/ - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_Init function initilize the osal with initial settings. -* -* @return TIMM_OSAL_ERR_NONE if successful -* !TIMM_OSAL_ERR_NONE if an error occurs -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_Init(void) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - return bReturnStatus; -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_Init function de-initilize the osal. -* -* @return TIMM_OSAL_ERR_NONE if successful -* !TIMM_OSAL_ERR_NONE if an error occurs -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_Deinit(void) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - return bReturnStatus; -} diff --git a/domx/mm_osal/src/timm_osal_events.c b/domx/mm_osal/src/timm_osal_events.c deleted file mode 100755 index 96f8e59..0000000 --- a/domx/mm_osal/src/timm_osal_events.c +++ /dev/null @@ -1,420 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_events.c -* This file contains methods that provides the functionality -* for creating/using events. -* -* @path \ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 06-Nov-2008 Maiya ShreeHarsha: Linux specific changes - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -/****************************************************************************** -* Includes -******************************************************************************/ -#include <stdio.h> -#include <pthread.h> /*for POSIX calls */ -#include <sys/time.h> -#include <errno.h> - -#include "timm_osal_types.h" -#include "timm_osal_trace.h" -#include "timm_osal_error.h" -#include "timm_osal_memory.h" -#include "timm_osal_events.h" - - -typedef struct -{ - TIMM_OSAL_BOOL bSignaled; - TIMM_OSAL_U32 eFlags; - pthread_mutex_t mutex; - pthread_cond_t condition; -} TIMM_OSAL_THREAD_EVENT; - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_EventCreate function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_EventCreate(TIMM_OSAL_PTR * pEvents) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - TIMM_OSAL_THREAD_EVENT *plEvent = NULL; - - plEvent = - (TIMM_OSAL_THREAD_EVENT *) - TIMM_OSAL_Malloc(sizeof(TIMM_OSAL_THREAD_EVENT), 0, 0, 0); - - if (TIMM_OSAL_NULL == plEvent) - { - bReturnStatus = TIMM_OSAL_ERR_ALLOC; - goto EXIT; - } - plEvent->bSignaled = TIMM_OSAL_FALSE; - plEvent->eFlags = 0; - - if (SUCCESS != pthread_mutex_init(&(plEvent->mutex), NULL)) - { - TIMM_OSAL_Error("Event Create:Mutex Init failed !"); - goto EXIT; /*bReturnStatus = TIMM_OSAL_ERR_UNKNOWN */ - } - - if (SUCCESS != pthread_cond_init(&(plEvent->condition), NULL)) - { - TIMM_OSAL_Error - ("Event Create:Conditional Variable Init failed !"); - pthread_mutex_destroy(&(plEvent->mutex)); - /*TIMM_OSAL_Free(plEvent); */ - } else - { - *pEvents = (TIMM_OSAL_PTR) plEvent; - bReturnStatus = TIMM_OSAL_ERR_NONE; - } - EXIT: - if ((TIMM_OSAL_ERR_NONE != bReturnStatus) && - (TIMM_OSAL_NULL != plEvent)) - { - TIMM_OSAL_Free(plEvent); - } - return bReturnStatus; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_EventDelete function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_EventDelete(TIMM_OSAL_PTR pEvents) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_THREAD_EVENT *plEvent = (TIMM_OSAL_THREAD_EVENT *) pEvents; - - if (TIMM_OSAL_NULL == plEvent) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - if (SUCCESS != pthread_mutex_lock(&(plEvent->mutex))) - { - TIMM_OSAL_Error("Event Delete: Mutex Lock failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } - if (SUCCESS != pthread_cond_destroy(&(plEvent->condition))) - { - TIMM_OSAL_Error - ("Event Delete: Conditional Variable Destroy failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } - - if (SUCCESS != pthread_mutex_unlock(&(plEvent->mutex))) - { - TIMM_OSAL_Error("Event Delete: Mutex Unlock failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } - - if (SUCCESS != pthread_mutex_destroy(&(plEvent->mutex))) - { - TIMM_OSAL_Error("Event Delete: Mutex Destory failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } - - TIMM_OSAL_Free(plEvent); - EXIT: - return bReturnStatus; -} - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_EventSet function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_EventSet(TIMM_OSAL_PTR pEvents, - TIMM_OSAL_U32 uEventFlags, TIMM_OSAL_EVENT_OPERATION eOperation) -{ - - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - TIMM_OSAL_THREAD_EVENT *plEvent = (TIMM_OSAL_THREAD_EVENT *) pEvents; - - if (TIMM_OSAL_NULL == plEvent) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - if (SUCCESS != pthread_mutex_lock(&(plEvent->mutex))) - { - TIMM_OSAL_Error("Event Set: Mutex Lock failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - goto EXIT; - } - - switch (eOperation) - { - case TIMM_OSAL_EVENT_AND: - plEvent->eFlags = plEvent->eFlags & uEventFlags; - break; - case TIMM_OSAL_EVENT_OR: - plEvent->eFlags = plEvent->eFlags | uEventFlags; - break; - default: - TIMM_OSAL_Error("Event Set: Bad eOperation !"); - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - pthread_mutex_unlock(&plEvent->mutex); - goto EXIT; - } - - plEvent->bSignaled = TIMM_OSAL_TRUE; - - if (SUCCESS != pthread_cond_signal(&plEvent->condition)) - { - TIMM_OSAL_Error - ("Event Set: Condition Variable Signal failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - pthread_mutex_unlock(&plEvent->mutex); - goto EXIT; - } - - if (SUCCESS != pthread_mutex_unlock(&plEvent->mutex)) - { - TIMM_OSAL_Error("Event Set: Mutex Unlock failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } else - bReturnStatus = TIMM_OSAL_ERR_NONE; - - EXIT: - return bReturnStatus; - - -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_EventRetrieve function -* -*Spurious wakeups from the pthread_cond_timedwait() or pthread_cond_wait() functions may occur. -* -*A representative sequence for using condition variables is shown below -* -*Thread A (Retrieve Events) |Thread B (Set Events) -*------------------------------------------------------------------------------------------------------------ -*1) Do work up to the point where a certain condition |1)Do work -* must occur (such as "count" must reach a specified |2)Lock associated mutex -* value) |3)Change the value of the global variable -*2) Lock associated mutex and check value of a global | that Thread-A is waiting upon. -* variable |4)Check value of the global Thread-A wait -*3) Call pthread_cond_wait() to perform a blocking wait | variable. If it fulfills the desired -* for signal from Thread-B. Note that a call to | condition, signal Thread-A. -* pthread_cond_wait() automatically and atomically |5)Unlock mutex. -* unlocks the associated mutex variable so that it can |6)Continue -* be used by Thread-B. | -*4) When signalled, wake up. Mutex is automatically and | -* atomically locked. | -*5) Explicitly unlock mutex | -*6) Continue | -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_EventRetrieve(TIMM_OSAL_PTR pEvents, - TIMM_OSAL_U32 uRequestedEvents, - TIMM_OSAL_EVENT_OPERATION eOperation, - TIMM_OSAL_U32 * pRetrievedEvents, TIMM_OSAL_U32 uTimeOutMsec) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - struct timespec timeout; - struct timeval now; - TIMM_OSAL_U32 timeout_us; - TIMM_OSAL_U32 isolatedFlags; - int status = -1; - int and_operation; - TIMM_OSAL_THREAD_EVENT *plEvent = (TIMM_OSAL_THREAD_EVENT *) pEvents; - - if (TIMM_OSAL_NULL == plEvent) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - /* Lock the mutex for access to the eFlags global variable */ - if (SUCCESS != pthread_mutex_lock(&(plEvent->mutex))) - { - TIMM_OSAL_Error("Event Retrieve: Mutex Lock failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - goto EXIT; - } - - /*Check the eOperation and put it in a variable */ - and_operation = ((TIMM_OSAL_EVENT_AND == eOperation) || - (TIMM_OSAL_EVENT_AND_CONSUME == eOperation)); - - /* Isolate the flags. The & operation is suffice for an TIMM_OSAL_EVENT_OR eOperation */ - isolatedFlags = plEvent->eFlags & uRequestedEvents; - - /*Check if it is the AND operation. If yes then, all the flags must match */ - if (and_operation) - { - isolatedFlags = (isolatedFlags == uRequestedEvents); - } - - - if (isolatedFlags) - { - - /*We have got required combination of the eFlags bits and will return it back */ - *pRetrievedEvents = plEvent->eFlags; - bReturnStatus = TIMM_OSAL_ERR_NONE; - } else - { - - /*Required combination of bits is not yet available */ - if (TIMM_OSAL_NO_SUSPEND == uTimeOutMsec) - { - *pRetrievedEvents = 0; - bReturnStatus = TIMM_OSAL_ERR_NONE; - } - - else if (TIMM_OSAL_SUSPEND == uTimeOutMsec) - { - - /*Wait till we get the required combination of bits. We we get the required - *bits then we go out of the while loop - */ - while (!isolatedFlags) - { - - /*Wait on the conditional variable for another thread to set the eFlags and signal */ - pthread_cond_wait(&(plEvent->condition), - &(plEvent->mutex)); - - /* eFlags set by some thread. Now, isolate the flags. - * The & operation is suffice for an TIMM_OSAL_EVENT_OR eOperation - */ - isolatedFlags = - plEvent->eFlags & uRequestedEvents; - - /*Check if it is the AND operation. If yes then, all the flags must match */ - if (and_operation) - { - isolatedFlags = - (isolatedFlags == - uRequestedEvents); - } - } - - /* Obtained the requested combination of bits on eFlags */ - *pRetrievedEvents = plEvent->eFlags; - bReturnStatus = TIMM_OSAL_ERR_NONE; - - } else - { - - /* Calculate uTimeOutMsec in terms of the absolute time. uTimeOutMsec is in milliseconds */ - gettimeofday(&now, NULL); - timeout_us = now.tv_usec + 1000 * uTimeOutMsec; - timeout.tv_sec = now.tv_sec + timeout_us / 1000000; - timeout.tv_nsec = (timeout_us % 1000000) * 1000; - - while (!isolatedFlags) - { - - /* Wait till uTimeOutMsec for a thread to signal on the conditional variable */ - status = - pthread_cond_timedwait(&(plEvent-> - condition), &(plEvent->mutex), - &timeout); - - /*Timedout or error and returned without being signalled */ - if (SUCCESS != status) - { - if (ETIMEDOUT == status) - bReturnStatus = - TIMM_OSAL_ERR_NONE; - *pRetrievedEvents = 0; - break; - } - - /* eFlags set by some thread. Now, isolate the flags. - * The & operation is suffice for an TIMM_OSAL_EVENT_OR eOperation - */ - isolatedFlags = - plEvent->eFlags & uRequestedEvents; - - /*Check if it is the AND operation. If yes then, all the flags must match */ - if (and_operation) - { - isolatedFlags = - (isolatedFlags == - uRequestedEvents); - } - - } - } - } - - /*If we have got the required combination of bits, we will have to reset the eFlags if CONSUME is mentioned - *in the eOperations - */ - if (isolatedFlags && ((eOperation == TIMM_OSAL_EVENT_AND_CONSUME) || - (eOperation == TIMM_OSAL_EVENT_OR_CONSUME))) - { - plEvent->eFlags = 0; - } - - /*Manually unlock the mutex */ - if (SUCCESS != pthread_mutex_unlock(&(plEvent->mutex))) - { - TIMM_OSAL_Error("Event Retrieve: Mutex Unlock failed !"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } - - EXIT: - return bReturnStatus; - -} diff --git a/domx/mm_osal/src/timm_osal_memory.c b/domx/mm_osal/src/timm_osal_memory.c deleted file mode 100755 index 22eb0a4..0000000 --- a/domx/mm_osal/src/timm_osal_memory.c +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_memory.c -* This file contains methods that provides the functionality -* for allocating/deallocating memory. -* -* @path \ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *!23-Oct-2008 Maiya ShreeHarsha: Linux specific changes - *!0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -/****************************************************************************** -* Includes -******************************************************************************/ - -#include <string.h> -#include <malloc.h> - -#ifdef __KERNEL__ -#include <linux/types.h> -#else -#include <stdint.h> -#endif - - -#include "timm_osal_types.h" -#include "timm_osal_trace.h" -#include "timm_osal_error.h" -#include "timm_osal_memory.h" - - - -static TIMM_OSAL_U32 gMallocCounter = 0; - -/****************************************************************************** -* Function Prototypes -******************************************************************************/ - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_createMemoryPool function -* -* @see -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_CreateMemoryPool(void) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - return bReturnStatus; -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_DeleteMemoryPool function -* -* @see -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_DeleteMemoryPool(void) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - return bReturnStatus; - -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_Malloc function -* -* @see -*/ -/* ========================================================================== */ -TIMM_OSAL_PTR TIMM_OSAL_Malloc(TIMM_OSAL_U32 size, - TIMM_OSAL_BOOL bBlockContiguous, - TIMM_OSAL_U32 unBlockAlignment, TIMMOSAL_MEM_SEGMENTID tMemSegId) -{ - - TIMM_OSAL_PTR pData = TIMM_OSAL_NULL; - -#ifdef HAVE_MEMALIGN - if (0 == unBlockAlignment) - { - pData = malloc((size_t) size); - } else - { - pData = memalign((size_t) unBlockAlignment, (size_t) size); - } -#else - if (0 != unBlockAlignment) - { - TIMM_OSAL_Warning - ("Memory Allocation:Not done for specified nBufferAlignment. Alignment of 0 will be used"); - - } - pData = malloc((size_t) size); /*size_t is long long */ -#endif - if (TIMM_OSAL_NULL == pData) - { - TIMM_OSAL_Error("Malloc failed!!!"); - } else - { - /* Memory Allocation was successfull */ - gMallocCounter++; - } - - - return pData; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_Free function .... -* -* @see -*/ -/* ========================================================================== */ - -void TIMM_OSAL_Free(TIMM_OSAL_PTR pData) -{ - if (TIMM_OSAL_NULL == pData) - { - /*TIMM_OSAL_Warning("TIMM_OSAL_Free called on NULL pointer"); */ - goto EXIT; - } - - free(pData); - pData = NULL; - gMallocCounter--; - EXIT: - return; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_Memset function .... -* -* @see -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_Memset(TIMM_OSAL_PTR pBuffer, - TIMM_OSAL_U8 uValue, TIMM_OSAL_U32 uSize) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - - memset((void *)pBuffer, (int)uValue, (size_t) uSize); - bReturnStatus = TIMM_OSAL_ERR_NONE; - - return bReturnStatus; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_Memcmp function .... -* -* @see -*/ -/* ========================================================================== */ - -TIMM_OSAL_S32 TIMM_OSAL_Memcmp(TIMM_OSAL_PTR pBuffer1, TIMM_OSAL_PTR pBuffer2, - TIMM_OSAL_U32 uSize) -{ - TIMM_OSAL_S32 result = memcmp(pBuffer1, pBuffer2, uSize); - - if (result > 0) - { - return 1; - } else if (result < 0) - { - return -1; - } - - return 0; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_Memcpy function .... -* -* @see -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_Memcpy(TIMM_OSAL_PTR pBufDst, - TIMM_OSAL_PTR pBufSrc, TIMM_OSAL_U32 uSize) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - - memcpy(pBufDst, pBufSrc, uSize); - bReturnStatus = TIMM_OSAL_ERR_NONE; - - return bReturnStatus; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_GetMemCounter function .... -* -* @see -*/ -/* ========================================================================== */ - -TIMM_OSAL_U32 TIMM_OSAL_GetMemCounter(void) -{ - - return gMallocCounter; -} diff --git a/domx/mm_osal/src/timm_osal_mutex.c b/domx/mm_osal/src/timm_osal_mutex.c deleted file mode 100755 index 5cfecf8..0000000 --- a/domx/mm_osal/src/timm_osal_mutex.c +++ /dev/null @@ -1,244 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_Mutexs.c -* This file contains methods that provides the functionality -* -* @path \ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 04-Nov-2008 Maiya ShreeHarsha: Linux specific changes - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -/****************************************************************************** -* Includes -******************************************************************************/ - - -#include "timm_osal_types.h" -#include "timm_osal_trace.h" -#include "timm_osal_error.h" -#include "timm_osal_memory.h" -#include "timm_osal_semaphores.h" - -#include <errno.h> - -#include <pthread.h> -#include <sys/time.h> - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_MutexCreate function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_MutexCreate(TIMM_OSAL_PTR * pMutex) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - pthread_mutex_t *plMutex = TIMM_OSAL_NULL; - - plMutex = - (pthread_mutex_t *) TIMM_OSAL_Malloc(sizeof(pthread_mutex_t), 0, - 0, 0); - if (TIMM_OSAL_NULL == plMutex) - { - bReturnStatus = TIMM_OSAL_ERR_ALLOC; - goto EXIT; - } - - /*if (SUCCESS != pthread_mutex_init(plMutex, pAttr)) */ - if (SUCCESS != pthread_mutex_init(plMutex, TIMM_OSAL_NULL)) - { - /*TIMM_OSAL_Error ("Mutex Create failed !"); */ - /*goto EXIT; */ - } else - { - /**pMutex = (TIMM_OSAL_PTR *)plMutex;*/ - *pMutex = (TIMM_OSAL_PTR) plMutex; - bReturnStatus = TIMM_OSAL_ERR_NONE; - } - EXIT: - /*if((TIMM_OSAL_ERR_NONE != bReturnStatus)) { - TIMM_OSAL_Free(plMutex); - } */ - if ((TIMM_OSAL_ERR_NONE != bReturnStatus) && - (TIMM_OSAL_NULL != plMutex)) - { - TIMM_OSAL_Free(plMutex); - } - return bReturnStatus; - -/**********************************************************/ -/*return TIMM_OSAL_SemaphoreCreate(pMutex, 1);*/ -/**********************************************************/ -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_MutexDelete function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_MutexDelete(TIMM_OSAL_PTR pMutex) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - pthread_mutex_t *plMutex = (pthread_mutex_t *) pMutex; - - if (plMutex == TIMM_OSAL_NULL) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - /*can we do away with if or with switch case */ - if (SUCCESS != pthread_mutex_destroy(plMutex)) - { - /*TIMM_OSAL_Error("Delete Mutex failed !"); */ - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN;; - } - - TIMM_OSAL_Free(plMutex); - EXIT: - return bReturnStatus; -/**********************************************************/ -/*return TIMM_OSAL_SemaphoreDelete(pMutex);*/ -/**********************************************************/ - -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_MutexObtain function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_MutexObtain(TIMM_OSAL_PTR pMutex, - TIMM_OSAL_U32 uTimeOut) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - struct timespec abs_timeout; - struct timeval ltime_now; - TIMM_OSAL_U32 ltimenow_us; - pthread_mutex_t *plMutex = (pthread_mutex_t *) pMutex; - - if (plMutex == TIMM_OSAL_NULL) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - if (TIMM_OSAL_SUSPEND == uTimeOut) - { - if (SUCCESS != pthread_mutex_lock(plMutex)) - { - /*TIMM_OSAL_Error("Lock Mutex failed !"); */ - goto EXIT; - } - } else if (TIMM_OSAL_NO_SUSPEND == uTimeOut) - { - if (SUCCESS != pthread_mutex_trylock(plMutex)) - { - /*TIMM_OSAL_Error("Lock Mutex failed !"); */ - goto EXIT; - } - } else - { - gettimeofday(<ime_now, NULL); - /*uTimeOut is assumed to be in milliseconds */ - ltimenow_us = ltime_now.tv_usec + 1000 * uTimeOut; - abs_timeout.tv_sec = ltime_now.tv_sec + uTimeOut / 1000; - abs_timeout.tv_nsec = (ltimenow_us % 1000000) * 1000; - -#ifdef _POSIX_VERSION_1_ - if (SUCCESS != pthread_mutex_lock(plMutex)) - { //Some Posix versions dont support timeout -#else - if (SUCCESS != pthread_mutex_timedlock(plMutex, &abs_timeout)) - { -#endif - /*TIMM_OSAL_Error("Lock Mutex failed !"); */ - goto EXIT; - } - } - bReturnStatus = TIMM_OSAL_ERR_NONE; - - EXIT: - return bReturnStatus; -/**********************************************************/ -/*return TIMM_OSAL_SemaphoreObtain(pMutex, uTimeOut);*/ -/**********************************************************/ -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_MutexRelease function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_MutexRelease(TIMM_OSAL_PTR pMutex) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - pthread_mutex_t *plMutex = (pthread_mutex_t *) pMutex; - - if (TIMM_OSAL_NULL == plMutex) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - if (SUCCESS != pthread_mutex_unlock(plMutex)) - { - /*TIMM_OSAL_Error("Unlock Mutex failed !"); */ - } else - { - bReturnStatus = TIMM_OSAL_ERR_NONE; - } - EXIT: - return bReturnStatus; -/**********************************************************/ -/*return TIMM_OSAL_SemaphoreRelease(pMutex);*/ -/**********************************************************/ -} diff --git a/domx/mm_osal/src/timm_osal_pipes.c b/domx/mm_osal/src/timm_osal_pipes.c deleted file mode 100755 index 1c38354..0000000 --- a/domx/mm_osal/src/timm_osal_pipes.c +++ /dev/null @@ -1,415 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_pipes.c -* This file contains methods that provides the functionality -* for creating/using Nucleus pipes. -* -* @path \ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 07-Nov-2008 Maiya ShreeHarsha: Linux specific changes - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -/****************************************************************************** -* Includes -******************************************************************************/ - -#include "timm_osal_types.h" -#include "timm_osal_error.h" -#include "timm_osal_memory.h" -#include "timm_osal_trace.h" - -#include <unistd.h> -#include <stdio.h> -#include <unistd.h> -#include <errno.h> - -/** -* TIMM_OSAL_PIPE structure define the OSAL pipe -*/ -typedef struct TIMM_OSAL_PIPE -{ - int pfd[2]; - TIMM_OSAL_U32 pipeSize; - TIMM_OSAL_U32 messageSize; - TIMM_OSAL_U8 isFixedMessage; - int messageCount; - int totalBytesInPipe; -} TIMM_OSAL_PIPE; - - -/****************************************************************************** -* Function Prototypes -******************************************************************************/ - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_CreatePipe function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_CreatePipe(TIMM_OSAL_PTR * pPipe, - TIMM_OSAL_U32 pipeSize, - TIMM_OSAL_U32 messageSize, TIMM_OSAL_U8 isFixedMessage) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - TIMM_OSAL_PIPE *pHandle = TIMM_OSAL_NULL; - - pHandle = - (TIMM_OSAL_PIPE *) TIMM_OSAL_Malloc(sizeof(TIMM_OSAL_PIPE), 0, 0, - 0); - - if (TIMM_OSAL_NULL == pHandle) - { - bReturnStatus = TIMM_OSAL_ERR_ALLOC; - goto EXIT; - } - TIMM_OSAL_Memset(pHandle, 0x0, sizeof(TIMM_OSAL_PIPE)); - - pHandle->pfd[0] = -1; - pHandle->pfd[1] = -1; - if (SUCCESS != pipe(pHandle->pfd)) - { - TIMM_OSAL_Error("Pipe failed: %s!!!", strerror(errno)); - goto EXIT; - } - - pHandle->pipeSize = pipeSize; - pHandle->messageSize = messageSize; - pHandle->isFixedMessage = isFixedMessage; - pHandle->messageCount = 0; - pHandle->totalBytesInPipe = 0; - - *pPipe = (TIMM_OSAL_PTR) pHandle; - - bReturnStatus = TIMM_OSAL_ERR_NONE; - - - return bReturnStatus; -EXIT: - TIMM_OSAL_Free(pHandle); - return bReturnStatus; -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_DeletePipe function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_DeletePipe(TIMM_OSAL_PTR pPipe) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - - TIMM_OSAL_PIPE *pHandle = (TIMM_OSAL_PIPE *) pPipe; - - if (TIMM_OSAL_NULL == pHandle) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - if (SUCCESS != close(pHandle->pfd[0])) - { - TIMM_OSAL_Error("Delete_Pipe Read fd failed!!!"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } - if (SUCCESS != close(pHandle->pfd[1])) - { - TIMM_OSAL_Error("Delete_Pipe Write fd failed!!!"); - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } - - TIMM_OSAL_Free(pHandle); -EXIT: - return bReturnStatus; -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_WriteToPipe function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_WriteToPipe(TIMM_OSAL_PTR pPipe, - void *pMessage, TIMM_OSAL_U32 size, TIMM_OSAL_S32 timeout) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - TIMM_OSAL_U32 lSizeWritten = -1; - - TIMM_OSAL_PIPE *pHandle = (TIMM_OSAL_PIPE *) pPipe; - - if (size == 0) - { - TIMM_OSAL_Error("0 size!!!"); - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - lSizeWritten = write(pHandle->pfd[1], pMessage, size); - - if (lSizeWritten != size) - { - TIMM_OSAL_Error("Write of pipe failed!!!"); - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - /*Update message count and size */ - pHandle->messageCount++; - pHandle->totalBytesInPipe += size; - - bReturnStatus = TIMM_OSAL_ERR_NONE; - - EXIT: - return bReturnStatus; -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_WriteToFrontOfPipe function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_WriteToFrontOfPipe(TIMM_OSAL_PTR pPipe, - void *pMessage, TIMM_OSAL_U32 size, TIMM_OSAL_S32 timeout) -{ - - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - TIMM_OSAL_U32 lSizeWritten = -1; - TIMM_OSAL_U32 lSizeRead = -1; - TIMM_OSAL_PIPE *pHandle = (TIMM_OSAL_PIPE *) pPipe; - TIMM_OSAL_U8 *tempPtr = NULL; - - - /*First write to this pipe */ - if (size == 0) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - lSizeWritten = write(pHandle->pfd[1], pMessage, size); - - if (lSizeWritten != size) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - /*Update number of messages */ - pHandle->messageCount++; - - - if (pHandle->messageCount > 1) - { - /*First allocate memory */ - tempPtr = - (TIMM_OSAL_U8 *) TIMM_OSAL_Malloc(pHandle-> - totalBytesInPipe, 0, 0, 0); - - if (tempPtr == NULL) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - /*Read out of pipe */ - lSizeRead = - read(pHandle->pfd[0], tempPtr, pHandle->totalBytesInPipe); - - /*Write back to pipe */ - lSizeWritten = - write(pHandle->pfd[1], tempPtr, - pHandle->totalBytesInPipe); - - if (lSizeWritten != size) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - /*Update Total bytes in pipe */ - pHandle->totalBytesInPipe += size; - } - - - EXIT: - TIMM_OSAL_Free(tempPtr); - - return bReturnStatus; - -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_ReadFromPipe function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_ReadFromPipe(TIMM_OSAL_PTR pPipe, - void *pMessage, - TIMM_OSAL_U32 size, TIMM_OSAL_U32 * actualSize, TIMM_OSAL_S32 timeout) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - TIMM_OSAL_U32 lSizeRead = -1; - TIMM_OSAL_PIPE *pHandle = (TIMM_OSAL_PIPE *) pPipe; - - if (size == 0) - { - TIMM_OSAL_Error("nRead size has error!!!"); - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - if ((pHandle->messageCount == 0) && (timeout == TIMM_OSAL_NO_SUSPEND)) - { - /*If timeout is 0 and pipe is empty, return error */ - TIMM_OSAL_Error("Pipe is empty!!!"); - bReturnStatus = TIMM_OSAL_ERR_PIPE_EMPTY; - goto EXIT; - } - if ((timeout !=TIMM_OSAL_NO_SUSPEND) && - (timeout != (TIMM_OSAL_S32)TIMM_OSAL_SUSPEND)) - { - TIMM_OSAL_Warning("Only infinite or no timeouts \ - supported. Going to read with infinite timeout now"); - } - /*read blocks infinitely until message is available */ - *actualSize = lSizeRead = read(pHandle->pfd[0], pMessage, size); - if (0 == lSizeRead) - { - TIMM_OSAL_Error("EOF reached or no data in pipe!!!"); - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - bReturnStatus = TIMM_OSAL_ERR_NONE; - - pHandle->messageCount--; - pHandle->totalBytesInPipe -= size; - - EXIT: - return bReturnStatus; - -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_ClearPipe function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_ClearPipe(TIMM_OSAL_PTR pPipe) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR; - - TIMM_OSAL_Warning("This function is currently not implemented"); - - return bReturnStatus; -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_IsPipeReady function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_IsPipeReady(TIMM_OSAL_PTR pPipe) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR; - TIMM_OSAL_PIPE *pHandle = (TIMM_OSAL_PIPE *) pPipe; - - if (pHandle->messageCount <= 0) - { - bReturnStatus = TIMM_OSAL_ERR_NOT_READY; - } else - { - bReturnStatus = TIMM_OSAL_ERR_NONE; - } - - return bReturnStatus; - -} - - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_GetPipeReadyMessageCount function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_GetPipeReadyMessageCount(TIMM_OSAL_PTR pPipe, - TIMM_OSAL_U32 * count) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_PIPE *pHandle = (TIMM_OSAL_PIPE *) pPipe; - - *count = pHandle->messageCount; - return bReturnStatus; - -} diff --git a/domx/mm_osal/src/timm_osal_semaphores.c b/domx/mm_osal/src/timm_osal_semaphores.c deleted file mode 100755 index b69ee3c..0000000 --- a/domx/mm_osal/src/timm_osal_semaphores.c +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_semaphores.c -* This file contains methods that provides the functionality -* -* @path \ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 30-Oct-2008 Maiya ShreeHarsha: Linux specific changes - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -/****************************************************************************** -* Includes -******************************************************************************/ - -#include <stdio.h> - -#include <semaphore.h> -#include <sys/time.h> - - -#include "timm_osal_types.h" -#include "timm_osal_trace.h" -#include "timm_osal_error.h" -#include "timm_osal_memory.h" - - -#define SEMNAME_MAX 7 - -/* -typedef struct TIMM_OSAL_SEMAPHORE { - sem_t sem; - CHAR name[SEMNAME_MAX]; -} TIMM_OSAL_SEMAPHORE; -*/ - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_SemaphoreCreate function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreCreate(TIMM_OSAL_PTR * pSemaphore, - TIMM_OSAL_U32 uInitCount) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - *pSemaphore = TIMM_OSAL_NULL; - - sem_t *psem = (sem_t *) TIMM_OSAL_Malloc(sizeof(sem_t), 0, 0, 0); - - if (TIMM_OSAL_NULL == psem) - { - bReturnStatus = TIMM_OSAL_ERR_ALLOC; - goto EXIT; - } - - /*Unnamed semaphore */ - if (SUCCESS != sem_init(psem, 0, uInitCount)) - { - /*TIMM_OSAL_Error("Semaphore Create failed !"); */ - /*goto EXIT; */ - } else - { - *pSemaphore = (TIMM_OSAL_PTR) psem; - bReturnStatus = TIMM_OSAL_ERR_NONE; - } - EXIT: - if ((TIMM_OSAL_ERR_NONE != bReturnStatus) && (TIMM_OSAL_NULL != psem)) - { - TIMM_OSAL_Free(psem); - } - return bReturnStatus; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_SemaphoreDelete function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreDelete(TIMM_OSAL_PTR pSemaphore) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_NONE; - sem_t *psem = (sem_t *) pSemaphore; - - if (psem == TIMM_OSAL_NULL) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - /* Release the semaphore. */ - if (SUCCESS != sem_destroy(psem)) - { - /*TIMM_OSAL_Error("Semaphore Delete failed !"); */ - bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - } - - TIMM_OSAL_Free(psem); - EXIT: - return bReturnStatus; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_SemaphoreObtain function -* -* -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreObtain(TIMM_OSAL_PTR pSemaphore, - TIMM_OSAL_U32 uTimeOut) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - struct timeval ltime_now; - struct timespec abs_timeout; - sem_t *psem = (sem_t *) pSemaphore; - - if (psem == TIMM_OSAL_NULL) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - if (TIMM_OSAL_SUSPEND == uTimeOut) - { - if (SUCCESS != sem_wait(psem)) - { - /*TIMM_OSAL_Error("Semaphore Wait failed !"); */ - goto EXIT; - } - - } else if (TIMM_OSAL_NO_SUSPEND == uTimeOut) - { - if (SUCCESS != sem_trywait(psem)) - { - /*TIMM_OSAL_Error("Semaphore blocked !"); */ - goto EXIT; - } - } else - { - /*Some delay in calling gettimeofday and sem_timedwait - cant - be avoided. Possibility of thread switch after gettimeofday - in which case time out will be less than expected */ - gettimeofday(<ime_now, NULL); - /*uTimeOut is assumed to be in milliseconds */ - abs_timeout.tv_sec = ltime_now.tv_sec + (uTimeOut / 1000); - abs_timeout.tv_nsec = - 1000 * (ltime_now.tv_usec + ((uTimeOut % 1000) * 1000)); - - if (SUCCESS != sem_timedwait(psem, &abs_timeout)) - { - /*TIMM_OSAL_Error("Semaphore Timed Wait failed !"); */ - goto EXIT; - } - } - bReturnStatus = TIMM_OSAL_ERR_NONE; - - EXIT: - return bReturnStatus; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_SemaphoreRelease function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreRelease(TIMM_OSAL_PTR pSemaphore) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - sem_t *psem = (sem_t *) pSemaphore; - - if (TIMM_OSAL_NULL == psem) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - /* Release the semaphore. */ - if (SUCCESS != sem_post(psem)) - { - /*TIMM_OSAL_Error("Release failed !"); */ - } else - { - bReturnStatus = TIMM_OSAL_ERR_NONE; - } - - EXIT: - return bReturnStatus; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_SemaphoreReset function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_SemaphoreReset(TIMM_OSAL_PTR pSemaphore, - TIMM_OSAL_U32 uInitCount) -{ - /* TIMM_OSAL_SEMAPHORE *pHandle = (TIMM_OSAL_SEMAPHORE *)pSemaphore; - STATUS status; - TIMM_OSAL_ERRORTYPE bReturnStatus; */ - - - /* Release the semaphore. */ - /*status = NU_Reset_Semaphore(&(pHandle->sem), - uInitCount); - */ - /* switch(status) - { - case NU_SUCCESS: - bReturnStatus = TIMM_OSAL_ERR_NONE; - break; - default: - bReturnStatus = TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR, TIMM_OSAL_COMP_SEMAPHORES, status); - break; - } - */ - /* return bReturnStatus; */ - return TIMM_OSAL_ERR_UNKNOWN; -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_GetSemaphoreCount function -* -* -*/ -/* ========================================================================== */ -TIMM_OSAL_ERRORTYPE TIMM_OSAL_GetSemaphoreCount(TIMM_OSAL_PTR pSemaphore, - TIMM_OSAL_U32 * count) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - int sval = -2; /*value that is not possible */ - sem_t *psem = (sem_t *) pSemaphore; - - if (TIMM_OSAL_NULL == psem) - { - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - - /* Release the semaphore. */ - if (SUCCESS != sem_getvalue(psem, &sval)) - { - /*TIMM_OSAL_Error("Get Semaphore Count failed !"); */ - } else - { - *count = sval; - bReturnStatus = TIMM_OSAL_ERR_NONE; - } - - EXIT: - return bReturnStatus; -} diff --git a/domx/mm_osal/src/timm_osal_task.c b/domx/mm_osal/src/timm_osal_task.c deleted file mode 100755 index 7a243a9..0000000 --- a/domx/mm_osal/src/timm_osal_task.c +++ /dev/null @@ -1,262 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_task.c -* This file contains methods that provides the functionality -* for creating/destroying tasks. -* -* @path \ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! 21-Oct-2008 Maiya ShreeHarsha: Linux specific changes - *! 0.1: Created the first draft version, ksrini@ti.com - * ========================================================================= */ - -/****************************************************************************** -* Includes -******************************************************************************/ - -#include <stdio.h> -#include <pthread.h> /*for POSIX calls */ -#include <sched.h> /*for sched structure */ -#include <unistd.h> - - - -#include "timm_osal_types.h" -#include "timm_osal_trace.h" -#include "timm_osal_error.h" -#include "timm_osal_memory.h" -#include "timm_osal_task.h" - - - - -/** -* TIMM_OSAL_TASK describe the different task information -*/ -typedef struct TIMM_OSAL_TASK -{ - pthread_t threadID; /*SHM check */ - /* To set the priority and stack size */ - pthread_attr_t ThreadAttr; /*For setting the priority and stack size */ - /** Name of the task */ - /* TIMM_OSAL_S8 name[8];*//* eight character plus null char */ - /** Pointer to the task stack memory */ -/* TIMM_OSAL_PTR stackPtr;*/ - /** Size of the task stack */ -/* TIMM_OSAL_S32 stackSize;*/ - /*parameters to the task */ - TIMM_OSAL_U32 uArgc; - TIMM_OSAL_PTR pArgv; - /** task priority */ -/* TIMM_OSAL_S32 priority;*/ - /** flag to check if task got created */ - TIMM_OSAL_BOOL isCreated; -} TIMM_OSAL_TASK; - - -/****************************************************************************** -* Function Prototypes -******************************************************************************/ - - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_CreateTask function -* -* @see -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_CreateTask(TIMM_OSAL_PTR * pTask, - TIMM_OSAL_TaskProc pFunc, - TIMM_OSAL_U32 uArgc, - TIMM_OSAL_PTR pArgv, - TIMM_OSAL_U32 uStackSize, TIMM_OSAL_U32 uPriority, TIMM_OSAL_S8 * pName) -{ - - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - TIMM_OSAL_TASK *pHandle = TIMM_OSAL_NULL; - struct sched_param sched; - size_t stackSize; - *pTask = TIMM_OSAL_NULL; - - - /*Task structure allocation */ - pHandle = - (TIMM_OSAL_TASK *) TIMM_OSAL_Malloc(sizeof(TIMM_OSAL_TASK), 0, 0, - 0); - if (pHandle == TIMM_OSAL_NULL) - { - bReturnStatus = TIMM_OSAL_ERR_ALLOC; - goto EXIT; - } - - /* Initial cleaning of the task structure */ - TIMM_OSAL_Memset((TIMM_OSAL_PTR) pHandle, 0, sizeof(TIMM_OSAL_TASK)); - - /*Arguments for task */ - pHandle->uArgc = uArgc; - pHandle->pArgv = pArgv; - - pHandle->isCreated = TIMM_OSAL_FALSE; - - - if (SUCCESS != pthread_attr_init(&pHandle->ThreadAttr)) - { - /*TIMM_OSAL_Error("Task Init Attr Init failed!"); */ - goto EXIT; - } - /* Updation of the priority and the stack size */ - - if (SUCCESS != pthread_attr_getschedparam(&pHandle->ThreadAttr, - &sched)) - { - /*TIMM_OSAL_Error("Task Init Get Sched Params failed!"); */ - goto EXIT; - } - - sched.sched_priority = uPriority; /* relative to the default priority */ - if (SUCCESS != pthread_attr_setschedparam(&pHandle->ThreadAttr, - &sched)) - { - /*TIMM_OSAL_Error("Task Init Set Sched Paramsfailed!"); */ - goto EXIT; - } - - /*First get the default stack size */ - if (SUCCESS != pthread_attr_getstacksize(&pHandle->ThreadAttr, - &stackSize)) - { - /*TIMM_OSAL_Error("Task Init Set Stack Size failed!"); */ - goto EXIT; - } - - /*Check if requested stack size is larger than the current default stack size */ - if (uStackSize > stackSize) - { - stackSize = uStackSize; - if (SUCCESS != pthread_attr_setstacksize(&pHandle->ThreadAttr, - stackSize)) - { - /*TIMM_OSAL_Error("Task Init Set Stack Size failed!"); */ - goto EXIT; - } - } - - - - if (SUCCESS != pthread_create(&pHandle->threadID, - &pHandle->ThreadAttr, pFunc, pArgv)) - { - /*TIMM_OSAL_Error ("Create_Task failed !"); */ - goto EXIT; - } - - - /* Task was successfully created */ - pHandle->isCreated = TIMM_OSAL_TRUE; - *pTask = (TIMM_OSAL_PTR) pHandle; - bReturnStatus = TIMM_OSAL_ERR_NONE; - /**pTask = (TIMM_OSAL_PTR *)pHandle;*/ - - EXIT: -/* if((TIMM_OSAL_ERR_NONE != bReturnStatus) && (TIMM_OSAL_NULL != pHandle)) { - TIMM_OSAL_Free (pHandle->stackPtr);*/ - if ((TIMM_OSAL_ERR_NONE != bReturnStatus)) - { - TIMM_OSAL_Free(pHandle); - } - return bReturnStatus; - -} - -/* ========================================================================== */ -/** -* @fn TIMM_OSAL_DeleteTask -* -* @see -*/ -/* ========================================================================== */ - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_DeleteTask(TIMM_OSAL_PTR pTask) -{ - TIMM_OSAL_ERRORTYPE bReturnStatus = TIMM_OSAL_ERR_UNKNOWN; - - TIMM_OSAL_TASK *pHandle = (TIMM_OSAL_TASK *) pTask; - void *retVal; - - if ((NULL == pHandle) || (TIMM_OSAL_TRUE != pHandle->isCreated)) - { - /* this task was never created */ - bReturnStatus = TIMM_OSAL_ERR_PARAMETER; - goto EXIT; - } - if (pthread_attr_destroy(&pHandle->ThreadAttr)) - { - /*TIMM_OSAL_Error("Delete_Task failed !"); */ - goto EXIT; - } - if (pthread_join(pHandle->threadID, &retVal)) - { - /*TIMM_OSAL_Error("Delete_Task failed !"); */ - goto EXIT; - /* bReturnStatus = TIMM_OSAL_ERR_CREATE(TIMM_OSAL_ERR, TIMM_OSAL_COMP_TASK, status);*//*shm to be done */ - } - bReturnStatus = TIMM_OSAL_ERR_NONE; - TIMM_OSAL_Free(pHandle); - EXIT: - return bReturnStatus; -} - - -TIMM_OSAL_ERRORTYPE TIMM_OSAL_SleepTask(TIMM_OSAL_U32 mSec) -{ - TIMM_OSAL_S32 nReturn = 0; - -#ifdef _POSIX_VERSION_1_ - usleep(1000 * mSec); -#else - nReturn = usleep(1000 * mSec); -#endif - if (nReturn == 0) - return TIMM_OSAL_ERR_NONE; - else - return TIMM_OSAL_ERR_UNKNOWN; -} diff --git a/domx/mm_osal/src/timm_osal_trace.c b/domx/mm_osal/src/timm_osal_trace.c deleted file mode 100755 index 498054f..0000000 --- a/domx/mm_osal/src/timm_osal_trace.c +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -* @file timm_osal_trace.c -* This file contains methods that provides the functionality -* for logging errors/warings/information/etc. -* -* @path \ -* -*/ -/* -------------------------------------------------------------------------- */ -/* ========================================================================= - *! - *! Revision History - *! =================================== - *! - * ========================================================================= */ - -/****************************************************************************** -* Includes -******************************************************************************/ - -/*#include "typedefs.h"*/ -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include "timm_osal_trace.h" - -#ifdef _Android -#define LOG_TAG "DOMX" -#include <utils/Log.h> -#include <cutils/properties.h> -#endif - -/** -* The OSAL debug trace detail can be set at compile time by defining the flag -* TIMM_OSAL_DEBUG_TRACE_DETAIL=<Details> -* detail - 0 - no detail -* 1 - function name -* 2 - function name, line number -* Prefix is added to every debug trace message -*/ -#ifndef TIMM_OSAL_DEBUG_TRACE_DETAIL -#define TIMM_OSAL_DEBUG_TRACE_DETAIL 2 -#endif - -#define DEFAULT_TRACE_LEVEL TIMM_OSAL_TRACE_LEVEL_ERROR - -static int trace_level = -1; - -/* strip out leading ../ stuff that happens to __FILE__ for out-of-tree builds */ -static const char *simplify_path(const char *file) -{ - while (file) - { - char c = file[0]; - if ((c != '.') && (c != '/') && (c != '\\')) - break; - file++; - } - return file; -} - -void TIMM_OSAL_UpdateTraceLevel(void) -{ - char *val = getenv("TIMM_OSAL_DEBUG_TRACE_LEVEL"); - - if (val) - { - trace_level = strtol(val, NULL, 0); - } - else - { -#ifdef _Android - char value[PROPERTY_VALUE_MAX]; - int val; - - property_get("debug.domx.trace_level", value, "0"); - val = atoi(value); - if ( (!val) || (val < 0) ) - { - trace_level = DEFAULT_TRACE_LEVEL; - } - else - trace_level = val; -#else - trace_level = DEFAULT_TRACE_LEVEL; -#endif - } -} - -void __TIMM_OSAL_TraceFunction(const __TIMM_OSAL_TRACE_LOCATION * loc, - const char *fmt, ...) -{ - if (trace_level == -1) - { - char *val = getenv("TIMM_OSAL_DEBUG_TRACE_LEVEL"); - trace_level = - val ? strtol(val, NULL, 0) : DEFAULT_TRACE_LEVEL; - } - - if (trace_level >= loc->level) - { - va_list ap; - - va_start(ap, fmt); /* make ap point to first arg after 'fmt' */ - -#ifdef _Android - -#if 0 // Original for reference -#if ( TIMM_OSAL_DEBUG_TRACE_DETAIL > 1 ) - ALOGD("%s:%d\t%s()\t", simplify_path(loc->file), loc->line, - loc->function); -#endif -#else // Prints function_name for ERROR, WARNING and ENTRY/EXIT - if ( (loc->level == TIMM_OSAL_TRACE_LEVEL_ERROR) || (loc->level == TIMM_OSAL_TRACE_LEVEL_WARNING) || (loc->level == TIMM_OSAL_TRACE_LEVEL_ENTERING) ) - ALOGD("%s:%d\t%s()\t", simplify_path(loc->file), loc->line, - loc->function); -#endif - - char string[1000]; - vsprintf(string, fmt, ap); - ALOGD("%s",string); - -#else - -#if 0 // Original for reference -#if ( TIMM_OSAL_DEBUG_TRACE_DETAIL > 1 ) - printf("%s:%d\t%s()\t", simplify_path(loc->file), loc->line, - loc->function); -#endif -#else // Prints function_name for ERROR, WARNING and ENTRY/EXIT - if ( (loc->level == 1) || (loc->level == 2) || (loc->level == 5) ) - printf("%s:%d\t%s()\t", simplify_path(loc->file), loc->line, - loc->function); -#endif - - vprintf(fmt, ap); - -#endif - - va_end(ap); - } -} diff --git a/domx/omx_core/Android.mk b/domx/omx_core/Android.mk deleted file mode 100644 index d52947a..0000000 --- a/domx/omx_core/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - src/OMX_Core.c \ - src/OMX_Core_Wrapper.c - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/inc \ - $(LOCAL_PATH)/../mm_osal/inc \ - frameworks/native/include/media/openmax - -LOCAL_SHARED_LIBRARIES := \ - libdl \ - liblog \ - libmm_osal - -LOCAL_CFLAGS += -DSTATIC_TABLE -D_Android -DCHECK_SECURE_STATE - -LOCAL_MODULE := libOMX_Core -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/domx/omx_core/Makefile b/domx/omx_core/Makefile deleted file mode 100644 index 5c6c563..0000000 --- a/domx/omx_core/Makefile +++ /dev/null @@ -1,99 +0,0 @@ -# -# Copyright (C) Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# REF=ORG -# Original version. -# ---------------------------------------------------------------------------- - -#PROJROOT = .. - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS += -DSTATIC_TABLE -CDEFS = -ifeq ($(BUILD),udeb) -CDEFS += DEBUG -endif -CDEFS += - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = libomx_core - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = SH_LIB - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = lib - -# install directory relative to the root filesystem -ROOTFSRELEASE = lib - -# Folders in which gmake will run before building current target - -SUBMODULES = \ - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ - src/OMX_Core.c \ - - -# Search path for include files - -INCLUDES = \ - $(PROJROOT)/omx_core/inc \ - $(PROJROOT)/mm_osal/inc \ - -# Libraries needed for linking. - -ST_LIBS = -#mm_osal omx_proxy_component -SH_LIBS = mm_osal dl -#pthread rt utils procmgr ipc rcm notify -#SH_LIBS += sysmgr sysmemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = $(PROJROOT)/mm_osal -# $(PROJROOT)/video/omx_proxy_component/src - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk - diff --git a/domx/omx_core/inc/OMX_ComponentExt.h b/domx/omx_core/inc/OMX_ComponentExt.h deleted file mode 100755 index e32dcbe..0000000 --- a/domx/omx_core/inc/OMX_ComponentExt.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2010 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - -/** OMX_ComponentExt.h - OpenMax IL version 1.1.2 - * The OMX_ComponentExt header file contains extensions to the definitions used - * by both the application and the component to access common items. - */ - -#ifndef OMX_ComponentExt_h -#define OMX_ComponentExt_h - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* Each OMX header must include all required header files to allow the - * header to compile without errors. The includes below are required - * for this header file to compile successfully - */ -#include <OMX_Types.h> - - -/** Set/query the commit mode */ -typedef struct OMX_CONFIG_COMMITMODETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_BOOL bDeferred; -} OMX_CONFIG_COMMITMODETYPE; - -/** Explicit commit */ -typedef struct OMX_CONFIG_COMMITTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; -} OMX_CONFIG_COMMITTYPE; - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* OMX_ComponentExt_h */ diff --git a/domx/omx_core/inc/OMX_ComponentRegistry.h b/domx/omx_core/inc/OMX_ComponentRegistry.h deleted file mode 100755 index 7bedcfc..0000000 --- a/domx/omx_core/inc/OMX_ComponentRegistry.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <dirent.h> - -#define MAX_ROLES 20 -#define MAX_TABLE_SIZE 50 - -typedef struct _ComponentTable { - OMX_STRING name; - OMX_U16 nRoles; - OMX_STRING pRoleArray[MAX_ROLES]; -}ComponentTable; - - -OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent ( - OMX_IN OMX_STRING compName, - OMX_INOUT OMX_U32 *pNumRoles, - OMX_OUT OMX_U8 **roles); - -OMX_ERRORTYPE OMX_PrintComponentTable(); -OMX_ERRORTYPE OMX_BuildComponentTable(); -OMX_ERRORTYPE ComponentTable_EventHandler( - OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_PTR pAppData, - OMX_IN OMX_EVENTTYPE eEvent, - OMX_IN OMX_U32 nData1, - OMX_IN OMX_U32 nData2, - OMX_IN OMX_PTR pEventData); - -OMX_ERRORTYPE ComponentTable_EmptyBufferDone( - OMX_OUT OMX_HANDLETYPE hComponent, - OMX_OUT OMX_PTR pAppData, - OMX_OUT OMX_BUFFERHEADERTYPE* pBuffer); - -OMX_ERRORTYPE ComponentTable_FillBufferDone( - OMX_OUT OMX_HANDLETYPE hComponent, - OMX_OUT OMX_PTR pAppData, - OMX_OUT OMX_BUFFERHEADERTYPE* pBuffer); diff --git a/domx/omx_core/inc/OMX_CoreExt.h b/domx/omx_core/inc/OMX_CoreExt.h deleted file mode 100755 index 5974d02..0000000 --- a/domx/omx_core/inc/OMX_CoreExt.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2010 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - -/** OMX_CoreExt.h - OpenMax IL version 1.1.2 - * The OMX_CoreExt header file contains extensions to the definitions used - * by both the application and the component to access common items. - */ - -#ifndef OMX_CoreExt_h -#define OMX_CoreExt_h - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* Each OMX header shall include all required header files to allow the - * header to compile without errors. The includes below are required - * for this header file to compile successfully - */ -#include <OMX_Core.h> - -/** Extensions to the standard IL errors. */ -typedef enum OMX_ERROREXTTYPE -{ - OMX_ErrorInvalidMode = (OMX_S32) (OMX_ErrorKhronosExtensions + 0x00000001), - OMX_ErrorExtMax = 0x7FFFFFFF -} OMX_ERROREXTTYPE; - - -/** Event type extensions. */ -typedef enum OMX_EVENTEXTTYPE -{ - OMX_EventIndexSettingChanged = OMX_EventKhronosExtensions, /**< component signals the IL client of a change - in a param, config, or extension */ - OMX_EventExtMax = 0x7FFFFFFF -} OMX_EVENTEXTTYPE; - - -/** Enable or disable a callback event. */ -typedef struct OMX_CONFIG_CALLBACKREQUESTTYPE { - OMX_U32 nSize; /**< size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_INDEXTYPE nIndex; /**< the index the callback is requested for */ - OMX_BOOL bEnable; /**< enable (OMX_TRUE) or disable (OMX_FALSE) the callback */ -} OMX_CONFIG_CALLBACKREQUESTTYPE; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* OMX_CoreExt_h */ -/* File EOF */ diff --git a/domx/omx_core/inc/OMX_Core_Wrapper.h b/domx/omx_core/inc/OMX_Core_Wrapper.h deleted file mode 100755 index 567a357..0000000 --- a/domx/omx_core/inc/OMX_Core_Wrapper.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** OMX_Core.h - * The OMX_Core header file contains the definitions used for PV core - */ - -#ifndef OMX_TI_Core_h -#define OMX_TI_Core_h - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -/* Each OMX header shall include all required header files to allow the - * header to compile without errors. The includes below are required - * for this header file to compile successfully - */ - -#include <OMX_Core.h> -OMX_API OMX_ERRORTYPE OMX_APIENTRY TIOMX_Init(void); -OMX_API OMX_ERRORTYPE OMX_APIENTRY TIOMX_Deinit(void); -OMX_API OMX_ERRORTYPE OMX_APIENTRY TIOMX_ComponentNameEnum( - OMX_OUT OMX_STRING cComponentName, - OMX_IN OMX_U32 nNameLength, - OMX_IN OMX_U32 nIndex); -OMX_API OMX_ERRORTYPE OMX_APIENTRY TIOMX_GetHandle( - OMX_OUT OMX_HANDLETYPE* pHandle, - OMX_IN OMX_STRING cComponentName, - OMX_IN OMX_PTR pAppData, - OMX_IN OMX_CALLBACKTYPE* pCallBacks); -OMX_API OMX_ERRORTYPE OMX_APIENTRY TIOMX_FreeHandle( - OMX_IN OMX_HANDLETYPE hComponent); -OMX_API OMX_ERRORTYPE TIOMX_GetComponentsOfRole ( - OMX_IN OMX_STRING role, - OMX_INOUT OMX_U32 *pNumComps, - OMX_INOUT OMX_U8 **compNames); -OMX_API OMX_ERRORTYPE OMX_APIENTRY TIOMX_SetupTunnel( - OMX_IN OMX_HANDLETYPE hOutput, - OMX_IN OMX_U32 nPortOutput, - OMX_IN OMX_HANDLETYPE hInput, - OMX_IN OMX_U32 nPortInput); -OMX_API OMX_ERRORTYPE OMX_APIENTRY TIOMX_GetContentPipe( - OMX_OUT OMX_HANDLETYPE *hPipe, - OMX_IN OMX_STRING szURI); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif -/* File EOF */ - diff --git a/domx/omx_core/inc/OMX_Debug.h b/domx/omx_core/inc/OMX_Debug.h deleted file mode 100755 index 0ccc351..0000000 --- a/domx/omx_core/inc/OMX_Debug.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef OMX_DEBUG_H -#define OMX_DEBUG_H - -#include "OMX_DebugMem.h" - -#define OMX_NO_MESSAGES 0x00000000 -#define OMX_ALL_MESSAGES 0xffff0000 - -#define OMX_MASK_FATAL 0x80000000 -#define OMX_MASK_ERROR 0x40000000 -#define OMX_MASK_WARN 0x20000000 -#define OMX_MASK_INFO 0x10000000 -#define OMX_MASK_DEBUG 0x08000000 -#define OMX_MASK_TRACE 0x04000000 -#define OMX_MASK_RESERVE1 0x02000000 -#define OMX_MASK_RESERVE2 0x01000000 - -#define OMX_MASK_USERMASK 0x00FF0000 - -#define OMX_OPTION_FILE 0x00000001 -#define OMX_OPTION_FUNC 0x00000002 -#define OMX_OPTION_LINE 0x00000004 - -#define OMX_MASK_HANDLES 0x0000FFFF - - - -/* - * ANSI escape sequences for outputing text in various colors - */ -#define DBG_TEXT_WHITE "\x1b[1;37;40m" -#define DBG_TEXT_YELLOW "\x1b[1;33;40m" -#define DBG_TEXT_MAGENTA "\x1b[1;35;40m" -#define DBG_TEXT_GREEN "\x1b[1;32;40m" -#define DBG_TEXT_CYAN "\x1b[1;36;40m" -#define DBG_TEXT_RED "\x1b[1;31;40m" - - -/* Setup log format (adds newline if no newline provided) */ -// do not use this one directly.... -#define OMX_LOG_PRINT(HANDLE, STR, ARG...) \ - (OMX_Log(HANDLE, __FILE__, __LINE__, __FUNCTION__, STR, ##ARG)) - -#ifdef OMX_DEBUG - #define OMX_DPRINT(HANDLE, STR, ARG...) OMX_LOG_PRINT(OMX_MASK_DEBUG | HANDLE, STR, ##ARG) - #define OMX_TPRINT(HANDLE, STR, ARG...) OMX_LOG_PRINT(OMX_MASK_TRACE | HANDLE, STR, ##ARG) -#else - #define OMX_DPRINT(HANDLE, STR, ARG...) - #define OMX_TPRINT(HANDLE, STR, ARG...) -#endif - -/* Later this will be able to be turned on/off separately as a trace */ -#define OMX_DENTER(handle) OMX_TPRINT((handle), "+++ENTERING") -#define OMX_DEXIT(handle,retVal) OMX_TPRINT((handle), "---EXITING(0x%x)", (retVal)) - -#define OMX_DBG_INT(handle, intVar) OMX_DPRINT(OMX_MASK_DEBUG | (handle), #intVar ": %d", (intVar)) -#define OMX_DBG_PTR(handle, ptrVar) OMX_DPRINT(OMX_MASK_DEBUG | (handle), #ptrVar ": 0x%08x", (ptrVar)) -#define OMX_DBG_STR(handle, strVar) OMX_DPRINT(OMX_MASK_DEBUG | (handle), #strVar ": %s", (strVar)) - - -/* Error/warning printing defines to be used by all sub-components */ -#define OMX_INFOPRINT(handle, str,arg...) (OMX_LOG_PRINT(OMX_MASK_INFO | (handle), "(INFO) "str, ##arg)) -#define OMX_WARNPRINT(handle, str,arg...) (OMX_LOG_PRINT(OMX_MASK_WARN | (handle), "(WARN) "str, ##arg)) -#define OMX_ERRPRINT(handle, str,arg...) (OMX_LOG_PRINT(OMX_MASK_ERROR | (handle), "(ERROR) "str, ##arg)) -#define OMX_FATALPRINT(handle, str,arg...) (OMX_LOG_PRINT(OMX_MASK_FATAL | (handle), "(FATAL) "str, ##arg)) - -/* assert macros */ -#ifdef OMX_DEBUG - #define OMX_ASSERT(COND) ((!(COND))?OMX_FATALPRINT(0,"OMX_ASSERT("#COND")"),abort():0) -#else - #define OMX_ASSERT(COND) -#endif - -#define OMX_LOG_ADD_MASK(HANDLE,NEW_BITS) (OMX_Log_SetMask((HANDLE), OMX_Log_GetMask(HANDLE) | (NEW_BITS))) -#define OMX_LOG_CLEAR_MASK(HANDLE,NEW_BITS) (OMX_Log_SetMask((HANDLE), OMX_Log_GetMask(HANDLE) & ~(NEW_BITS))) - -#define OMX_LOG_ADD_OPTIONS(HANDLE,NEW_BITS) (OMX_Log_SetOptions((HANDLE), OMX_Log_GetOptions(HANDLE) | (NEW_BITS))) -#define OMX_LOG_CLEAR_OPTIONS(HANDLE,NEW_BITS) (OMX_Log_SetOptions((HANDLE), OMX_Log_GetOptions(HANDLE) & ~(NEW_BITS))) - -typedef unsigned int OMX_DBG_HANDLE; - -OMX_DBG_HANDLE OMX_Log_GetDebugHandle(const char *description); -void OMX_Log_ReleaseDebugHandle(OMX_DBG_HANDLE hDebug); -unsigned int OMX_Log_GetMask(OMX_DBG_HANDLE hDebug); -unsigned int OMX_Log_SetMask(OMX_DBG_HANDLE hDebug, unsigned int uiNewMask); - -unsigned int OMX_Log_GetOptions(OMX_DBG_HANDLE hDebug); -unsigned int OMX_Log_SetOptions(OMX_DBG_HANDLE hDebug, unsigned int uiNewOptions); - -void OMX_Log(unsigned int mask, const char *szFileName, int iLineNum, - const char *szFunctionName, const char *strFormat, ...); - -const char *OMX_GetErrorString(OMX_ERRORTYPE error); - -OMX_ERRORTYPE OMX_Log_LoadConfigFile(char* szConfigFile); - - -/* - * The following macros are intended to make accessing a debug handle easier. - * - * For example, for the Util library, you would create a header file called - * OMX_Util_Private.h. This file will be included in all source files - * compiled into the Util library. The header file uses the 'define' macro - * to generate a prototype for the getDebugHandle() function: - * - * DEFINE_DEBUG_HANDLE_FN(UTIL); - * - * Now, in your private header file, define easier macros for printing: - * - * #define UTIL_DPRINT(str,args...) OMX_DPRINT(ACCESS_DEBUG_HANDLE(UTIL),str,##args) - * #define UTIL_WARNPRINT(str,args...) OMX_WARNPRINT(ACCESS_DEBUG_HANDLE(UTIL),str,##args) - * #define UTIL_ERRPRINT(str,args...) OMX_ERRPRINT(ACCESS_DEBUG_HANDLE(UTIL),str,##args) - * - * Finally, in a source file which will be compiled into the lib, for example - * OMX_Util_Private.c, you implement the function with the 'implement' macro: - * - * IMPLEMENT_DEBUG_HANDLE_FN(UTIL) - * - */ -#define DEFINE_DEBUG_HANDLE_FN(MOD) OMX_DBG_HANDLE getDebugHandle_##MOD(void); - -#define ACCESS_DEBUG_HANDLE(MOD) getDebugHandle_##MOD() - -#define IMPLMENT_DEBUG_HANDLE_FN(MOD) \ -OMX_DBG_HANDLE getDebugHandle_##MOD(void) \ -{ \ - static OMX_DBG_HANDLE hDebug = 0; \ - if(!hDebug) { \ - hDebug = OMX_Log_GetDebugHandle(#MOD); \ - OMX_DPRINT(0,"Component "#MOD": hDebug %d",hDebug); \ - } \ - return hDebug; \ -} - - - -#endif - diff --git a/domx/omx_core/inc/OMX_DebugMem.h b/domx/omx_core/inc/OMX_DebugMem.h deleted file mode 100755 index f45cfe0..0000000 --- a/domx/omx_core/inc/OMX_DebugMem.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef OMX_DEBUGMEM_H -#define OMX_DEBUGMEM_H - -#include <stdlib.h> // for size_t - -#if OMX_DEBUG -void* OMX_DebugMem_calloc(size_t num, size_t size, - const char* file, const char* func, int line); -void* OMX_DebugMem_malloc(size_t size, - const char* file, const char* func, int line); -void* OMX_DebugMem_realloc(void *ptr, size_t size, - const char* file, const char* func, int line); -void OMX_DebugMem_free(void* ptr, - const char* file, const char* func, int line); -int OMX_DebugMem_validate(void *ptr, - const char* file, const char* func, int line); - -void OMX_DebugMem_dump(const char *file, const char *func, int line); -#endif - -#define OMX_MASK_MEMORY 0x00010000 /** One of the reserved bits from OMX_MASK_USERMASK */ - -#define MEM_DEBUG_HANDLE_DESCR "DebugMemory" - -#if OMX_DEBUG - #define malloc(x) OMX_DebugMem_malloc(x,__FILE__,__FUNCTION__,__LINE__) - #define calloc(n,s) OMX_DebugMem_calloc(n,s,__FILE__,__FUNCTION__,__LINE__) - #define realloc(x,s) OMX_DebugMem_realloc(x,s,__FILE__,__FUNCTION__,__LINE__) - #define free(x) OMX_DebugMem_free(x,__FILE__,__FUNCTION__ ,__LINE__) - #define validate(x) OMX_DebugMem_validate(x, __FILE__,__FUNCTION__ ,__LINE__) - #define dump() OMX_DebugMem_dump( __FILE__,__FUNCTION__ ,__LINE__) -#else - #define validate(x) - #define dump() -#endif - - -#endif - diff --git a/domx/omx_core/inc/OMX_TI_Common.h b/domx/omx_core/inc/OMX_TI_Common.h deleted file mode 100755 index 457adb6..0000000 --- a/domx/omx_core/inc/OMX_TI_Common.h +++ /dev/null @@ -1,221 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_ti_common.h - * - * - * @path \OMAPSW_SysDev\multimedia\omx\khronos1_1\omx_core\inc - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 20-Dec-2008 x0052661@ti.com, initial version - *================================================================*/ - -#ifndef _OMX_TI_COMMON_H_ -#define _OMX_TI_COMMON_H_ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <OMX_Core.h> - -/******************************************************************* - * EXTERNAL REFERENCE NOTE: only use if not found in header file - *******************************************************************/ -/*---------- function prototypes ------------------- */ -/*---------- data declarations ------------------- */ -/******************************************************************* - * PUBLIC DECLARATIONS: defined here, used elsewhere - *******************************************************************/ -/*---------- function prototypes ------------------- */ -/*---------- data declarations ------------------- */ -#define OMX_BUFFERHEADERFLAG_MODIFIED 0x00000100 - -#define OMX_TI_BUFFERFLAG_READONLY 0x00000200 - -/* TI extra data will be passed in the platform private structure rather than - * appended at the end of the buffer. Adding a new custom flag to indicate - * this.*/ -#define OMX_TI_BUFFERFLAG_DETACHEDEXTRADATA 0x00000400 - -typedef struct OMX_CONFIG_CHANNELNAME { - - OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Index of the port */ - OMX_STRING cChannelName; /**< Channel name */ - -} OMX_CONFIG_CHANNELNAME; - -typedef struct OMX_TI_PLATFORMPRIVATE -{ - OMX_U32 nSize; - OMX_PTR pExtendedPlatformPrivate; - OMX_BOOL bReadViaCPU; - OMX_BOOL bWriteViaCPU; - OMX_PTR pMetaDataBuffer; - OMX_U32 nMetaDataSize; - OMX_PTR pAuxBuf1; - OMX_U32 pAuxBufSize1; -}OMX_TI_PLATFORMPRIVATE; - -/*===============================================================*/ -/** OMX_TI_PARAM_BUFFERPREANNOUNCE : This parameter is used to enable/disable - * buffer pre announcement. Buffer pre - * announcement is enabled by default i.e. - * if buffer is being allocated by client - * then the buffer ptrs will be made known - * to the component at the time of - * UseBuffer and these will not change in - * lifetime of the component. If pre - * announcement is disabled then new - * buffers can be allocated by the client - * at runtime and passed in ETB/FTB. This - * parameter is valid only in cases where - * client allocates the buffer - * (i.e. UseBuffer cases). - * - * @ param nSize : Size of the structure. - * @ param nVersion : Version. - * @ param nPortIndex : Port index on which the parameter will - * be applied. - * @ param bEnabled : Whether buffer pre announcement is - * enabled or not. Set to TRUE (enabled) - * by default. - */ -/*===============================================================*/ -typedef struct OMX_TI_PARAM_BUFFERPREANNOUNCE -{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnabled; -}OMX_TI_PARAM_BUFFERPREANNOUNCE; - - - -/*===============================================================*/ -/** OMX_TI_CONFIG_BUFFERREFCOUNTNOTIFYTYPE : This config is used to - * enable/disable notification when - * reference count of a buffer changes - * This happens usually when buffers - * are locked/unlocked by codecs. By - * DEFAULT all notifications are - * DISABLED. - * - * @ param nSize : Size of the structure. - * @ param nVersion : Version. - * @ param nPortIndex : Port index on which the config will - * be applied. - * @param bNotifyOnIncrease : Enable notification when reference - * count is increased. - * @ param bNotifyOnDecrease : Enable notification when reference - * count is decreased. - * @ param nCountForNotification : Count at which to trigger - * notification. Count indicates no. - * of copies of the buffer in - * circulation e.g. - * 1 - Only the original buffer is in - * circulation i.e. no buffers are - * currently locked. - * 2 - There are two copies of the - * buffer i.e. one original and - * one copy which has been locked - * by the codec. - * And so on - * SPECIAL CASE - * 0 - Indicates notify always - * irrespective of count value. - */ -/*===============================================================*/ -typedef struct OMX_TI_CONFIG_BUFFERREFCOUNTNOTIFYTYPE -{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bNotifyOnIncrease; - OMX_BOOL bNotifyOnDecrease; - OMX_U32 nCountForNotification; -}OMX_TI_CONFIG_BUFFERREFCOUNTNOTIFYTYPE; - - - - - -/* OMX_TI_SEVERITYTYPE enumeration is used to indicate severity level of errors returned by TI OpenMax components. - Critcal Requires reboot/reset DSP - Severe Have to unload components and free memory and try again - Major Can be handled without unloading the component - Minor Essentially informational -*/ -typedef enum OMX_TI_SEVERITYTYPE { - OMX_TI_ErrorCritical=1, - OMX_TI_ErrorSevere, - OMX_TI_ErrorMajor, - OMX_TI_ErrorMinor -} OMX_TI_SEVERITYTYPE; - -/* ============================================================================= */ -/* -@brief OMX_TI_PARAM_METADATABUFFERINFO : Structure to access metadata buffer info needed - by proxy to allocate metadat buffers. - -*/ -/* ============================================================================= */ -typedef struct OMX_TI_PARAM_METADATABUFFERINFO { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bIsMetaDataEnabledOnPort; - OMX_U32 nMetaDataSize; -} OMX_TI_PARAM_METADATABUFFERINFO; - -/******************************************************************* - * PRIVATE DECLARATIONS: defined here, used only here - *******************************************************************/ -/*---------- data declarations ------------------- */ -/*---------- function prototypes ------------------- */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _OMX_TI_COMMON_H_ */ diff --git a/domx/omx_core/inc/OMX_TI_Core.h b/domx/omx_core/inc/OMX_TI_Core.h deleted file mode 100755 index eb4993e..0000000 --- a/domx/omx_core/inc/OMX_TI_Core.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * @file omx_ti_core.h - * This file contains the vendor(TI) specific core extensions - * - * @path domx/system/omx_core/inc - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 19-Jul-2010 admonga@ti.com : Initial version - *================================================================*/ - -#ifndef _OMX_TI_CORE_H_ -#define _OMX_TI_CORE_H_ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/****************************************************************** - INCLUDE FILES - ******************************************************************/ -#include <OMX_Types.h> -#include <OMX_Core.h> - -/******************************************************************* - * EXTERNAL REFERENCE NOTE: only use if not found in header file - *******************************************************************/ -/*---------- function prototypes ------------------- */ -/*---------- data declarations ------------------- */ -/******************************************************************* - * PUBLIC DECLARATIONS: defined here, used elsewhere - *******************************************************************/ -/*---------- function prototypes ------------------- */ -/*---------- data declarations ------------------- */ - - - -typedef enum OMX_TI_ERRORTYPE -{ - /* Vendor specific area for storing TI custom extended events */ - - /*Control attribute is pending - Dio_Dequeue will not work until attribute - is retreived*/ - OMX_TI_WarningAttributePending = (OMX_S32)((OMX_ERRORTYPE)OMX_ErrorVendorStartUnused + 1), - /*Attribute buffer size is insufficient - reallocate the attribute buffer*/ - OMX_TI_WarningInsufficientAttributeSize, - /*EOS buffer has been received*/ - OMX_TI_WarningEosReceived, - /*Port enable is called on an already enabled port*/ - OMX_TI_ErrorPortIsAlreadyEnabled, - /*Port disable is called on an already disabled port*/ - OMX_TI_ErrorPortIsAlreadyDisabled -} OMX_TI_ERRORTYPE; - - - -typedef enum OMX_TI_EVENTTYPE -{ - /* Vendor specific area for storing indices */ - /*Reference count for the buffer has changed. In the callback, nData1 will - pBufferHeader, nData2 will be present count*/ - OMX_TI_EventBufferRefCount = (OMX_S32)((OMX_EVENTTYPE)OMX_EventVendorStartUnused + 1) -}OMX_TI_EVENTTYPE; - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _OMX_TI_INDEX_H_ */ - diff --git a/domx/omx_core/inc/OMX_TI_IVCommon.h b/domx/omx_core/inc/OMX_TI_IVCommon.h deleted file mode 100755 index 84bcbac..0000000 --- a/domx/omx_core/inc/OMX_TI_IVCommon.h +++ /dev/null @@ -1,2657 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -------------------------------------------------------------------------- * - * - * @file:OMX_TI_IVCommon.h - * This header defines the structures specific to the config indices of msp_VPPM. - * - * @path ..\OMAPSW_SysDev\multimedia\omx\khronos1_1\omx_core\inc - * - * -------------------------------------------------------------------------- */ - -/* ======================================================================== *! - *! Revision History - *! ==================================================================== */ - -#ifndef OMX_TI_IVCommon_H -#define OMX_TI_IVCommon_H - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include <OMX_IVCommon.h> -#include <OMX_Image.h> - -#define DCC_PATH "/data/misc/camera/" -#define MAX_URI_LENGTH (OMX_MAX_STRINGNAME_SIZE) -#define MAX_ALGOAREAS (35) - -/*======================================================================= */ -/* Enumerated values for operation mode for compressed image - * - * ENUMS: - * Chunk : Chunk based operation - * NonChunk : Non-chunk based operation - */ - /* ======================================================================= */ -typedef enum OMX_JPEG_COMPRESSEDMODETYPE { - OMX_JPEG_ModeChunk = 0, - OMX_JPEG_ModeNonChunk -}OMX_JPEG_COMPRESSEDMODETYPE ; - - -/*======================================================================= */ -/* Enumerated values for operation mode for uncompressed image - * - * ENUMS: - * Frame : Frame based operation - * Slice : Slice based operation - * Stitch : For stitching between image frames - * Burst : For stitching between image frames - */ - /* ======================================================================= */ -typedef enum OMX_JPEG_UNCOMPRESSEDMODETYPE { - OMX_JPEG_UncompressedModeFrame = 0, - OMX_JPEG_UncompressedModeSlice, - OMX_JPEG_UncompressedModeStitch, - OMX_JPEG_UncompressedModeBurst -}OMX_JPEG_UNCOMPRESSEDMODETYPE; - - - -/*======================================================================= */ -/* Configuration structure for compressed image - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eCompressedImageMode : Operating mode enumeration for compressed image - */ - /*======================================================================= */ -typedef struct OMX_JPEG_PARAM_COMPRESSEDMODETYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_JPEG_COMPRESSEDMODETYPE eCompressedImageMode; -}OMX_JPEG_PARAM_COMPRESSEDMODETYPE; - - - -/*======================================================================= */ -/* Uncompressed image Operating mode configuration structure - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nBurstLength : No of frames to be dumped in burst mode - * eUncompressedImageMode : uncompressed image mode information - * eSourceType : Image encode souce info - * tRotationInfo : Rotation related information - */ - /*======================================================================= */ -typedef struct OMX_JPEG_PARAM_UNCOMPRESSEDMODETYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nBurstLength; - OMX_JPEG_UNCOMPRESSEDMODETYPE eUncompressedImageMode; -}OMX_JPEG_PARAM_UNCOMPRESSEDMODETYPE; - - -/*======================================================================= */ -/* Subregion Decode Parameter configuration structure - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nXOrg : Sectional decoding X origin - * nYOrg : Sectional decoding Y origin - * nXLength : Sectional decoding X length - * nYLength : Sectional decoding Y length - */ - /*======================================================================= */ -typedef struct OMX_IMAGE_PARAM_DECODE_SUBREGION{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nXOrg; - OMX_U32 nYOrg; - OMX_U32 nXLength; - OMX_U32 nYLength; -}OMX_IMAGE_PARAM_DECODE_SUBREGION; - - -/** - * sensor select types - */ -typedef enum OMX_SENSORSELECT{ - OMX_PrimarySensor = 0, - OMX_SecondarySensor, - OMX_TI_StereoSensor, - OMX_SensorTypeMax = 0x7fffffff -}OMX_SENSORSELECT; - -/** - * - * Sensor Select - */ -typedef struct OMX_CONFIG_SENSORSELECTTYPE { -OMX_U32 nSize; /**< Size of the structure in bytes */ -OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ -OMX_U32 nPortIndex; /**< Port that this struct applies to */ -OMX_SENSORSELECT eSensor; /**< sensor select */ -} OMX_CONFIG_SENSORSELECTTYPE; - -/** - * Flicker cancellation types - */ -typedef enum OMX_COMMONFLICKERCANCELTYPE{ - OMX_FlickerCancelOff = 0, - OMX_FlickerCancelAuto, - OMX_FlickerCancel50, - OMX_FlickerCancel60, - OMX_FlickerCancel100, - OMX_FlickerCancel120, - OMX_FlickerCancelMax = 0x7fffffff -}OMX_COMMONFLICKERCANCELTYPE; - -typedef struct OMX_CONFIG_FLICKERCANCELTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_COMMONFLICKERCANCELTYPE eFlickerCancel; -} OMX_CONFIG_FLICKERCANCELTYPE; - - -/** - * Sensor caleberation types - */ -typedef enum OMX_SENSORCALTYPE{ - OMX_SensorCalFull = 0, - OMX_SensorCalQuick, - OMX_SensorCalMax = 0x7fffffff -}OMX_SENSORCALTYPE; - -typedef struct OMX_CONFIG_SENSORCALTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_SENSORCALTYPE eSensorCal; -} OMX_CONFIG_SENSORCALTYPE; - -/** - * Scene mode types - */ -typedef enum OMX_SCENEMODETYPE{ - - OMX_Manual = 0, - OMX_Closeup, - OMX_Portrait, - OMX_Landscape, - OMX_Underwater, - OMX_Sport, - OMX_SnowBeach, - OMX_Mood, - OMX_NightPortrait, - OMX_NightIndoor, - OMX_Fireworks, - OMX_Document, /**< for still image */ - OMX_Barcode, /**< for still image */ - OMX_SuperNight, /**< for video */ - OMX_Cine, /**< for video */ - OMX_OldFilm, /**< for video */ - OMX_TI_Action, - OMX_TI_Beach, - OMX_TI_Candlelight, - OMX_TI_Night, - OMX_TI_Party, - OMX_TI_Portrait, - OMX_TI_Snow, - OMX_TI_Steadyphoto, - OMX_TI_Sunset, - OMX_TI_Theatre, - OMX_SceneModeMax = 0x7fffffff -}OMX_SCENEMODETYPE; - -typedef struct OMX_CONFIG_SCENEMODETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_SCENEMODETYPE eSceneMode; -} OMX_CONFIG_SCENEMODETYPE; - - /** - * Port specific capture trigger - * useful for the usecases with multiple capture ports. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bExtCapturing : Start Captre at the specified port. Can be queried to know the status of a specific port. - */ -typedef struct OMX_CONFIG_EXTCAPTURING { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bExtCapturing; -} OMX_CONFIG_EXTCAPTURING; - - - /** - * Digital Zoom Speed - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nDigitalZoomSpeed : Optical zoom speed level. Special values: - * 0 - stop current movement - * values from 1 to 254 are mapped proportionally to supported zoom speeds inside optical zoom driver. - * So 1 is slowest available optical zoom speed and 254 is fastest available optical zoom speed - * 255 - default optical zoom speed value - */ -typedef struct OMX_CONFIG_DIGITALZOOMSPEEDTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U8 nDigitalZoomSpeed; -} OMX_CONFIG_DIGITALZOOMSPEEDTYPE; - - - /** - * Digital Zoom Target - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nDigitalZoomTarget : Default and minimum is 0. Maximum is determined by the current supported range - */ - -typedef struct OMX_CONFIG_DIGITALZOOMTARGETTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nDigitalZoomTarget; -} OMX_CONFIG_DIGITALZOOMTARGETTYPE; - - -/** -* Scale quality enums -*/ -typedef enum OMX_SCALEQUALITY{ - OMX_DefaultScaling = 0, /** <default scaling if nothing is specified > */ - OMX_BetterScaling, /** <better scaling> */ - OMX_BestScaling, /** <best scaling> */ - OMX_AutoScalingQuality, /** <auto scaling quality> */ - OMX_FastScaling, /** <fast scaling, prioritizes speed> */ - OMX_ScaleQualityMax = 0x7fffffff -}OMX_SCALEQUALITY; - -/** -* Scaling Quality Mode -*/ -typedef enum OMX_SCALEQUALITYMODE{ - OMX_SingleFrameScalingMode = 0, /** <default > */ - OMX_MultiFrameScalingMode, /** <better scaling> */ - OMX_AutoScalingMode, /** <best scaling> */ - OMX_ScaleModeMax = 0x7fffffff -}OMX_SCALEQUALITYMODE; - - /** - * Rescale quality control type - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * eScaleQuality : controls the quality level. - * eScaleQualityMode : controls the scaling algo types - */ -typedef struct OMX_CONFIG_SCALEQUALITYTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_SCALEQUALITY eScaleQuality; - OMX_SCALEQUALITYMODE eScaleQualityMode; -} OMX_CONFIG_SCALEQUALITYTYPE; - -/** -* Smooth Zoom mode enum -* Starts or stops the Smooth Zoom. Selecting INCREASE will cause an increasing digital zoom factor (increased cropping), -* with a shrinking viewable area and crop height percentage. Selecting DECREASE will cause a decreasing digital zoom (decreased cropping), -* with a growing viewable area and crop height percentage. The CaptureCropHeight will continue to update based on the SmoothZoomRate until -* the SmoothZoomMin or SmoothZoomMax zoom step is reached, the framework minimum zoom step is reached, the SmoothZoomRate becomes 0, -* or the SmoothZoomMode is set to OFF. -* NOTE: The message payload includes all parts of the message that is NOT part of the message header as listed for the CAM_SEND_DATA message. -*/ -typedef enum OMX_SMOOTHZOOMMODE{ - OMX_Off=0, /**< default OFF */ - OMX_Increase, - OMX_Decrease -}OMX_SMOOTHZOOMMODE; - - - /** - * Rescale quality control type - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * eSmoothZoomMode : controls the smooth zoom feature. - * nSmoothZoomRate : Values from 0 to 65535 which represents percentage to increase per second, where 65535 = 100%, and 0 = 0%. - * nSmoothZoomQuantize: - * nSmoothZoomThresh - * nSmoothZoomMin - * nSmoothZoomMax - */ -typedef struct OMX_CONFIG_SMOOTHZOOMTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_SMOOTHZOOMMODE eSmoothZoomMode; - OMX_U32 nSmoothZoomRate; - OMX_U32 nSmoothZoomQuantize; - OMX_U32 nSmoothZoomThresh; - OMX_U32 nSmoothZoomMin; - OMX_U32 nSmoothZoomMax; -} OMX_CONFIG_SMOOTHZOOMTYPE; - -/** - * Enumeration of possible Extended image filter types for OMX_CONFIG_IMAGEFILTERTYPE - */ -typedef enum OMX_EXTIMAGEFILTERTYPE { - OMX_ImageFilterSepia = 0x7F000001, - OMX_ImageFilterGrayScale, - OMX_ImageFilterNatural, - OMX_ImageFilterVivid, - OMX_ImageFilterColourSwap, - OMX_ImageFilterOutOfFocus, - OMX_ImageFilterWaterColour, - OMX_ImageFilterPastel, - OMX_ImageFilterFilm, - OMX_TI_ImageFilterBlackWhite, - OMX_TI_ImageFilterWhiteBoard, - OMX_TI_ImageFilterBlackBoard, - OMX_TI_ImageFilterAqua, - OMX_TI_ImageFilterPosterize -} OMX_EXTIMAGEFILTERTYPE; - - -/** - * Image filter configuration extended - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bBlemish : Enable/Disable Blemish correction - */ -typedef struct OMX_CONFIG_BLEMISHTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bBlemish; -} OMX_CONFIG_BLEMISHTYPE; - -/** - * Enumeration of Bracket types - * OMX_BracketExposureRelativeInEV: - * Exposure value is changed relative to the value set by automatic exposure. - * nBracketStartValue and nBracketStep are in Q16. Increment is additive. - * OMX_BracketExposureAbsoluteMs: - * Exposure value is changed in absolute value in ms. - * nBracketStartValue and nBracketStep are in Q16. Increment is multiplicative. - * OMX_BracketFocusRelative: - * Focus is adjusted relative to the focus set by auto focus. - * The value is S32 integer, and is the same as adjusting nFocusSteps of OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE relatively. - * Increment is additive. - * OMX_BracketFocusAbsolute: - * Focus position is adjusted absolutely. It is the same as setting nFocusSteps of - * OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE relatively for each captures. - * The value should be interpreted as U32 value. Increment is additive. - * OMX_BracketFlashPower: - * Power of flash is adjusted relative to the automatic level. Increment is multiplicative. - * OMX_BracketAperture: - * Aperture number relative to the automatic setting. Data in Q16 format. Increment is multiplicative. - * OMX_BracketTemporal: - * To suppport temporal bracketing. - */ -typedef enum OMX_BRACKETMODETYPE { - OMX_BracketExposureRelativeInEV = 0, - OMX_BracketExposureAbsoluteMs, - OMX_BracketFocusRelative, - OMX_BracketFocusAbsolute, - OMX_BracketFlashPower, - OMX_BracketAperture, - OMX_BracketTemporal, - OMX_BrackerTypeKhronosExtensions = 0x6f000000, - OMX_BrackerTypeVendorStartUnused = 0x7f000000, - OMX_BracketTypeMax = 0x7FFFFFFF -} OMX_BRACKETMODETYPE; - -typedef struct OMX_CONFIG_BRACKETINGTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BRACKETMODETYPE eBracketMode; - OMX_U32 nNbrBracketingValues; - OMX_S32 nBracketValues[10]; /**< 10 can be assumed */ -} OMX_CONFIG_BRACKETINGTYPE; - - -/** - * Capture mode types - * Note: this list could get extended modified based on the type of interenal use-case pipelines implemented within the camera component. - * - * OMX_CaptureImageHighSpeedBurst = 0, - * OMX_CaptureImageHighSpeedTemporalBracketing, - * OMX_CaptureImageProfileBase(Base): - * Base one almost same as Highspeed one. - * OMX_CaptureImageProfileLowLight1(LL1): - * Includes NSF2 in addition to Base processing - * OMX_CaptureImageProfileLowLight2(LL2): - * Includes NSF2 and LBCE in addition to Base processing. - * OMX_CaptureImageProfileOpticalCorr1(OC1): - * Includes LDC in addition to Base processing. - * OMX_CaptureImageProfileOpticalCorr2(OC2): - * Includes LDC and CAC in addition to Base processing. - * OMX_CaptureImageProfileExtended1(Ext1): - * Includes NSF2, LBCE, LDC, and CAC in addition to Base - * OMX_CaptureStereoImageCapture: - * Stereo image capture use-case. - * OMX_CaptureImageMemoryInput: - * need to take sensor input from INPUT port. - * OMX_CaptureVideo: - * OMX_CaptureHighSpeedVideo: - * OMX_CaptureVideoMemoryInput: - * - */ -typedef enum OMX_CAMOPERATINGMODETYPE { - OMX_CaptureImageHighSpeedBurst = 0, - OMX_CaptureImageHighSpeedTemporalBracketing, - OMX_CaptureImageProfileBase, - OMX_CaptureImageProfileLowLight1, - OMX_CaptureImageProfileLowLight2, - OMX_CaptureImageProfileOpticalCorr1, - OMX_CaptureImageProfileOpticalCorr2, - OMX_CaptureImageProfileExtended1, - OMX_CaptureStereoImageCapture, - OMX_CaptureImageMemoryInput, - OMX_CaptureVideo, - OMX_CaptureHighSpeedVideo, - OMX_CaptureVideoMemoryInput, - OMX_TI_CaptureDummy, - OMX_TI_CaptureGestureRecognition, - OMX_TI_CaptureImageProfileZeroShutterLag, - OMX_CamOperatingModeMax = 0x7fffffff -} OMX_CAMOPERATINGMODETYPE; -/** - * Capture mode setting: applicable to multi shot capture also including bracketing. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eCamOperatingMode : specifies the camera operating mode. - */ -typedef struct OMX_CONFIG_CAMOPERATINGMODETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_CAMOPERATINGMODETYPE eCamOperatingMode; -} OMX_CONFIG_CAMOPERATINGMODETYPE; - - -/** - * Capture mode setting: applicable to multi shot capture also including bracketing. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nFrameRate : when bContinuous is FALSE, need to define the frame rate of the muti-shot scenario. Since this would be applicable to IMAGE domain port, there is no port specific frame rate. - * nFrameBefore : - * is specifying how many frames before the capture trigger shall be used. - * It is implementation dependent how many is supported. This shall only be supported for images and not for video frames. - * bPrepareCapture : - * should be set to true when nFrameBefore is greater than zero and before capturing of before-frames should start. - * The component is not allowed to deliver buffers until capturing starts. This shall only be supported for images and not for video frames. - * bEnableBracketing : - * should be enabled when bracketing is used. In bracketing mode, one parameter can be changed per each capture. - * tBracketConfigType : - * specifies bracket mode to use. Valid only when bEnableBracketing is set. - */ -typedef struct OMX_CONFIG_EXTCAPTUREMODETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nFrameRate; - OMX_U32 nFrameBefore; - OMX_BOOL bPrepareCapture; - OMX_BOOL bEnableBracketing; - OMX_CONFIG_BRACKETINGTYPE tBracketConfigType; -} OMX_CONFIG_EXTCAPTUREMODETYPE; - -/** - * For Extended Focus region Type - - */ -typedef struct OMX_CONFIG_EXTFOCUSREGIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nRefPortIndex; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; -} OMX_CONFIG_EXTFOCUSREGIONTYPE; - -/** - * Digital Flash Control - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bDigitalFlash : Digital flash type Enable/Disable - - * Specifies whether the digital flash algorithm is enabled or disabled. This overrides the contrast and brightness settings. - */ -typedef struct OMX_CONFIG_DIGITALFLASHTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bDigitalFlash; -} OMX_CONFIG_DIGITALFLASHTYPE; - - - -/** - * Privacy Indicator Enable/Disable - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bPrivacyIndicator : - * Specifies whether the flash should be used to indicate image or video capture. When flash is not used for exposure, - * flash will be activated after exposure to indicate image capture. - * If video light is not used, the flash can be blinking or constant at low intensity to indicate capture but not affect exposure. - * Specifies whether the digital flash algorithm is enabled or disabled. This overrides the contrast and brightness settings. - */ -typedef struct OMX_CONFIG_PRIVACYINDICATOR { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bPrivacyIndicator; -} OMX_CONFIG_PRIVACYINDICATOR; - - -/** - * Privacy Indicator Enable/Disable - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bTorchMode : - * Enable/Disable - * nIntensityLevel : relative intensity from 0 - 100 - * nDuration : duration in msec - */ -typedef struct OMX_CONFIG_TORCHMODETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bTorchMode; - OMX_U32 nIntensityLevel; - OMX_U32 nDuration; -} OMX_CONFIG_TORCHMODETYPE; - - - -/** - * Privacy Indicator Enable/Disable - * DISABLE - Fire the xenon flash in the usual manner - * ENABLE - Reduce the light intensity of the main flash (ex 1EV) - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bSlowSync : - * Enable - OMX_TRUE/Disable - OMX_FALSE - */ -typedef struct OMX_CONFIG_SLOWSYNCTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bSlowSync; -} OMX_CONFIG_SLOWSYNCTYPE; - - -/** - * Focus control extended enums. use this along with OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE - */ -typedef enum OMX_IMAGE_EXTFOCUSCONTROLTYPE { - OMX_IMAGE_FocusControlAutoMacro = 0x7F000001, /**< Reserved region for introducing Vendor Extensions */ - OMX_IMAGE_FocusControlAutoInfinity, - OMX_IMAGE_FocusControlHyperfocal, - OMX_IMAGE_FocusControlPortrait, /**< from Xena */ - OMX_IMAGE_FocusControlExtended, /**< from Xena */ - OMX_IMAGE_FocusControlContinousNormal, /**< from Xena */ - OMX_IMAGE_FocusControlContinousExtended /**< from Xena */ -} OMX_IMAGE_EXTFOCUSCONTROLTYPE; - - - -/** - * Specifies whether the LED can be used to assist in autofocus, due to low lighting conditions. - * ENABLE means use as determined by the auto exposure algorithm. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bFocusAssist : - * Enable - OMX_TRUE/Disable - OMX_FALSE - */ -typedef struct OMX_CONFIG_FOCUSASSISTTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bFocusAssist; -} OMX_CONFIG_FOCUSASSISTTYPE; - - - -/** - *for locking the focus - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bFocusLock : - * Enable - OMX_TRUE/Disable - OMX_FALSE - */ -typedef struct OMX_CONFIG_FOCUSLOCKTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bFocusLock; -} OMX_CONFIG_FOCUSLOCKTYPE; - - -/** - *for locking the White balance - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bWhiteBalanceLock : - * Enable - OMX_TRUE/Disable - OMX_FALSE - */ -typedef struct OMX_CONFIG_WHITEBALANCELOCKTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bWhiteBalanceLock; -} OMX_CONFIG_WHITEBALANCELOCKTYPE; - -/** - *for locking the Exposure - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bExposureLock : - * Enable - OMX_TRUE/Disable - OMX_FALSE - */ -typedef struct OMX_CONFIG_EXPOSURELOCKTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bExposureLock; -} OMX_CONFIG_EXPOSURELOCKTYPE; - -/** - *for locking the Exposure - * Simultaneously lock focus, white balance and exposure (and relevant other settings). - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bAllLock : - * Enable - OMX_TRUE/Disable - OMX_FALSE - */ -typedef struct OMX_CONFIG_ALLLOCKTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bAllLock; -} OMX_CONFIG_ALLLOCKTYPE; - -/** - *for locking - * Simultaneously lock focus, white balance and exposure (and relevant other settings). - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bLock : - * Enable - OMX_TRUE/Disable - OMX_FALSE - * bAtCapture: - * - */ -typedef struct OMX_IMAGE_CONFIG_LOCKTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bLock; - OMX_BOOL bAtCapture; -} OMX_IMAGE_CONFIG_LOCKTYPE; - -/** - * processig level types enum - */ -typedef enum OMX_PROCESSINGLEVEL{ - OMX_Min = 0, - OMX_Low, - OMX_Medium, - OMX_High, - OMX_Max, - OMX_ProcessingLevelMax = 0x7fffffff -}OMX_PROCESSINGLEVEL; - -/** - *processing level type - * Simultaneously lock focus, white balance and exposure (and relevant other settings). - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nLevel : - * nLevel hinting processing amount. Range of values is -100 to 100. - * 0 causes no change to the image. Increased values cause increased processing to occur, with 100 applying maximum processing. - * Negative values have the opposite effect of positive values. - * bAuto: - * sets if the processing should be applied according to input data. - It is allowed to combine the hint level with the auto setting, - * i.e. to give a bias to the automatic setting. When set to false, the processing should not take input data into account. - */ - -typedef struct OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE { -OMX_U32 nSize; -OMX_VERSIONTYPE nVersion; -OMX_U32 nPortIndex; -OMX_S32 nLevel; -OMX_BOOL bAuto; -} OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE; - - -/** - * White Balance control type extended enums - to be used along with the structure @OMX_CONFIG_WHITEBALCONTROLTYPE - * - * - * - */ -typedef enum OMX_EXTWHITEBALCONTROLTYPE { - OMX_WhiteBalControlFacePriorityMode = OMX_WhiteBalControlVendorStartUnused + 1, /**< */ - OMX_TI_WhiteBalControlSunset, - OMX_TI_WhiteBalControlShade, - OMX_TI_WhiteBalControlTwilight, - OMX_TI_WhiteBalControlWarmFluorescent -} OMX_EXTWHITEBALCONTROLTYPE; - -/** - *white balance gain type - * xWhiteBalanceGain and xWhiteBalanceOffset represents gain and offset for R, Gr, Gb, B channels respectively in Q16 format. \ - * For example, new red pixel value = xWhiteBalanceGain[1]* the current pixel value + xWhiteBalanceOffset[1]. - * All values assume that maximum value is 255. If internal implementation uses higher dynamic range, this value should be adjusted internally. - * nWhiteThreshhold represents thresholds for "white" area measurments in Q16 format. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * - */ -typedef struct OMX_CONFIG_WHITEBALGAINTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_S32 xWhiteBalanceGain[4]; - OMX_S32 xWhiteBalanceOffset[4]; - OMX_S32 nWhiteThreshhold[4]; -} OMX_CONFIG_WHITEBALGAINTYPE; - -/** - * This structure represents linear color conversion from one space to another. For example, to conversion from one RGB color into another RGB color space can be represented as - * R' = xColorMatrix[1][1]*R + xColorMatrix[1][2]*G + xColorMatrix[1][3]*B + xColorOffset[1] - * G' = xColorMatrix[2][1]*R + xColorMatrix[2][2]*G + xColorMatrix[2][3]*B + xColorOffset[2] - * B' = xColorMatrix[3][1]*R + xColorMatrix[3][2]*G + xColorMatrix[3][3]*B + xColorOffset[3] - * Both xColorMatrix and xColorOffset are represented as Q16 value. - * bFullColorRange represents represents whether valid range of color is 0 to 255 (when set to TRUE) or 16 to 235 (for FALSE). - * Again all values assume that maximum value is 255. If internal implementation uses higher dynamic range, this value should be adjusted internally. - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * - */ -typedef struct OMX_CONFIG_EXT_COLORCONVERSIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_S32 xColorMatrix[3][3]; - OMX_S32 xColorOffset[3]; - OMX_BOOL bFullColorRange; -}OMX_CONFIG_EXT_COLORCONVERSIONTYPE; - - -/** - * xGamma represents lool-up table for gamma correction in Q16 format. - * All values assume that maximum value is 255. If internal implementation uses higher dynamic range, this value should be adjusted internally. - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * - */ -typedef struct OMX_CONFIG_GAMMATABLETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 xGamma[3][256]; -}OMX_CONFIG_GAMMATABLETYPE; - - - -/** - * processig types - */ -typedef enum OMX_PROCESSINGTYPE{ - OMX_BloomingReduction = 0, - OMX_Denoise, - OMX_Sharpening, - OMX_Deblurring, - OMX_Demosaicing, - OMX_ContrastEnhancement, - OMX_ProcessingTypeMax = 0x7fffffff -}OMX_PROCESSINGTYPE; - - -typedef struct OMX_CONFIGPROCESSINGORDERTYPE { -OMX_U32 nSize; /**< Size of the structure in bytes */ -OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ -OMX_U32 nPortIndex; /**< Port that this struct applies to */ -OMX_U32 nIndex; -OMX_PROCESSINGTYPE eProc; -} OMX_CONFIGPROCESSINGORDERTYPE; - -/** - * HIST TYPE - */ -typedef enum OMX_HISTTYPE{ - OMX_HistControlLuminance = 0, /**< Luminance histogram is calculated (Y)*/ - OMX_HistControlColorComponents, /**< A histogram per color component (R, G, B) is calculated*/ - OMX_HistControlChrominanceComponents /**< A histogram per chrominance component (Cb, Cr) is calculated.*/ -}OMX_HISTTYPE; - -/** - * Histogram Setting - * nPortIndex is an output port. The port index decides on which port the extra data structur is sent on. - * bFrameLimited is a Boolean used to indicate if measurement shall be terminated after the specified number of - * frames if true frame limited measurement is enabled; otherwise the port does not terminate measurement until - * instructed to do so by the client. - * nFrameLimit is the limit on number of frames measured, this parameter is only valid if bFrameLimited is enabled. - * bMeasure is a Boolean that should be set to true when measurement shall begin, otherwise set to false. Query will give status information on if measurement is ongoing or not. - * nBins specifies the number of histogram bins. When queried with set to zero, the respons gives the maximum number of bins allowed. - * nLeft is the leftmost coordinate of the measurement area rectangle. - * nTop is the topmost coordinate of the measurement area rectangle. - * nWidth is the width of the measurement area rectangle in pixels. - * nHeight is the height of the measurement area rectangle in pixels. - * eHistType is an enumeration specifying the histogram type - * - * - */ - -typedef struct OMX_CONFIG_HISTOGRAMTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bFrameLimited; - OMX_U32 nFrameLimit; - OMX_BOOL bMeasure; - OMX_U32 nBins; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; - OMX_HISTTYPE eHistType; -} OMX_CONFIG_HISTOGRAMTYPE; - -/** - * Enums for HIST component type. - */ -typedef enum OMX_HISTCOMPONENTTYPE{ - OMX_HISTCOMP_Y = 0, /**< Luminance histogram (Y) */ - OMX_HISTCOMP_YLOG, /**< Logarithmic luminance histogram (Y)*/ - OMX_HISTCOMP_R, /**< Red histogram component (R)*/ - OMX_HISTCOMP_G, /**< Green histogram component (G)*/ - OMX_HISTCOMP_B, /**< Blue histogram component (B)*/ - OMX_HISTCOMP_Cb, /**< Chroma blue histogram component (Cb)*/ - OMX_HISTCOMP_Cr /**< Chroma red histogram component (Cr) */ -}OMX_HISTCOMPONENTTYPE; - - /** - * The OMX_TI_CAMERAVIEWTYPE enumeration is used to identify the - * particular camera view that the rest of the data in the structure is - * associated with. - */ -typedef enum OMX_TI_CAMERAVIEWTYPE -{ - OMX_2D, /**< Camera view in 2D sensor configuration */ - OMX_Left, /**< Left camera view in stereo sensor configuration */ - OMX_Right, /**< Right camera view in stereo sensor configuration */ - OMX_TI_CAMERAVIEWTYPE_32BIT_PATCH = 0x7FFFFFFF -} OMX_TI_CAMERAVIEWTYPE; -/** - * nSize is the size of the structure including the length of data field containing - * the histogram data. - * nBins is the number of bins in the histogram. - * eComponentType specifies the type of the histogram bins according to enum. - * It can be selected to generate multiple component types, then the extradata struct - * is repeated for each component type. - * data[1] first byte of the histogram data - */ -typedef struct OMX_HISTOGRAMTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nBins; - OMX_HISTCOMPONENTTYPE eComponentType; - OMX_U8 data[1]; -} OMX_HISTOGRAMTYPE; - -#define OMX_OTHER_EXTRADATATYPE_SIZE ( (OMX_U32)(((OMX_OTHER_EXTRADATATYPE*)0x0)->data) ) /**< Size of OMX_OTHER_EXTRADATATYPE**/ -/** - * The extra data having ancillary data is described with the following structure. - * This data contains single flags and values - * (not arrays) that have general usage for camera applications. - */ -typedef struct OMX_TI_ANCILLARYDATATYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nAncillaryDataVersion; - OMX_U32 nFrameNumber; - OMX_U32 nShotNumber; - OMX_U16 nInputImageHeight; - OMX_U16 nInputImageWidth; - OMX_U16 nOutputImageHeight; - OMX_U16 nOutputImageWidth; - OMX_U16 nDigitalZoomFactor; - OMX_S16 nCropCenterColumn; - OMX_S16 nCropCenterRow; - OMX_U16 nOpticalZoomValue; - OMX_U8 nFlashConfiguration; - OMX_U8 nFlashUsage; - OMX_U32 nFlashStatus; - OMX_U8 nAFStatus; - OMX_U8 nAWBStatus; - OMX_U8 nAEStatus; - OMX_U32 nExposureTime; - OMX_U16 nEVCompensation; - OMX_U8 nDigitalGainValue; - OMX_U8 nAnalogGainValue; - OMX_U16 nCurrentISO; - OMX_U16 nReferenceISO; - OMX_U8 nApertureValue; - OMX_U8 nPixelRange; - OMX_U16 nPixelAspectRatio; - OMX_U8 nCameraShake; - OMX_U16 nFocalDistance; - OMX_U64 nParameterChangeFlags; - OMX_U8 nNumFacesDetected; - OMX_U8 nConvergenceMode; - OMX_U8 nConvergenceStatus; - OMX_U8 nDCCStatus; -} OMX_TI_ANCILLARYDATATYPE; - -typedef struct OMX_TI_WHITEBALANCERESULTTYPE { - OMX_U32 nSize; /**< Size */ - OMX_VERSIONTYPE nVersion; /**< Version */ - OMX_U32 nPortIndex; /**< Port Index */ - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U16 nColorTemperature; /**< White Balance Color Temperature in Kelvins */ - OMX_U16 nGainR; /**< Bayer applied R color channel gain in (U13Q9) */ - OMX_U16 nGainGR; /**< Bayer applied Gr color channel gain in (U13Q9) */ - OMX_U16 nGainGB; /**< Bayer applied Gb color channel gain in (U13Q9) */ - OMX_U16 nGainB; /**< Bayer applied B color channel gain in (U13Q9) */ - OMX_S16 nOffsetR; /**< Bayer applied R color channel offset */ - OMX_S16 nOffsetGR; /**< Bayer applied Gr color channel offset */ - OMX_S16 nOffsetGB; /**< Bayer applied Gb color channel offset */ - OMX_S16 nOffsetB; /**< Bayer applied B color channel offset */ -} OMX_TI_WHITEBALANCERESULTTYPE; - -/** - * Unsaturated Regions data - * The extra data having unsaturated regions data is - * described with the following structure.. - */ -typedef struct OMX_TI_UNSATURATEDREGIONSTYPE { - OMX_U32 nSize; /**< Size */ - OMX_VERSIONTYPE nVersion; /**< Version */ - OMX_U32 nPortIndex; /**< Port Index */ - OMX_U16 nPaxelsX; /**< The number of paxels in the horizontal direction */ - OMX_U16 nPaxelsY; /**< The number of paxels in the vertical direction */ - OMX_U16 data[1]; /**< the first value of an array of values that represent */ -} OMX_TI_UNSATURATEDREGIONSTYPE; - -/** - * OMX_BARCODETYPE - */ -typedef enum OMX_BARCODETYPE{ - OMX_BARCODE1D = 0, /**< 1D barcode */ - OMX_BARCODE2D, /**< 2D barcode */ -}OMX_BARCODETYPE; -/** - * Brcode detection data - * nLeft is the leftmost coordinate of the detected area rectangle. - * nTop is the topmost coordinate of the detected area rectangle. - * nWidth is the width of the detected area rectangle in pixels. - * nHeight is the height of the detected area rectangle in pixels. - * nOrientation is the orientation of the axis of the detected object. This refers to the angle between the vertical axis of barcode and the horizontal axis. - * eBarcodetype is an enumeration specifying the barcode type, as listed in the given table. - */ -typedef struct OMX_BARCODEDETECTIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; - OMX_S32 nOrientation; - OMX_BARCODETYPE eBarcodetype; - } OMX_BARCODEDETECTIONTYPE; - -/** - * Front object detection data - * nLeft is the leftmost coordinate of the detected area rectangle. - * nTop is the topmost coordinate of the detected area rectangle. - * nWidth is the width of the detected area rectangle in pixels. - * nHeight is the height of the detected area rectangle in pixels. - */ -typedef struct OMX_FRONTOBJDETECTIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; -} OMX_FRONTOBJDETECTIONTYPE; - -/** - * Distance estimation data - * nDistance is the estimated distance to the object in millimeters. - * nLargestDiscrepancy is the estimated largest discrepancy of the distance to the object in millimeters. When equal to MAX_INT the discrepancy is unknown. - */ -typedef struct OMX_DISTANCEESTIMATIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nDistance; - OMX_U32 nLargestDiscrepancy; -} OMX_DISTANCEESTIMATIONTYPE; - -/** - * Distance estimation data - * nDistance is the estimated distance to the object in millimeters. - * nLargestDiscrepancy is the estimated largest discrepancy of the distance to the object in millimeters. When equal to MAX_INT the discrepancy is unknown. - */ - -typedef struct OMX_MOTIONESTIMATIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_S32 nPanX; - OMX_S32 nPanY; -} OMX_MOTIONESTIMATIONTYPE; - - -/** - * Focus region data - * nRefPortIndex is the port the image frame size is defined on. This image frame size is used as reference for the focus region rectangle. - * nLeft is the leftmost coordinate of the focus region rectangle. - * nTop is the topmost coordinate of the focus region rectangle. - * nWidth is the width of the focus region rectangle in pixels. - * nHeight is the height of the focus region rectangle in pixels. - * - */ -typedef struct OMX_FOCUSREGIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nRefPortIndex; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; -} OMX_FOCUSREGIONTYPE; - -/** - * OMX_ISOSETTINGTYPE: specifies its auto or manual setting - * - */ -typedef enum OMX_ISOSETTINGTYPE{ - OMX_Auto = 0, /**< */ - OMX_IsoManual /**< */ -}OMX_ISOSETTINGTYPE; - -/** - * nSize is the size of the structure including the length of data field containing - * the histogram data. - * eISOMode: - * specifies the ISO seetting mode - auto/manual - * nISOSetting: - * for manual mode client can specify the ISO setting. - */ - -typedef struct OMX_CONFIG_ISOSETTINGTYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_ISOSETTINGTYPE eISOMode; - OMX_U32 nISOSetting; -}OMX_CONFIG_ISOSETTINGTYPE; - -/** - * custom RAW format - */ -typedef struct OMX_CONFIG_RAWFORMATTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VERSIONTYPE nFormatVersion; - OMX_STRING cVendorName; -} OMX_CONFIG_RAWFORMATTYPE; - -/** - * Sensor type - */ -typedef struct OMX_CONFIG_SENSORTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VERSIONTYPE nSensorVersion; - OMX_STRING cModelName; -} OMX_CONFIG_SENSORTYPE; - -/** - * Sensor custom data type - */ -typedef struct OMX_CONFIG_SENSORCUSTOMDATATYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nDataLength; - OMX_U8 xSensorData[1]; -} OMX_CONFIG_SENSORCUSTOMDATATYPE; - -/** - * OMX_OBJDETECTQUALITY - * - */ -typedef enum OMX_OBJDETECTQUALITY{ - OMX_FastDetection = 0, /**< A detection that prioritizes speed*/ - OMX_Default, /**< The default detection, should be used when no control of the detection quality is given.*/ - OMX_BetterDetection, /**< A detection that levels correct detection with speed*/ - OMX_BestDtection, /**< A detection that prioritizes correct detection*/ - OMX_AUTODETECTION /**< Automatically decide which object detection quality is best.*/ -}OMX_OBJDETECTQUALITY; - -/** - * OBJECT DETECTION Type - * nPortIndex: is an output port. The port index decides on which port the extra data structur of detected object is sent on. - * bEnable : this controls ON/OFF for this object detection algirithm. - * bFrameLimited: is a Boolean used to indicate if detection shall be terminated after the specified number of frames if - * true frame limited detection is enabled; otherwise the port does not terminate detection until instructed to do so by the client. - * nFrameLimit: is the limit on number of frames detection is executed for, this parameter is only valid if bFrameLimited is enabled. - * nMaxNbrObjects: specifies the maximum number of objects that should be found in each frame. It is implementation dependent which objects are found. - * nLeft: is the leftmost coordinate of the detection area rectangle. - * nTop: is the topmost coordinate of the detection area rectangle. - * nWidth: is the width of the detection area rectangle in pixels. - * nHeight: is the height of the detection area rectangle in pixels. - * eObjDetectQuality: is an enumeration specifying the quality desired by the detection. - * nPriority: represents priority of each object when there are multiple objects detected. - */ - -typedef struct OMX_CONFIG_OBJDETECTIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; - OMX_BOOL bFrameLimited; - OMX_U32 nFrameLimit; - OMX_U32 nMaxNbrObjects; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; - OMX_OBJDETECTQUALITY eObjDetectQuality; - OMX_U32 nPriority; - OMX_U32 nDeviceOrientation; - } OMX_CONFIG_OBJDETECTIONTYPE; - - -/** - * OMX_OBJDETECTQUALITY - * - */ -typedef enum OMX_DISTTYPE{ - OMX_DistanceControlFocus = 0, /**< focus objects distance type*/ - OMX_DISTANCECONTROL_RECT /**< Evaluated distance to the object found in the rectangelar area indicated as input region. */ -}OMX_DISTTYPE; - - -/** - * Distance mesurement - * bStarted is a Boolean. The IL client sets it to true to start the measurement . - * the IL client sets to false to stop the measurement. The IL client can query it to check if the measurement is ongoing. - * nLeft : is the leftmost coordinate of the rectangle. - * nTop : is the topmost coordinate of the rectangle. - * nWidth: is the width of the rectangle in pixels. - * nHeight: is the height of the rectangle in pixels. - * eDistType: is an enumeration specifying the distance measurement type, as shown in - */ -typedef struct OMX_CONFIG_DISTANCETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bStarted; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; - OMX_DISTTYPE eDistType; -} OMX_CONFIG_DISTANCETYPE; - - -/** - * face detect data - face attribute - * nARGBEyeColor: is the indicates a 32-bit eye color of the person, where bits 0-7 are blue, - * bits 15-8 are green, bits 24-16 are red, and bits 31-24 are for alpha. - * nARGBSkinColor: is the indicates a 32-bit skin color of the person, where bits 0-7 are blue, - * bits 15-8 are green, bits 24-16 are red, and bits 31-24 are for alpha. - * nARGBHairColor: is the indicates a 32-bit hair color of the person, where bits 0-7 are blue, - * bits 15-8 are green, bits 24-16 are red, and bits 31-24 are for alpha. - * nSmileScore: a smile detection score between 0 and 100, where 0 means not detecting, - * 1 means least certain and 100 means most certain a smile is detected. - * nBlinkScore: a eye-blink detection score between 0 and 100, where 0 means not detecting, - * 1 means least certain and 100 means most certain an eye-blink is detected. - * xIdentity: represents the identity of the face. With identity equal to zero this is not supported. - * This can be used by a face recognition application. The component shall not reuse an identity value unless the same face. - * Can be used to track detected faces when it moves between frames. Specific usage of this field is implementation dependent. - * It can be some kind of ID. - * - */ -typedef struct OMX_FACEATTRIBUTE { - OMX_U32 nARGBEyeColor; - OMX_U32 nARGBSkinColor; - OMX_U32 nARGBHairColor; - OMX_U32 nSmileScore; - OMX_U32 nBlinkScore; - OMX_U32 xIdentity[4]; -} OMX_FACEATTRIBUTE; - -/** - * xGamma represents lool-up table for gamma correction in Q16 format. - * All values assume that maximum value is 255. If internal implementation uses higher dynamic range, this value should be adjusted internally. - * - * - * - * STRUCT MEMBERS: - * nScore: is a detection score between 0 and 100, where 0 means unknown score, 1 means least certain and 100 means most certain the detection is correct. - * nLeft: is the leftmost coordinate of the detected area rectangle. - * nTop: is the topmost coordinate of the detected area rectangle. - * nWidth: is the width of the detected area rectangle in pixels. - * nHeight: is the height of the detected area rectangle in pixels. - * nOrientationRoll/Yaw/Pitch is the orientation of the axis of the detected object. Here roll angle is defined as the angle between the vertical axis of face and the horizontal axis. All angles can have the value of -180 to 180 degree in Q16 format. Some face detection algorithm may not be able to fill in the angles, this is denoted by the use of MAX_INT value. - * nPriority represents priority of each object when there are multiple objects detected. - * nFaceAttr describe the attributes of the detected face object with the following structure: - * - * - */ -typedef struct OMX_TI_FACERESULT { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nScore; - OMX_S32 nLeft; - OMX_S32 nTop; -OMX_U32 nWidth; -OMX_U32 nHeight; -OMX_S32 nOrientationRoll; -OMX_S32 nOrientationYaw; -OMX_S32 nOrientationPitch; -OMX_U32 nPriority; -OMX_FACEATTRIBUTE nFaceAttr; -} OMX_TI_FACERESULT; - - -/** - * Face detection data - * The extra data having face detection data is described with the following structure. - * The parser should only assume that the first tFacePosition[ulFaceCount] of the 35 elements - * of the array should contain valid data. - */ -typedef struct OMX_FACEDETECTIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U16 ulFaceCount; - OMX_TI_FACERESULT tFacePosition[35];// 35 is max faces supported by FDIF -} OMX_FACEDETECTIONTYPE; - -/** - * MTIS Vendor Specific Motion estimation - * The extra data having MTIS motion estimation data is - * described with the following structure. - */ -typedef struct OMX_TI_MTISTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_S32 nMaxMVh; /**< The maximum MV for horizontal direction */ - OMX_S32 nMaxMVv; /**< The maximum MV for vertical direction */ - OMX_U16 nMVRelY[9]; /**< The mask for MV reliability */ - OMX_U16 nMVRelX[9]; /**< The mask for MV reliability */ - OMX_S32 nMVh[9]; /**< The MVs for horizontal direction */ - OMX_S32 nMVv[9]; /**< The MVs for vertical direction */ -} OMX_TI_MTISTYPE; - -/** - * The OMX_EXTRADATATYPE enumeration is used to define the - * possible extra data payload types. - */ -typedef enum OMX_EXT_EXTRADATATYPE -{ - OMX_ExifAttributes = 0x7F000001, /**< Reserved region for introducing Vendor Extensions */ - OMX_AncillaryData, /**< 0x7F000002 ancillary data */ - OMX_WhiteBalance, /**< 0x7F000003 white balance resultant data */ - OMX_UnsaturatedRegions, /**< 0x7F000004 unsaturated regions data */ - OMX_FaceDetection, /**< face detect data */ - OMX_BarcodeDetection, /**< bar-code detct data */ - OMX_FrontObjectDetection, /**< Front object detection data */ - OMX_MotionEstimation, /**< motion Estimation data */ - OMX_TI_MTISType, /**< 0x7F000009 MTIS motion Estimation data */ - OMX_DistanceEstimation, /**< disctance estimation */ - OMX_Histogram, /**< histogram */ - OMX_FocusRegion, /**< focus region data */ - OMX_ExtraDataPanAndScan, /**< 0x7F00000D pan and scan data */ - OMX_RawFormat, /**< custom RAW data format */ - OMX_SensorType, /**< vendor & model of the sensor being used */ - OMX_SensorCustomDataLength, /**< vendor specific custom data length */ - OMX_SensorCustomData, /**< vendor specific data */ - OMX_TI_FrameLayout, /**< 0x7F000012 vendor specific data */ - OMX_TI_SEIinfo2004Frame1, /**< 0x7F000013 Used for 2004 SEI message to be provided by video decoders */ - OMX_TI_SEIinfo2004Frame2, /**< 0x7F000014 Used for 2004 SEI message to be provided by video decoders */ - OMX_TI_SEIinfo2010Frame1, /**< 0x7F000015 Used for 2010 SEI message to be provided by video decoders */ - OMX_TI_SEIinfo2010Frame2, /**< 0x7F000016 Used for 2010 SEI message to be provided by video decoders */ - OMX_TI_RangeMappingInfo, /**< 0x7F000017 Used for Range mapping info provided by Video Decoders */ - OMX_TI_RescalingInfo, /**< 0x7F000018 Used for width/height rescaling info provided by Video Decoders */ - OMX_TI_WhiteBalanceOverWrite, /**< 0x7F000019 Used for manual AWB settings */ - OMX_TI_ExtraData_Count, - OMX_TI_ExtraData_Max = OMX_TI_ExtraData_Count - 1, -} OMX_EXT_EXTRADATATYPE; - - -/** - * Enable Extra-data on a specific port. - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port on which this extra data to be assosiated - * eExtraDataType : Extra data type - * bEnable : Eneble/Disable this extra-data through port. - * - */ -typedef struct OMX_CONFIG_EXTRADATATYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_EXT_EXTRADATATYPE eExtraDataType; - OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_BOOL bEnable; -} OMX_CONFIG_EXTRADATATYPE; - -/** - * JPEG header type - * */ - -typedef enum OMX_JPEGHEADERTYPE{ - OMX_NoHeader = 0, - OMX_JFIF, - OMX_EXIF -}OMX_JPEGHEADERTYPE; -/** - * Re-start marker configuration - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port on which this extra data to be assosiated - * eJpegHeaderType : JPEG header type EXIF, JFIF, or No heeader. - */ - -typedef struct OMX_CONFIG_JPEGHEEADERTYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_JPEGHEADERTYPE eJpegHeaderType; -}OMX_CONFIG_JPEGHEEADERTYPE; - -/** - * Re-start marker configuration - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port on which this extra data to be assosiated - * nRstInterval : interval at which RST markers are to be inserted. - * bEnable : Eneble/Disable this RST marker insertion feature. - * - */ - -typedef struct OMX_CONFIG_RSTMARKER{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nRstInterval; - OMX_BOOL nEnable; -}OMX_CONFIG_RSTMARKER; - -/** - * Enable Extra-data on a specific port. - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nMaxSize : max size - * - * - */ -typedef struct OMX_IMAGE_JPEGMAXSIZE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nMaxSize; -} OMX_IMAGE_JPEGMAXSIZE; - - -typedef enum OMX_IMAGESTAMPOPERATION{ - OMX_NewImageStamp = 0, - OMX_Continuation -}OMX_IMAGESTAMPOPERATION; - - -/** - * Enable Extra-data on a specific port. - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nMaxSize : max size - * - * - */ -typedef struct OMX_PARAM_IMAGESTAMPOVERLAYTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_IMAGESTAMPOPERATION nOp; - OMX_U32 nLeft; - OMX_U32 nTop; - OMX_U32 nHeight; - OMX_U32 nWidth; - OMX_COLOR_FORMATTYPE eFormat; - OMX_U8 * pBitMap; -} OMX_PARAM_IMAGESTAMPOVERLAYTYPE; - - -/** - * Enable Extra-data on a specific port. - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nMaxSize : max size - * - * - */ -typedef struct OMX_PARAM_THUMBNAILTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nHeight; - OMX_U32 nWidth; - OMX_IMAGE_CODINGTYPE eCompressionFormat; - OMX_COLOR_FORMATTYPE eColorFormat; - OMX_U32 nQuality; - OMX_U32 nMaxSize; -} OMX_PARAM_THUMBNAILTYPE; - -/** - * Red-Eye Removal Enum - */ -typedef enum OMX_REDEYEREMOVALTYPE{ - OMX_RedEyeRemovalOff = 0, /** No red eye removal*/ - OMX_RedEyeRemovalOn, /** Red eye removal on*/ - OMX_RedEyeRemovalAuto, /** Red eye removal will be done automatically when detected*/ - OMX_RedEyeRemovalKhronosExtensions = 0x6F000000, /** Reserved region for introducing Khronos Standard Extensions*/ - OMX_RedEyeRemovalVendorStartUnused = 0x7F000000, /** Reserved region for introducing Vendor Extensions*/ - OMX_RedEyeRemovalMax = 0x7FFFFFFF -}OMX_REDEYEREMOVALTYPE; - -/** - * Enable Extra-data on a specific port. - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nLeft: is the leftmost coordinate of the detection area rectangle (such as face region). - * nTop: is the topmost coordinate of the detection area rectangle (such as face region). - * nWidth: is the width of the detection area rectangle in pixels. - * nHeight: is the height of the detection area rectangle in pixels. - * nARGBEyeColor indicates a 32-bit eye color to replace the red-eye, where bits 0-7 are blue, bits 15-8 are green, bits 24-16 are red, and bits 31-24 are for alpha. When all zero indicates automatic choice. - - * - */ -typedef struct OMX_CONFIG_REDEYEREMOVALTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; - OMX_U32 nARGBEyeColor; - OMX_REDEYEREMOVALTYPE eMode; -} OMX_CONFIG_REDEYEREMOVALTYPE; - - - - - - -/** - * Video capture YUV Range Enum - */ -typedef enum OMX_VIDEOYUVRANGETYPE{ - OMX_ITURBT601 = 0, - OMX_Full8Bit, - OMX_VideoYUVRangeKhronosExtensions = 0x6F000000, /** Reserved region for introducing Khronos Standard Extensions*/ - OMX_VideoYUVRangeVendorStartUnused = 0x7F000000, /** Reserved region for introducing Vendor Extensions*/ - OMX_VideoYUVRangeMax = 0x7FFFFFFF -}OMX_VIDEOYUVRANGETYPE; - -/** - * Enable Extra-data on a specific port. - * - * - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * - */ -typedef struct OMX_PARAM_VIDEOYUVRANGETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEOYUVRANGETYPE eYUVRange; -} OMX_PARAM_VIDEOYUVRANGETYPE; - -/** - * Video noise filter mode range enum - */ -typedef enum OMX_VIDEONOISEFILTERMODETYPE{ - OMX_VideoNoiseFilterModeOff = 0, - OMX_VideoNoiseFilterModeOn, - OMX_VideoNoiseFilterModeAuto, - OMX_VideoNoiseFilterModeExtensions = 0x6F000000, /** Reserved region for introducing Khronos Standard Extensions */ - OMX_VideoNoiseFilterModeStartUnused = 0x7F000000, /** Reserved region for introducing Vendor Extensions */ - OMX_VideoNoiseFilterModeMax = 0x7FFFFFFF -} OMX_VIDEONOISEFILTERMODETYPE; - -/** - * Enable video noise filter. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eMode : Video noise filter mode (on/off/auto) - */ -typedef struct OMX_PARAM_VIDEONOISEFILTERTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEONOISEFILTERMODETYPE eMode; -} OMX_PARAM_VIDEONOISEFILTERTYPE; - - -/** - * High ISO Noise filter mode range enum - */ -typedef enum OMX_ISONOISEFILTERMODETYPE{ - OMX_ISONoiseFilterModeOff = 0, - OMX_ISONoiseFilterModeOn, - OMX_ISONoiseFilterModeAuto, - OMX_ISONoiseFilterModeExtensions = 0x6F000000, /** Reserved region for introducing Khronos Standard Extensions */ - OMX_ISONoiseFilterModeStartUnused = 0x7F000000, /** Reserved region for introducing Vendor Extensions */ - OMX_ISONoiseFilterModeMax = 0x7FFFFFFF -} OMX_ISONOISEFILTERMODETYPE; - -/** - * Enable ISO noise filter. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eMode : ISO noise filter (NSF2 is used) mode (on/off/auto) - */ -typedef struct OMX_PARAM_ISONOISEFILTERTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_ISONOISEFILTERMODETYPE eMode; -} OMX_PARAM_ISONOISEFILTERTYPE; - -/** - * Structure used to to call OMX_GetParams() for each - * increment of "Index" starting with "0" - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nIndex : Index of the sDCCURI 0..MAX_URI_LENGTH - * sDCCURI : Look-up table containing strings. Ends with '\0' - */ -typedef struct OMX_TI_PARAM_DCCURIINFO { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nIndex; - OMX_S8 sDCCURI[MAX_URI_LENGTH]; -} OMX_TI_PARAM_DCCURIINFO; - -/** - * Structure used to configure DCC buffer - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nDCCURIBuffSize : Size of the pDCCURIBuff in bytes - * pDCCURIBuff : Pointer to a buffer - */ -typedef struct OMX_TI_PARAM_DCCURIBUFFER { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nDCCURIBuffSize; - OMX_U8 *pDCCURIBuff; -} OMX_TI_PARAM_DCCURIBUFFER; - -/** - * Manual White Balance color temperature - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nColorTemperature : Color Temperature in K - */ -typedef struct OMX_TI_CONFIG_WHITEBALANCECOLORTEMPTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nColorTemperature; -} OMX_TI_CONFIG_WHITEBALANCECOLORTEMPTYPE; - -/** - * Focus spot weighting range enum - */ -typedef enum OMX_TI_CONFIG_FOCUSSPOTMODETYPE { - OMX_FocusSpotDefault = 0, /** Makes CommonFocusRegion to be used. */ - OMX_FocusSpotSinglecenter, - OMX_FocusSpotMultiNormal, - OMX_FocusSpotMultiAverage, - OMX_FocusSpotMultiCenter, - OMX_FocusSpotExtensions = 0x6F000000, /** Reserved region for introducing Khronos Standard Extensions */ - OMX_FocusSpotModeStartUnused = 0x7F000000, /** Reserved region for introducing Vendor Extensions */ - OMX_FocusSpotModeMax = 0x7FFFFFFF -} OMX_TI_CONFIG_FOCUSSPOTMODETYPE; - -/** - * Focus Spot Weighting configuration. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eMode : Spot Weighting mode - */ -typedef struct OMX_TI_CONFIG_FOCUSSPOTWEIGHTINGTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_CONFIG_FOCUSSPOTMODETYPE eMode; -} OMX_TI_CONFIG_FOCUSSPOTWEIGHTINGTYPE; - -/** - * Enumeration of possible Exposure control types for OMX_EXPOSURECONTROLTYPE - */ -typedef enum OMX_TI_EXTEXPOSURECONTROLTYPE { - OMX_TI_ExposureControlVeryLong = OMX_ExposureControlVendorStartUnused + 1 -} OMX_TI_EXTEXPOSURECONTROLTYPE; - -/** - * Variable frame rate configuration. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * xMinFramerate : Minimum variable frame rate value - */ -typedef struct OMX_TI_PARAM_VARFRAMERATETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 xMinFramerate; -} OMX_TI_PARAM_VARFRAMERATETYPE; - -/** - * Exposure config for right frame - */ -typedef struct OMX_TI_CONFIG_EXPOSUREVALUERIGHTTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nApertureFNumber; /**< e.g. nApertureFNumber = 2 implies "f/2" - Q16 format */ - OMX_U32 nShutterSpeedMsec; /**< Shutterspeed in milliseconds */ - OMX_U32 nSensitivity; /**< e.g. nSensitivity = 100 implies "ISO 100" */ -} OMX_TI_CONFIG_EXPOSUREVALUERIGHTTYPE; - -/** - * Auto Convergence mode enum - */ -typedef enum OMX_TI_AUTOCONVERGENCEMODETYPE { - OMX_TI_AutoConvergenceModeDisable, - OMX_TI_AutoConvergenceModeFrame, - OMX_TI_AutoConvergenceModeCenter, - OMX_TI_AutoConvergenceModeFocusFaceTouch, - OMX_TI_AutoConvergenceModeManual, - OMX_TI_AutoConvergenceExtensions = 0x6F000000, /** Reserved region for introducing Khronos Standard Extensions */ - OMX_TI_AutoConvergenceStartUnused = 0x7F000000, /** Reserved region for introducing Vendor Extensions */ - OMX_TI_AutoConvergenceModeMax = 0x7FFFFFFF -} OMX_TI_AUTOCONVERGENCEMODETYPE; - -/** - * Variable farame rate configuration. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eACMode : Auto convergence mode - * nManualConverence : Manual Converence value - * nACProcWinStartX : Start X AC Window - * nACProcWinStartY : Start Y AC Window - * nACProcWinWidth : Width of AC Window - * nACProcWinHeight : Height of AC Window - * bACStatus : output status from AL alg - */ -typedef struct OMX_TI_CONFIG_CONVERGENCETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_AUTOCONVERGENCEMODETYPE eACMode; - OMX_S32 nManualConverence; - OMX_U32 nACProcWinStartX; - OMX_U32 nACProcWinStartY; - OMX_U32 nACProcWinWidth; - OMX_U32 nACProcWinHeight; - OMX_BOOL bACStatus; -} OMX_TI_CONFIG_CONVERGENCETYPE; - -/** - * Camera specific version. - * - * STRUCT MEMBERS: - * nBranch : Branch - * nCommitID : Commit ID - * nBuildDateTime : Build date and time - * nExtraInfo : rederved for future use - */ -typedef struct OMX_TI_CAMERASPECVERSIONTYPE { - OMX_U8 nBranch[64]; - OMX_U8 nCommitID[64]; - OMX_U8 nBuildDateTime[64]; - OMX_U8 nExtraInfo[64]; -} OMX_TI_CAMERASPECVERSIONTYPE; - -/** - * Stereo frame layout enum - */ -typedef enum OMX_TI_STEREOFRAMELAYOUTTYPE { - OMX_TI_StereoFrameLayout2D, - OMX_TI_StereoFrameLayoutTopBottom, - OMX_TI_StereoFrameLayoutLeftRight, - OMX_TI_StereoFrameLayoutMax = 0x7FFFFFFF -} OMX_TI_STEREOFRAMELAYOUTTYPE; - -/** - * Camera frame layout type. - * - * STRUCT MEMBERS: - * eFrameLayout : frame layout - * nSubsampleRatio : subsample ratio - */ -typedef struct OMX_TI_FRAMELAYOUTTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_STEREOFRAMELAYOUTTYPE eFrameLayout; - OMX_U32 nSubsampleRatio; /** Subsampling ratio, Q15.7 */ -} OMX_TI_FRAMELAYOUTTYPE; - -/** - * The OMX_TI_COLOR_FORMATTYPE enumeration is used to define the - * extended color format types. - */ -typedef enum OMX_TI_COLOR_FORMATTYPE { - OMX_TI_COLOR_FormatYUV420PackedSemiPlanarInterlaced = - (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 1, - OMX_TI_COLOR_FormatRawBayer10bitStereo = - OMX_COLOR_FormatVendorStartUnused + 2, /**< 10 bit raw for stereo */ -/* OMX_TI_COLOR_FormatYUV420PackedSemiPlanar = - (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 0x100, *//* 0x100 is used since it is the corresponding HAL pixel fromat */ -/* OMX_COLOR_FormatAndroidOpaque = - (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 0x789 *//**< Platform specified opaque format set to unique value 0x789*/ -} OMX_TI_COLOR_FORMATTYPE; - -/** - * The OMX_TI_EXIFTAGSTATUS enumeration is used to define the - * tag status types. - */ -typedef enum OMX_TI_EXIFTAGSTATUS { - OMX_TI_TagReadOnly, /**< implies this tag is generated within omx-camera >*/ - OMX_TI_TagReadWrite, /**< implies this tag can be overwritten by client >*/ - OMX_TI_TagUpdated, /**< client has to use this to indicate the specific tag is overwritten >*/ - OMX_TI_ExifStatus_Max = 0x7fffffff -} OMX_TI_EXIFTAGSTATUS; - -typedef struct OMX_TI_CONFIG_EXIF_TAGS { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_EXIFTAGSTATUS eStatusImageWidth; - OMX_U32 ulImageWidth; - OMX_TI_EXIFTAGSTATUS eStatusImageHeight; - OMX_U32 ulImageHeight; - OMX_TI_EXIFTAGSTATUS eStatusBitsPerSample; - OMX_U16 usBitsPerSample[3]; - OMX_TI_EXIFTAGSTATUS eStatusCompression; - OMX_U16 usCompression; - OMX_TI_EXIFTAGSTATUS eStatusPhotometricInterpretation; - OMX_U16 usPhotometricInterpretation; - OMX_TI_EXIFTAGSTATUS eStatusOrientation; - OMX_U16 usOrientation; - OMX_TI_EXIFTAGSTATUS eStatusSamplesPerPixel; - OMX_U16 usSamplesPerPixel; - OMX_TI_EXIFTAGSTATUS eStatusPlanarConfiguration; - OMX_U16 usPlanarConfiguration; - OMX_TI_EXIFTAGSTATUS eStatusYCbCrSubSampling; - OMX_U16 usYCbCrSubSampling[2]; - OMX_TI_EXIFTAGSTATUS eStatusYCbCrPositioning; - OMX_U16 usYCbCrPositioning; - OMX_TI_EXIFTAGSTATUS eStatusXResolution; - OMX_U32 ulXResolution[2]; - OMX_TI_EXIFTAGSTATUS eStatusYResolution; - OMX_U32 ulYResolution[2]; - OMX_TI_EXIFTAGSTATUS eStatusResolutionUnit; - OMX_U16 usResolutionUnit; - - OMX_TI_EXIFTAGSTATUS eStatusRowsPerStrip; - OMX_U32 ulRowsPerStrip; - OMX_TI_EXIFTAGSTATUS eStatusDataSize; - OMX_U32 ulDataSize; - - OMX_TI_EXIFTAGSTATUS eStatusTransferFunction; - OMX_U16 usTransferFunction[3*256]; - OMX_TI_EXIFTAGSTATUS eStatusWhitePoint; - OMX_U32 ulWhitePoint[4]; //2x2 - OMX_TI_EXIFTAGSTATUS eStatusPrimaryChromaticities; - OMX_U32 ulPrimaryChromaticities[12]; //2x6 - OMX_TI_EXIFTAGSTATUS eStatusYCbCrCoefficients; - OMX_U32 ulYCbCrCoefficients[6]; //2x3 - OMX_TI_EXIFTAGSTATUS eStatusReferenceBlackWhite; - OMX_U32 ulReferenceBlackWhite[12]; //2x6 - OMX_TI_EXIFTAGSTATUS eStatusDateTime; - OMX_S8* pDateTimeBuff; - OMX_U32 ulDateTimeBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusImageDescription; - OMX_S8* pImageDescriptionBuff; - OMX_U32 ulImageDescriptionBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusMake; - OMX_S8* pMakeBuff; - OMX_U32 ulMakeBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusModel; - OMX_S8* pModelBuff; - OMX_U32 ulModelBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusSoftware; - OMX_S8* pSoftwareBuff; - OMX_U32 ulSoftwareBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusArtist; - OMX_S8* pArtistBuff; - OMX_U32 ulArtistBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusCopyright; - OMX_S8* pCopyrightBuff; - OMX_U32 ulCopyrightBuffSizeBytes; - - OMX_TI_EXIFTAGSTATUS eStatusExifVersion; - OMX_S8 cExifVersion[4]; - OMX_TI_EXIFTAGSTATUS eStatusFlashpixVersion; - OMX_S8 cFlashpixVersion[4]; - OMX_TI_EXIFTAGSTATUS eStatusColorSpace; - OMX_U16 usColorSpace; - OMX_TI_EXIFTAGSTATUS eStatusComponentsConfiguration; - OMX_S8 cComponentsConfiguration[4]; - OMX_TI_EXIFTAGSTATUS eStatusCompressedBitsPerPixel; - OMX_U32 ulCompressedBitsPerPixel[2]; - OMX_TI_EXIFTAGSTATUS eStatusPixelXDimension; - OMX_U32 ulPixelXDimension; - OMX_TI_EXIFTAGSTATUS eStatusPixelYDimension; - OMX_U32 ulPixelYDimension; - OMX_TI_EXIFTAGSTATUS eStatusMakerNote; - OMX_S8* pMakerNoteBuff; - OMX_U32 ulMakerNoteBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusUserComment; - OMX_S8* pUserCommentBuff; - OMX_U32 ulUserCommentBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusRelatedSoundFile; - OMX_S8 cRelatedSoundFile[13]; - OMX_TI_EXIFTAGSTATUS eStatusDateTimeOriginal; - OMX_S8* pDateTimeOriginalBuff; - OMX_U32 ulDateTimeOriginalBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusDateTimeDigitized; - OMX_S8* pDateTimeDigitizedBuff; - OMX_U32 ulDateTimeDigitizedBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusSubSecTime; - OMX_S8* pSubSecTimeBuff; - OMX_U32 ulSubSecTimeBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusSubSecTimeOriginal; - OMX_S8* pSubSecTimeOriginalBuff; - OMX_U32 ulSubSecTimeOriginalBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusSubSecTimeDigitized; - OMX_S8* pSubSecTimeDigitizedBuff; - OMX_U32 ulSubSecTimeDigitizedBuffSizeBytes; - - OMX_TI_EXIFTAGSTATUS eStatusExposureTime; - OMX_U32 ulExposureTime[2]; - OMX_TI_EXIFTAGSTATUS eStatusFNumber; - OMX_U32 ulFNumber[2]; - OMX_TI_EXIFTAGSTATUS eStatusExposureProgram; - OMX_U16 usExposureProgram; - OMX_TI_EXIFTAGSTATUS eStatusSpectralSensitivity; - OMX_S8* pSpectralSensitivityBuff; - OMX_U32 ulSpectralSensitivityBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusISOCount; - OMX_U16 usISOCount; - OMX_TI_EXIFTAGSTATUS eStatusISOSpeedRatings; - OMX_U16* pISOSpeedRatings; - OMX_TI_EXIFTAGSTATUS eStatusOECF; - OMX_S8* pOECFBuff; - OMX_U32 ulOECFBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusShutterSpeedValue; - OMX_S32 slShutterSpeedValue[2]; - OMX_TI_EXIFTAGSTATUS eStatusApertureValue; - OMX_U32 ulApertureValue[2]; - OMX_TI_EXIFTAGSTATUS eStatusBrightnessValue; - OMX_S32 slBrightnessValue[2]; - OMX_TI_EXIFTAGSTATUS eStatusExposureBiasValue; - OMX_S32 slExposureBiasValue[2]; - OMX_TI_EXIFTAGSTATUS eStatusMaxApertureValue; - OMX_U32 ulMaxApertureValue[2]; - OMX_TI_EXIFTAGSTATUS eStatusSubjectDistance; - OMX_U32 ulSubjectDistance[2]; - OMX_TI_EXIFTAGSTATUS eStatusMeteringMode; - OMX_U16 usMeteringMode; - OMX_TI_EXIFTAGSTATUS eStatusLightSource; - OMX_U16 usLightSource; - OMX_TI_EXIFTAGSTATUS eStatusFlash; - OMX_U16 usFlash; - OMX_TI_EXIFTAGSTATUS eStatusFocalLength; - OMX_U32 ulFocalLength[2]; - OMX_TI_EXIFTAGSTATUS eStatusSubjectArea; - OMX_U16 usSubjectArea[4]; - OMX_TI_EXIFTAGSTATUS eStatusFlashEnergy; - OMX_U32 ulFlashEnergy[2]; - OMX_TI_EXIFTAGSTATUS eStatusSpatialFrequencyResponse; - OMX_S8* pSpatialFrequencyResponseBuff; - OMX_U32 ulSpatialFrequencyResponseBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusFocalPlaneXResolution; - OMX_U32 ulFocalPlaneXResolution[2]; - OMX_TI_EXIFTAGSTATUS eStatusFocalPlaneYResolution; - OMX_U32 ulFocalPlaneYResolution[2]; - OMX_TI_EXIFTAGSTATUS eStatusFocalPlaneResolutionUnit; - OMX_U16 usFocalPlaneResolutionUnit; - OMX_TI_EXIFTAGSTATUS eStatusSubjectLocation; - OMX_U16 usSubjectLocation[2]; - OMX_TI_EXIFTAGSTATUS eStatusExposureIndex; - OMX_U32 ulExposureIndex[2]; - OMX_TI_EXIFTAGSTATUS eStatusSensingMethod; - OMX_U16 usSensingMethod; - OMX_TI_EXIFTAGSTATUS eStatusFileSource; - OMX_S8 cFileSource; - OMX_TI_EXIFTAGSTATUS eStatusSceneType; - OMX_S8 cSceneType; - OMX_TI_EXIFTAGSTATUS eStatusCFAPattern; - OMX_S8* pCFAPatternBuff; - OMX_U32 ulCFAPatternBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusCustomRendered; - OMX_U16 usCustomRendered; - OMX_TI_EXIFTAGSTATUS eStatusExposureMode; - OMX_U16 usExposureMode; - OMX_TI_EXIFTAGSTATUS eStatusWhiteBalance; - OMX_U16 usWhiteBalance; - OMX_TI_EXIFTAGSTATUS eStatusDigitalZoomRatio; - OMX_U32 ulDigitalZoomRatio[2]; - OMX_TI_EXIFTAGSTATUS eStatusFocalLengthIn35mmFilm; - OMX_U16 usFocalLengthIn35mmFilm; - OMX_TI_EXIFTAGSTATUS eStatusSceneCaptureType; - OMX_U16 usSceneCaptureType; - OMX_TI_EXIFTAGSTATUS eStatusGainControl; - OMX_U16 usGainControl; - OMX_TI_EXIFTAGSTATUS eStatusContrast; - OMX_U16 usContrast; - OMX_TI_EXIFTAGSTATUS eStatusSaturation; - OMX_U16 usSaturation; - OMX_TI_EXIFTAGSTATUS eStatusSharpness; - OMX_U16 usSharpness; - OMX_TI_EXIFTAGSTATUS eStatusDeviceSettingDescription; - OMX_S8* pDeviceSettingDescriptionBuff; - OMX_U32 ulDeviceSettingDescriptionBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusSubjectDistanceRange; - OMX_U16 usSubjectDistanceRange; - - OMX_TI_EXIFTAGSTATUS eStatusImageUniqueID; - OMX_S8 cImageUniqueID[33]; - OMX_U8* pPrivateNextIFDPointer; //Should not be used by the application - OMX_U8* pPrivateThumbnailSize; //Should not be used by the application - OMX_U8* pPrivateTiffHeaderPointer; //Should not be used by the application - - OMX_TI_EXIFTAGSTATUS eStatusGpsVersionId; - OMX_U8 ucGpsVersionId[4]; - OMX_TI_EXIFTAGSTATUS eStatusGpslatitudeRef; - OMX_S8 cGpslatitudeRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsLatitude; - OMX_U32 ulGpsLatitude[6]; - OMX_TI_EXIFTAGSTATUS eStatusGpsLongitudeRef; - OMX_S8 cGpsLongitudeRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsLongitude; - OMX_U32 ulGpsLongitude[6]; - OMX_TI_EXIFTAGSTATUS eStatusGpsAltitudeRef; - OMX_U8 ucGpsAltitudeRef; - OMX_TI_EXIFTAGSTATUS eStatusGpsAltitude; - OMX_U32 ulGpsAltitude[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsTimeStamp; - OMX_U32 ulGpsTimeStamp[6]; - OMX_TI_EXIFTAGSTATUS eStatusGpsSatellites; - OMX_S8* pGpsSatellitesBuff; - OMX_U32 ulGpsSatellitesBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusGpsStatus; - OMX_S8 cGpsStatus[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsMeasureMode; - OMX_S8 cGpsMeasureMode[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDop; - OMX_U32 ulGpsDop[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsSpeedRef; - OMX_S8 cGpsSpeedRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsSpeed; - OMX_U32 ulGpsSpeed[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsTrackRef; - OMX_S8 cGpsTrackRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsTrack; - OMX_U32 ulGpsTrack[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsImgDirectionRef; - OMX_S8 cGpsImgDirectionRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsImgDirection; - OMX_U32 ulGpsImgDirection[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsMapDatum; - OMX_S8* pGpsMapDatumBuff; - OMX_U32 ulGpsMapDatumBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusGpsDestLatitudeRef; - OMX_S8 cGpsDestLatitudeRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDestLatitude; - OMX_U32 ulGpsDestLatitude[6]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDestLongitudeRef; - OMX_S8 cGpsDestLongitudeRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDestLongitude; - OMX_U32 ulGpsDestLongitude[6]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDestBearingRef; - OMX_S8 cGpsDestBearingRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDestBearing; - OMX_U32 ulGpsDestBearing[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDestDistanceRef; - OMX_S8 cGpsDestDistanceRef[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDestDistance; - OMX_U32 ulGpsDestDistance[2]; - OMX_TI_EXIFTAGSTATUS eStatusGpsProcessingMethod; - OMX_S8* pGpsProcessingMethodBuff; - OMX_U32 ulGpsProcessingMethodBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusGpsAreaInformation; - OMX_S8* pGpsAreaInformationBuff; - OMX_U32 ulGpsAreaInformationBuffSizeBytes; - OMX_TI_EXIFTAGSTATUS eStatusGpsDateStamp; - OMX_S8 cGpsDateStamp[11]; - OMX_TI_EXIFTAGSTATUS eStatusGpsDifferential; - OMX_U16 usGpsDifferential; -} OMX_TI_CONFIG_EXIF_TAGS; - -/** - * Structure used to configure current OMX_TI_SENMOUNT_TYPE - * - * @param nSenId - * @param nRotation - */ -typedef struct OMX_TI_SENMOUNT_TYPE { - OMX_U32 nSenId; - OMX_U32 nRotation; -}OMX_TI_SENMOUNT_TYPE; - -/** - * Structure used to configure current OMX_TI_VARFPSTYPE - * - * @param nVarFPSMin Number of the smallest FPS supported. - * @param nVarFPSMax Number of the biggest FPS supported. - */ -typedef struct OMX_TI_VARFPSTYPE { - OMX_U32 nVarFPSMin; - OMX_U32 nVarFPSMax; -} OMX_TI_VARFPSTYPE; - -/** - * Structure used to configure current OMX_TI_CONFIG_SHAREDBUFFER - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nSharedBuffSize : Size of the pSharedBuff in bytes - * pSharedBuff : Pointer to a buffer - */ -typedef struct OMX_TI_CONFIG_SHAREDBUFFER { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nSharedBuffSize; - OMX_U8* pSharedBuff; -} OMX_TI_CONFIG_SHAREDBUFFER; - -/** - * Structure used to configure current OMX_TI_CAPRESTYPE - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nWidthMin : Number of the smallest width supported - * nHeightMin : Number of the smallest height supported - * nWidthMax : Number of the biggest width supported - * nHeightMax : Number of the biggest height supported - */ -typedef struct OMX_TI_CAPRESTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nWidthMin; // smallest width supported - OMX_U32 nHeightMin; // smallest height supported - OMX_U32 nWidthMax; // biggest width supported - OMX_U32 nHeightMax; // biggest height supported -} OMX_TI_CAPRESTYPE; - -/** - * Structure used to configure current OMX_TI_CAPTYPE - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * ulPreviewFormatCount : Number of the supported preview pixelformat count - * ePreviewFormats : Array containing the supported preview pixelformat count - * ulImageFormatCount : Number of the supported image pixelformat count - * eImageFormats : Array containing the supported image pixelformat count - * tPreviewResRange : Supported preview resolution range - * tImageResRange : Supported image resolution range - * tThumbResRange : Supported thumbnail resolution range - * ulWhiteBalanceCount : Supported whitebalance mode count - * eWhiteBalanceModes : Array containing the whitebalance modes - * ulColorEffectCount : Supported effects count - * eColorEffects : Array containing the supported effects - * xMaxWidthZoom : Fixed point value stored as Q16 representing the maximum value for the Zoom allowed on Width - * xMaxHeightZoom : Fixed point value stored as Q16 representing the maximum value for the Zoom allowed on Height - * ulFlickerCount : Number of the supported anti-flicker modes - * eFlicker : Array containing the supported anti-flicker modes - * ulExposureModeCount : Number of the supported exposure modes - * eExposureModes : Array containing the supported exposure modes - * bLensDistortionCorrectionSupported : Flag for Lens Distortion Correction Algorithm support - * bISONoiseFilterSupported : Flag for Noise Filter Algorithm support - * xEVCompensationMin : Fixed point value stored as Q16 representing the EVCompensation minumum allowed value - * xEVCompensationMax : Fixed point value stored as Q16 representing the EVCompensation maximum allowed value - * nSensitivityMax : nSensitivityMax = 100 implies maximum supported equal to "ISO 100" - * ulFocusModeCount : Number of the supported focus modes - * eFocusModes : Array containing the supported focus modes - * ulSceneCount : Number of the supported scenes - * eSceneModes : Array containing the supported scenes - * ulFlashCount : Number of the supported flash modes - * eFlashModes : Array containing the supported flash modes - * xFramerateMin : Fixed point value stored as Q16 representing the minimum framerate allowed - * xFramerateMax : Fixed point value stored as Q16 representing the maximum framerate allowed - * bContrastSupported : Flag showing if the contrast is supported - * bSaturationSupported : Flag showing if the saturation is supported - * bBrightnessSupported : Flag showing if the brightness is supported - * bProcessingLevelSupported : Flag showing if the processing level is supported - * bQFactorSupported : Flag showing if the QFactor is supported - * ulPrvVarFPSModesCount : Number of preview FPS modes - * tPrvVarFPSModes : Preview FPS modes - * ulCapVarFPSModesCount : Number of capture FPS modes - * tCapVarFPSModes : Capture FPS modes - * tSenMounting : Sensor mount information - */ -typedef struct OMX_TI_CAPTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U16 ulPreviewFormatCount; // supported preview pixelformat count - OMX_COLOR_FORMATTYPE ePreviewFormats[100]; - OMX_U16 ulImageFormatCount; // supported image pixelformat count - OMX_COLOR_FORMATTYPE eImageFormats[100]; - OMX_TI_CAPRESTYPE tPreviewResRange; // supported preview resolution range - OMX_TI_CAPRESTYPE tImageResRange; // supported image resolution range - OMX_TI_CAPRESTYPE tThumbResRange; // supported thumbnail resolution range - OMX_U16 ulWhiteBalanceCount; // supported whitebalance mode count - OMX_WHITEBALCONTROLTYPE eWhiteBalanceModes[100]; - OMX_U16 ulColorEffectCount; // supported effects count - OMX_IMAGEFILTERTYPE eColorEffects[100]; - OMX_S32 xMaxWidthZoom; // Fixed point value stored as Q16 - OMX_S32 xMaxHeightZoom; // Fixed point value stored as Q16 - OMX_U16 ulFlickerCount; // supported anti-flicker mode count - OMX_COMMONFLICKERCANCELTYPE eFlicker[100]; - OMX_U16 ulExposureModeCount; // supported exposure mode count - OMX_EXPOSURECONTROLTYPE eExposureModes[100]; - OMX_BOOL bLensDistortionCorrectionSupported; - OMX_BOOL bISONoiseFilterSupported; - OMX_S32 xEVCompensationMin; // Fixed point value stored as Q16 - OMX_S32 xEVCompensationMax; // Fixed point value stored as Q16 - OMX_U32 nSensitivityMax; // nSensitivityMax = 100 implies maximum supported equal to "ISO 100" - OMX_U16 ulFocusModeCount; // supported focus mode count - OMX_IMAGE_FOCUSCONTROLTYPE eFocusModes[100]; - OMX_U16 ulSceneCount; // supported scene count - OMX_SCENEMODETYPE eSceneModes[100]; - OMX_U16 ulFlashCount; // supported flash modes count - OMX_IMAGE_FLASHCONTROLTYPE eFlashModes[100]; - OMX_U32 xFramerateMin; // Fixed point value stored as Q16 - OMX_U32 xFramerateMax; // Fixed point value stored as Q16 - OMX_BOOL bContrastSupported; - OMX_BOOL bSaturationSupported; - OMX_BOOL bBrightnessSupported; - OMX_BOOL bProcessingLevelSupported; - OMX_BOOL bQFactorSupported; - OMX_U16 ulPrvVarFPSModesCount; // supported variable FPS preview modes count - OMX_TI_VARFPSTYPE tPrvVarFPSModes[10]; - OMX_U16 ulCapVarFPSModesCount; // supported variable FPS capture modes count - OMX_TI_VARFPSTYPE tCapVarFPSModes[10]; - OMX_TI_SENMOUNT_TYPE tSenMounting; - OMX_U16 ulAlgoAreasFocusCount; // supported number of AlgoAreas for focus areas - OMX_U16 ulAlgoAreasExposureCount; // supported number of AlgoAreas for exposure areas -} OMX_TI_CAPTYPE; - - - -/** - * Defines 3A Face priority mode. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bAwbFaceEnable : Enable Face priority for Auto White Balance - * bAeFaceEnable : Enable Face priority for Auto Exposure - * bAfFaceEnable : Enable Face priority for Auto Focus - */ -typedef struct OMX_TI_CONFIG_3A_FACE_PRIORITY { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bAwbFaceEnable; - OMX_BOOL bAeFaceEnable; - OMX_BOOL bAfFaceEnable; -} OMX_TI_CONFIG_3A_FACE_PRIORITY; - -/** - * Defines 3A Region priority mode. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bAwbFaceEnable : Enable Region priority for Auto White Balance - * bAeFaceEnable : Enable Region priority for Auto Exposure - * bAfFaceEnable : Enable Region priority for Auto Focus - */ -typedef struct OMX_TI_CONFIG_3A_REGION_PRIORITY { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bAwbRegionEnable; - OMX_BOOL bAeRegionEnable; - OMX_BOOL bAfRegionEnable; -} OMX_TI_CONFIG_3A_REGION_PRIORITY; - -/* -* STRUCT MEMBERS: -* nSize : Size of the structure in bytes -* nVersion : OMX specification version information -* nPortIndex : Port that this structure applies to -* bAutoConvergence : Enable/Disable Auto Convergence -*/ -typedef struct OMX_TI_PARAM_AUTOCONVERGENCETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bAutoConvergence; -} OMX_TI_PARAM_AUTOCONVERGENCETYPE; - -/** - * Focus distance configuration - * - * STRUCT MEMBERS: - * nSize: Size of the structure in bytes - * nVersion: OMX specification version information - * nPortIndex: Port that this structure applies to - * nFocusDistanceNear : Specifies the near focus distance in mm ( 0 equals infinity ) - * nFocusDistanceOptimal : Specifies the optimal focus distance in mm ( 0 equals infinity ) - * nFocusDistanceFar : Specifies the far focus distance in mm ( 0 equals infinity ) - * nLensPosition : Specifies the current lens position in driver units - */ -typedef struct OMX_TI_CONFIG_FOCUSDISTANCETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nFocusDistanceNear; - OMX_U32 nFocusDistanceOptimal; - OMX_U32 nFocusDistanceFar; - OMX_S32 nLensPosition; -} OMX_TI_CONFIG_FOCUSDISTANCETYPE; - -/* -* STRUCT MEMBERS: -* nSize : Size of the structure in bytes -* nVersion : OMX specification version information -* nPortIndex : Port that this structure applies to -* pAAAskipBuff : Pointer to a buffer -* AAAskipBuffId : Id of the send buffer -* AAAskipBuffSize : Size of the sent buffer -*/ -typedef struct OMX_TI_CONFIG_AAASKIPBUFFERTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_PTR pAAAskipBuff; - OMX_U32 AAAskipBuffId; - OMX_U32 AAAskipBuffSize; -} OMX_TI_CONFIG_AAASKIPBUFFERTYPE; - - -/** - * The OMX_TI_BRIGHTNESSCONTRASTCRTLTYPE enumeration is used to define the - * brightness and contrast mode types. - */ -typedef enum OMX_TI_BRIGHTNESSCONTRASTCRTLTYPE { - OMX_TI_BceModeOff = 0, - OMX_TI_BceModeOn, - OMX_TI_BceModeAuto, - OMX_TI_BceModeMax = 0x7FFFFFFF -} OMX_TI_BRIGHTNESSCONTRASTCRTLTYPE; - -/** - * Local and global brightness contrast type. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eControl : Control field for GLBCE - */ -typedef struct OMX_TI_CONFIG_LOCAL_AND_GLOBAL_BRIGHTNESSCONTRASTTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_BRIGHTNESSCONTRASTCRTLTYPE eControl; -} OMX_TI_CONFIG_LOCAL_AND_GLOBAL_BRIGHTNESSCONTRASTTYPE; - -/** - * Uncompressed image operating mode configuration structure. - * - * @param nSize Size of the structure in bytes. - * @param nVersion OMX specification version information. - * @param xMin The minimum frame rate allowed. - * Units are Q16 frames per second. - * @param xMax The maximum frame rate allowed. - * Units are Q16 frames per second. - */ - -typedef struct OMX_TI_CONFIG_VARFRMRANGETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 xMin; - OMX_U32 xMax; -} OMX_TI_CONFIG_VARFRMRANGETYPE; - -/** -* A pointer to this struct is passed to the OMX_SetParameter when the extension -* index for the 'OMX.google.android.index.enableAndroidNativeBuffers' extension -* is given. -* The corresponding extension Index is OMX_TI_IndexUseNativeBuffers. -* This will be used to inform OMX about the presence of gralloc pointers instead -* of virtual pointers -*/ -typedef struct OMX_TI_PARAMUSENATIVEBUFFER { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; -} OMX_TI_PARAMUSENATIVEBUFFER; - -/** -* A pointer to this struct is passed to OMX_GetParameter when the extension -* index for the 'OMX.google.android.index.getAndroidNativeBufferUsage' -* extension is given. -* The corresponding extension Index is OMX_TI_IndexAndroidNativeBufferUsage. -* The usage bits returned from this query will be used to allocate the Gralloc -* buffers that get passed to the useAndroidNativeBuffer command. -*/ -typedef struct OMX_TI_PARAMNATIVEBUFFERUSAGE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nUsage; -} OMX_TI_PARAMNATIVEBUFFERUSAGE; - -/*==========================================================================*/ -/*! -@brief OMX_TI_PARAM_ENHANCEDPORTRECONFIG : Suport added to new port reconfig usage -@param bUsePortReconfigForCrop Enables port reconfig for crop. -@param bUsePortReconfigForPadding Enables port reconfig for padding -*/ -/*==========================================================================*/ - -typedef struct OMX_TI_PARAM_ENHANCEDPORTRECONFIG { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bUsePortReconfigForCrop; - OMX_BOOL bUsePortReconfigForPadding; -} OMX_TI_PARAM_ENHANCEDPORTRECONFIG; - -/** -* Define the frames queue len for ZSL -* -* STRUCT MEMBERS: -* nSize: Size of the structure in bytes -* nVersion: OMX specification version information -* nHistoryLen: History len in number of frames -*/ -typedef struct OMX_TI_PARAM_ZSLHISTORYLENTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nHistoryLen; -} OMX_TI_PARAM_ZSLHISTORYLENTYPE; - -/** -* Define the frame delay in ms for ZSL -* -* STRUCT MEMBERS: -* nSize: Size of the structure in bytes -* nVersion: OMX specification version information -* nDelay: Capture frame delay in ms -*/ -typedef struct OMX_TI_CONFIG_ZSLDELAYTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_S32 nDelay; -} OMX_TI_CONFIG_ZSLDELAYTYPE; - -/** - * AlogAreas purpose - * This type specifies the purpose of areas specified in OMX_ALGOAREASTYPE. - * */ -typedef enum OMX_ALGOAREAPURPOSE{ - OMX_AlgoAreaFocus = 0, // Multi region focus - OMX_AlgoAreaExposure, -}OMX_ALGOAREAPURPOSE; - -typedef struct OMX_ALGOAREA { - OMX_S32 nLeft; /**< The leftmost coordinate of the area rectangle */ - OMX_S32 nTop; /**< The topmost coordinate of the area rectangle */ - OMX_U32 nWidth; /**< The width of the area rectangle in pixels */ - OMX_U32 nHeight; /**< The height of the area rectangle in pixels */ - OMX_U32 nPriority; /**< Priority - ranges from 1 to 1000 */ -}OMX_ALGOAREA; - -/** - * Algorythm areas type - * This type defines areas for Multi Region Focus, - * or another algorithm region parameters, - * such as Multi Region Auto Exposure. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port index - * tAreaPosition : Area definition - coordinates and purpose - Multi Region Focus, Auto Exposure, etc. - * nNumAreas : Number of areas defined in the array - * nAlgoAreaPurpose : Algo area purpose - eg. Multi Region Focus is OMX_AlgoAreaFocus - */ -typedef struct OMX_ALGOAREASTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - - OMX_U32 nNumAreas; - OMX_ALGOAREA tAlgoAreas[MAX_ALGOAREAS]; - OMX_ALGOAREAPURPOSE nAlgoAreaPurpose; -} OMX_ALGOAREASTYPE; - - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif - - diff --git a/domx/omx_core/inc/OMX_TI_Image.h b/domx/omx_core/inc/OMX_TI_Image.h deleted file mode 100755 index 4035218..0000000 --- a/domx/omx_core/inc/OMX_TI_Image.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * @file:OMX_TI_Image.h - * This header defines the structures specific to the param or config - * indices of Openmax Image Component. - * - * @path domx/system/omx_core/inc - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 11-Oct-2010 KMotov x0106653@ti.com Initial Version - *================================================================*/ - -#ifndef OMX_TI_IMAGE_H -#define OMX_TI_IMAGE_H - -/** - * The OMX_TI_IMAGE_CODINGTYPE enumeration is used to define the - * extended image coding types. - */ -typedef enum OMX_TI_IMAGE_CODINGTYPE -{ - OMX_TI_IMAGE_CodingJPS = OMX_IMAGE_CodingVendorStartUnused + 1, /**< JPS format */ - OMX_TI_IMAGE_CodingMPO /**< MPO format */ -} OMX_TI_IMAGE_CODINGTYPE; - -#endif /* OMX_TI_IMAGE_H */ diff --git a/domx/omx_core/inc/OMX_TI_Index.h b/domx/omx_core/inc/OMX_TI_Index.h deleted file mode 100755 index 61b1e27..0000000 --- a/domx/omx_core/inc/OMX_TI_Index.h +++ /dev/null @@ -1,245 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_ti_index.h - * This file contains the vendor(TI) specific indexes - * - * @path \OMAPSW_SysDev\multimedia\omx\khronos1_1\omx_core\inc - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 20-Dec-2008 x0052661@ti.com, initial version - *================================================================*/ - -#ifndef _OMX_TI_INDEX_H_ -#define _OMX_TI_INDEX_H_ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <OMX_Types.h> - -/******************************************************************* - * EXTERNAL REFERENCE NOTE: only use if not found in header file - *******************************************************************/ -/*---------- function prototypes ------------------- */ -/*---------- data declarations ------------------- */ -/******************************************************************* - * PUBLIC DECLARATIONS: defined here, used elsewhere - *******************************************************************/ -/*---------- function prototypes ------------------- */ -/*---------- data declarations ------------------- */ - -typedef enum OMX_TI_INDEXTYPE { - - OMX_IndexConfigAutoPauseAfterCapture = OMX_IndexAutoPauseAfterCapture, - - /* Vendor specific area for storing indices */ - OMX_TI_IndexConfigChannelName = ((OMX_INDEXTYPE)OMX_IndexVendorStartUnused + 1), /**< reference: OMX_CONFIG_CHANNELNAME */ - - OMX_TI_IndexParamJPEGUncompressedMode, /**< reference: OMX_JPEG_PARAM_UNCOMPRESSEDMODETYPE */ - OMX_TI_IndexParamJPEGCompressedMode, /**< reference: OMX_JPEG_PARAM_COMPRESSEDMODETYPE */ - OMX_TI_IndexParamDecodeSubregion, /**< reference: OMX_IMAGE_PARAM_DECODE_SUBREGION */ - - /* H264 Encoder Indices*/ - OMX_TI_IndexParamVideoDataSyncMode, //!< Refer to OMX_VIDEO_PARAM_DATASYNCMODETYPE structure - OMX_TI_IndexParamVideoNALUsettings, //!< use OMX_VIDEO_PARAM_AVCNALUCONTROLTYPE to configure the type os NALU to send along with the Different Frame Types - OMX_TI_IndexParamVideoMEBlockSize, //!< use OMX_VIDEO_PARAM_MEBLOCKSIZETYPE to specify the minimum block size used for motion estimation - OMX_TI_IndexParamVideoIntraPredictionSettings, //!< use OMX_VIDEO_PARAM_INTRAPREDTYPE to configure the intra prediction modes used for different block sizes - OMX_TI_IndexParamVideoEncoderPreset, //!< use OMX_VIDEO_PARAM_ENCODER_PRESETTYPE to select the encoding mode & rate control preset - OMX_TI_IndexParamVideoFrameDataContentSettings, //!< use OMX_TI_VIDEO_PARAM_FRAMEDATACONTENTTYPE to configure the data content tpye - OMX_TI_IndexParamVideoTransformBlockSize, //!< use OMX_VIDEO_PARAM_TRANSFORM_BLOCKSIZETYPE to specify the block size used for ttransformation - OMX_TI_IndexParamVideoVUIsettings, //!use OMX_VIDEO_PARAM_VUIINFOTYPE - OMX_TI_IndexParamVideoAdvancedFMO, - OMX_TI_IndexConfigVideoPixelInfo, //!< Use OMX_VIDEO_CONFIG_PIXELINFOTYPE structure to know the pixel aspectratio & pixel range - OMX_TI_IndexConfigVideoMESearchRange, //!< use OMX_VIDEO_CONFIG_MESEARCHRANGETYPE to specify the ME Search settings - OMX_TI_IndexConfigVideoQPSettings, //!< use OMX_TI_VIDEO_CONFIG_QPSETTINGS to specify the ME Search settings - OMX_TI_IndexConfigSliceSettings, //!<use OMX_VIDEO_CONFIG_SLICECODINGTYPE to specify the ME Search settings - OMX_TI_IndexParamAVCInterlaceSettings, //!< use OMX_TI_VIDEO_PARAM_AVCINTERLACECODING to specify the ME Search settings - OMX_TI_IndexParamStereoInfo2004Settings, //!< use OMX_TI_VIDEO_AVCENC_STEREOINFO2004 to specify the 2004 SEI for AVC Encoder - OMX_TI_IndexParamStereoFramePacking2010Settings, //!< use OMX_TI_VIDEO_AVCENC_FRAMEPACKINGINFO2010 to specify 2010 SEI for AVC Encoder - - - /* Camera Indices */ - OMX_TI_IndexConfigSensorSelect, /**< reference: OMX_CONFIG_SENSORSELECTTYPE */ - OMX_IndexConfigFlickerCancel, /**< reference: OMX_CONFIG_FLICKERCANCELTYPE */ - OMX_IndexConfigSensorCal, /**< reference: OMX_CONFIG_SENSORCALTYPE */ - OMX_IndexConfigISOSetting, /**< reference: OMX_CONFIG_ISOSETTINGTYPE */ - OMX_TI_IndexConfigSceneMode, /**< reference: OMX_CONFIG_SCENEMODETYPE */ - - OMX_IndexConfigDigitalZoomSpeed, /**< reference: OMX_CONFIG_DIGITALZOOMSPEEDTYPE */ - OMX_IndexConfigDigitalZoomTarget, /**< reference: OMX_CONFIG_DIGITALZOOMTARGETTYPE */ - - OMX_IndexConfigCommonScaleQuality, /**< reference: OMX_CONFIG_SCALEQUALITYTYPE */ - - OMX_IndexConfigCommonDigitalZoomQuality, /**< reference: OMX_CONFIG_SCALEQUALITYTYPE */ - - OMX_IndexConfigOpticalZoomSpeed, /**< reference: OMX_CONFIG_DIGITALZOOMSPEEDTYPE */ - OMX_IndexConfigOpticalZoomTarget, /**< reference: OMX_CONFIG_DIGITALZOOMTARGETTYPE */ - - OMX_IndexConfigSmoothZoom, /**< reference: OMX_CONFIG_SMOOTHZOOMTYPE */ - - OMX_IndexConfigBlemish, /**< reference: OMX_CONFIG_BLEMISHTYPE */ - - OMX_IndexConfigExtCaptureMode, /**< reference: OMX_CONFIG_EXTCAPTUREMODETYPE */ - OMX_IndexConfigExtPrepareCapturing, /**< reference : OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigExtCapturing, /**< reference : OMX_CONFIG_EXTCAPTURING */ - - OMX_IndexCameraOperatingMode, /**< OMX_CONFIG_CAMOPERATINGMODETYPE */ - OMX_IndexConfigDigitalFlash, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigPrivacyIndicator, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexConfigTorchMode, /**< reference: OMX_CONFIG_TORCHMODETYPE */ - - OMX_IndexConfigSlowSync, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexConfigExtFocusRegion, /**< reference : OMX_CONFIG_EXTFOCUSREGIONTYPE */ - OMX_IndexConfigFocusAssist, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexConfigImageFocusLock, /**< reference: OMX_IMAGE_CONFIG_LOCKTYPE */ - OMX_IndexConfigImageWhiteBalanceLock, /**< reference: OMX_IMAGE_CONFIG_LOCKTYPE */ - OMX_IndexConfigImageExposureLock, /**< reference: OMX_IMAGE_CONFIG_LOCKTYPE */ - OMX_IndexConfigImageAllLock, /**< reference: OMX_IMAGE_CONFIG_LOCKTYPE */ - - OMX_IndexConfigImageDeNoiseLevel, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - OMX_IndexConfigSharpeningLevel, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - OMX_IndexConfigDeBlurringLevel, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - OMX_IndexConfigChromaCorrection, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - OMX_IndexConfigDeMosaicingLevel, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - - OMX_IndexConfigCommonWhiteBalanceGain, /**< reference: OMX_CONFIG_WHITEBALGAINTYPE */ - - OMX_IndexConfigCommonRGB2RGB, /**< reference: OMX_CONFIG_COLORCONVERSIONTYPE_II */ - OMX_IndexConfigCommonRGB2YUV, /**< reference: OMX_CONFIG_COLORCONVERSIONTYPE_II */ - OMX_IndexConfigCommonYUV2RGB, /**< reference : OMX_CONFIG_EXT_COLORCONVERSIONTYPE */ - - OMX_IndexConfigCommonGammaTable, /**< reference: OMX_CONFIG_GAMMATABLETYPE */ - - OMX_IndexConfigImageFaceDetection, /**< reference: OMX_CONFIG_OBJDETECTIONTYPE */ - OMX_IndexConfigImageBarcodeDetection, /**< reference: OMX_CONFIG_EXTRADATATYPE */ - OMX_IndexConfigImageSmileDetection, /**< reference: OMX_CONFIG_OBJDETECTIONTYPE */ - OMX_IndexConfigImageBlinkDetection, /**< reference: OMX_CONFIG_OBJDETECTIONTYPE */ - OMX_IndexConfigImageFrontObjectDetection, /**< reference: OMX_CONFIG_EXTRADATATYPE */ - OMX_IndexConfigHistogramMeasurement, /**< reference: OMX_CONFIG_HISTOGRAMTYPE */ - OMX_IndexConfigDistanceMeasurement, /**< reference: OMX_CONFIG_EXTRADATATYPE */ - - OMX_IndexConfigSnapshotToPreview, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexConfigJpegHeaderType , /**< reference : OMX_CONFIG_JPEGHEEADERTYPE */ - OMX_IndexParamJpegMaxSize, /**< reference: OMX_IMAGE_JPEGMAXSIZE */ - - OMX_IndexConfigRestartMarker, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexParamImageStampOverlay, /**< reference: OMX_PARAM_IMAGESTAMPOVERLAYTYPE */ - OMX_IndexParamThumbnail, /**< reference: OMX_PARAM_THUMBNAILTYPE */ - OMX_IndexConfigImageStabilization, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigMotionTriggeredImageStabilisation, /**< reference : OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigRedEyeRemoval, /**< reference: OMX_CONFIG_REDEYEREMOVALTYPE */ - OMX_IndexParamHighISONoiseFiler, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexParamLensDistortionCorrection, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexParamLocalBrightnessAndContrast, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigChromaticAberrationCorrection, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexParamVideoCaptureYUVRange, /**< reference: OMX_PARAM_VIDEOYUVRANGETYPE */ - - OMX_IndexConfigFocusRegion, /**< reference: OMX_CONFIG_EXTFOCUSREGIONTYPE */ - OMX_IndexConfigImageMotionEstimation, /**< reference: OMX_CONFIG_OBJDETECTIONTYPE */ - OMX_IndexParamProcessingOrder, /**< reference: OMX_CONFIGPROCESSINGORDERTYPE */ - OMX_IndexParamFrameStabilisation, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexParamVideoNoiseFilter, /**< reference: OMX_PARAM_VIDEONOISEFILTERTYPE */ - - OMX_IndexConfigOtherExtraDataControl, /**< reference: OMX_CONFIG_EXTRADATATYPE */ - OMX_TI_IndexParamBufferPreAnnouncement, /**< reference: OMX_TI_PARAM_BUFFERPREANNOUNCE */ - OMX_TI_IndexConfigBufferRefCountNotification, /**< reference: OMX_TI_CONFIG_BUFFERREFCOUNTNOTIFYTYPE */ - OMX_TI_IndexParam2DBufferAllocDimension, /**< reference: OMX_CONFIG_RECTTYPE */ - OMX_TI_IndexConfigWhiteBalanceManualColorTemp, /**< reference: OMX_TI_CONFIG_WHITEBALANCECOLORTEMPTPYPE */ - OMX_TI_IndexConfigFocusSpotWeighting, /**< reference: OMX_TI_CONFIG_FOCUSSPOTWEIGHTINGTYPE */ - OMX_TI_IndexParamSensorOverClockMode, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_TI_IndexParamDccUriInfo, /**< reference: OMX_TI_PARAM_DCCURIINFO */ - OMX_TI_IndexParamDccUriBuffer, /**< reference: OMX_TI_PARAM_DCCURIBUFFER */ - - /* MPEG4 and H264 encoder specific Indices */ - OMX_TI_IndexParamVideoIntraRefresh, /**< reference: OMX_TI_VIDEO_PARAM_INTRAREFRESHTYPE */ - - OMX_TI_IndexConfigShutterCallback, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_TI_IndexParamVarFrameRate, /**< reference: OMX_PARAM_VARFARAMERATETYPE */ - OMX_TI_IndexConfigAutoConvergence, /**< reference: OMX_TI_CONFIG_CONVERGENCETYPE */ - OMX_TI_IndexConfigRightExposureValue, /**< reference: OMX_TI_CONFIG_EXPOSUREVALUERIGHTTYPE */ - OMX_TI_IndexConfigExifTags, /**< reference: OMX_TI_CONFIG_SHAREDBUFFER */ - OMX_TI_IndexParamVideoPayloadHeaderFlag, /**< reference: OMX_TI_PARAM_PAYLOADHEADERFLAG */ - OMX_TI_IndexParamVideoIvfMode, /**< reference: OMX_TI_PARAM_IVFFLAG */ - OMX_TI_IndexConfigCamCapabilities, /**< reference: OMX_TI_CONFIG_SHAREDBUFFER */ - OMX_TI_IndexConfigFacePriority3a, /**< reference: OMX_TI_CONFIG_3A_FACE_PRIORITY */ - OMX_TI_IndexConfigRegionPriority3a, /**< reference: OMX_TI_CONFIG_3A_REGION_PRIORITY */ - OMX_TI_IndexParamAutoConvergence, /**< reference: OMX_TI_PARAM_AUTOCONVERGENCETYPE */ - OMX_TI_IndexConfigAAAskipBuffer, /**< reference: OMX_TI_CONFIG_AAASKIPBUFFERTYPE */ - OMX_TI_IndexParamStereoFrmLayout, /**< reference: OMX_TI_FRAMELAYOUTTYPE */ - OMX_TI_IndexConfigLocalBrightnessContrastEnhance, /**< reference: OMX_TI_CONFIG_LOCAL_AND_GLOBAL_BRIGHTNESSCONTRASTTYPE */ - OMX_TI_IndexConfigGlobalBrightnessContrastEnhance, /**< reference: OMX_TI_CONFIG_LOCAL_AND_GLOBAL_BRIGHTNESSCONTRASTTYPE */ - OMX_TI_IndexConfigVarFrmRange, /**< reference: OMX_TI_CONFIG_VARFRMRANGETYPE */ - OMX_TI_IndexParamAVCHRDBufferSizeSetting, /**< reference: OMX_TI_VIDEO_PARAM_AVCHRDBUFFERSETTING */ - OMX_TI_IndexConfigAVCHRDBufferSizeSetting, /**< reference: OMX_TI_VIDEO_CONFIG_AVCHRDBUFFERSETTING */ - OMX_TI_IndexConfigFocusDistance, /**< reference: OMX_TI_CONFIG_FOCUSDISTANCETYPE */ - OMX_TI_IndexUseNativeBuffers, /**< reference: OMX_TI_ParamUseNativeBuffer */ - OMX_TI_IndexParamUseEnhancedPortReconfig, /**< reference: OMX_TI_IndexParamUseEnhancedPortReconfig */ - OMX_TI_IndexEncoderStoreMetadatInBuffers, - OMX_TI_IndexParamZslHistoryLen, /**< reference: OMX_TI_PARAM_ZSLHISTORYLENTYPE */ - OMX_TI_IndexConfigZslDelay, /**< reference: OMX_TI_CONFIG_ZSLDELAYTYPE */ - OMX_TI_IndexParamMetaDataBufferInfo, /***< reference: OMX_TI_PARAM_METADATABUFFERINFO */ - OMX_TI_IndexConfigZslFrameSelectMethod, /**< reference: OMX_TI_CONFIG_ZSLFRAMESELECTMETHODTYPE */ - OMX_TI_IndexAndroidNativeBufferUsage, /**< reference: OMX_TI_IndexAndroidNativeBufferUsage */ - OMX_TI_IndexConfigAlgoAreas, /**< reference: OMX_PARAM_SHAREDBUFFER (pSharedBuff is OMX_ALGOAREASTYPE) */ - OMX_TI_IndexConfigAutofocusEnable /**< reference: OMX_CONFIG_BOOLEANTYPE */ -} OMX_TI_INDEXTYPE; - - - -/******************************************************************* - * PRIVATE DECLARATIONS: defined here, used only here - *******************************************************************/ -/*---------- data declarations ------------------- */ -/*---------- function prototypes ------------------- */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _OMX_TI_INDEX_H_ */ - diff --git a/domx/omx_core/inc/OMX_TI_Video.h b/domx/omx_core/inc/OMX_TI_Video.h deleted file mode 100755 index 6e4989c..0000000 --- a/domx/omx_core/inc/OMX_TI_Video.h +++ /dev/null @@ -1,2587 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* -------------------------------------------------------------------------- */ -/* - * @file:Omx_ti_video.h - * This header defines the structures specific to the param or config indices of Openmax Video Component. - * - * @path: - * \WTSD_DucatiMMSW\ omx\omx_il_1_x\omx_core\ - - * -------------------------------------------------------------------------- */ - -/* ========================================================================= - *! - *! Revision History - *! ===================================================================== - *! 24-Dec-2008 Navneet navneet@ti.com Initial Version - *! 14-Jul-2009 Radha Purnima radhapurnima@ti.com - *! 25-Aug-2009 Radha Purnima radhapurnima@ti.com - *! 16-May-2009 Shivaraj Shetty shettyshivaraj@ti.com - * =========================================================================*/ - - -#ifndef OMX_TI_VIDEO_H -#define OMX_TI_VIDEO_H -#define H264ENC_MAXNUMSLCGPS 2 -#define OMXH264E_MAX_SLICE_SUPPORTED 64 -#include <OMX_Core.h> - -/** - * @brief mode selection for the data that is given to the Codec - */ - -typedef enum OMX_VIDEO_DATASYNCMODETYPE { - OMX_Video_FixedLength, //!< Interms of multiples of 4K - OMX_Video_SliceMode, //!< Slice mode - OMX_Video_NumMBRows, //!< Number of rows, each row is 16 lines of video - OMX_Video_EntireFrame //!< Processing of entire frame data -} OMX_VIDEO_DATASYNCMODETYPE; - - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_DATAMODE :to configure how the input and output data is fed to the Codec - @param nPortIndex to specify the index of the port - @param eDataMode to specify the data mode - @sa OMX_VIDEO_DATASYNCMODETYPE - @param nNumDataUnits to specify the number of data units (where units are of type defined by eDataMode) - */ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_PARAM_DATASYNCMODETYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_DATASYNCMODETYPE eDataMode; - OMX_U32 nNumDataUnits; -} OMX_VIDEO_PARAM_DATASYNCMODETYPE; - -/** - * @brief Aspect Ratio type selection for the encoded bit stream - */ -typedef enum OMX_VIDEO_ASPECTRATIOTYPE{ - OMX_Video_AR_Unspecified, //!< Unspecified aspect ratio - OMX_Video_AR_Square , //!< 1:1 (square) aspect ratio - OMX_Video_AR_12_11 , //!< 12:11 aspect ratio - OMX_Video_AR_10_11 , //!< 10:11 aspect ratio - OMX_Video_AR_16_11 , //!< 16:11 aspect ratio - OMX_Video_AR_40_33 , //!< 40:33 aspect ratio - OMX_Video_AR_24_11 , //!< 24:11 aspect ratio - OMX_Video_AR_20_11 , //!< 20:11 aspect ratio - OMX_Video_AR_32_11 , //!< 32:11 aspect ratio - OMX_Video_AR_80_33 , //!< 80:33 aspect ratio - OMX_Video_AR_18_11 , //!< 18:11 aspect ratio - OMX_Video_AR_15_15 , //!< 15:15 aspect ratio - OMX_Video_AR_64_33 , //!< 64:33 aspect ratio - OMX_Video_AR_160_99 , //!< 160:99 aspect ratio - OMX_Video_AR_4_3 , //!< 4:3 aspect ratio - OMX_Video_AR_3_2 , //!< 3:2 aspect ratio - OMX_Video_AR_2_1 , //!< 2:1 aspect ratio - OMX_Video_AR_Extended = 255, //!< Extended aspect ratio - OMX_Video_AR_Extended_MAX = 0X7FFFFFFF -}OMX_VIDEO_ASPECTRATIOTYPE; - - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_VUI_SELECT :to select the VUI Settings - @param bAspectRatioPresent flag to indicate the insertion of aspect ratio information in VUI part of bit-stream - @param ePixelAspectRatio to specify the Aspect Ratio - @param bFullRange to indicate whether pixel value range is specified as full range or not (0 to 255) -*/ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_PARAM_VUIINFOTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bAspectRatioPresent; - OMX_VIDEO_ASPECTRATIOTYPE ePixelAspectRatio; - OMX_BOOL bFullRange; -}OMX_VIDEO_PARAM_VUIINFOTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_VIDEO_CONFIG_PIXELINFOTYPE :to specify the information related to the input pixel data (aspect ratio & range) to the Codec - so that codec can incorporate this info in the coded bit stream - @param nWidth to specify the Aspect ratio: width of the pixel - @param nHeight to specify the Aspect ratio: height of the pixel - */ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_CONFIG_PIXELINFOTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nWidth; - OMX_U32 nHeight; -} OMX_VIDEO_CONFIG_PIXELINFOTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_VIDEO_PARAM_AVCNALUCONTROLTYPE : to configure what NALU need to send along the frames of different types (Intra,IDR...etc) - @param nStartofSequence to configure the different NALU (specified via enabling/disabling (1/0) the bit positions) that need to send along with the Start of sequence frame - @param nEndofSequence to to configure the different NALU (specified via enabling/disabling (1/0) the bit positions) that need to send along with the End of sequence frame - @param nIDR to to configure the different NALU (specified via enabling/disabling (1/0) the bit positions) that need to send along with the IDR frame - @param nIntraPicture to to configure the different NALU (specified via enabling/disabling (1/0) the bit positions) that need to send along with the Intra frame - @param nNonIntraPicture to to configure the different NALU (specified via enabling/disabling (1/0) the bit positions) that need to send along with the Non Intra frame - -Bit Position: 13| 12| 11| 10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0 -NALU TYPE: SPS_VUI|FILLER|EOSTREAM|EOSEQ|AUD|PPS|SPS|SEI|IDR_SLICE|SLICE_DP_C|SLICE_DP_B|SLICE_DP_A|SLICE|UNSPECIFIED \n -*/ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_PARAM_AVCNALUCONTROLTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nStartofSequence; - OMX_U32 nEndofSequence; - OMX_U32 nIDR; - OMX_U32 nIntraPicture; - OMX_U32 nNonIntraPicture; -}OMX_VIDEO_PARAM_AVCNALUCONTROLTYPE; - - -/* ========================================================================== */ -/*! - @brief OMX_VIDEO_CONFIG_MESEARCHRANGETYPE : to configure Motion Estimation Parameters - @param eMVAccuracy to specify the Motion Vector Accuracy - @sa OMX_VIDEO_MOTIONVECTORTYPE - @param sHorSearchRangeP to Specify the Horizontal Search range for P Frame - @param sVerSearchRangeP to Specify the Vertical Search range for P Frame - @param sHorSearchRangeB to Specify the Horizontal Search range for B Frame - @param sVerSearchRangeB to Specify the Vertical Search range for B Frame -*/ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_CONFIG_MESEARCHRANGETYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_MOTIONVECTORTYPE eMVAccuracy; - OMX_U32 nHorSearchRangeP; - OMX_U32 nVerSearchRangeP; - OMX_U32 nHorSearchRangeB; - OMX_U32 nVerSearchRangeB; -}OMX_VIDEO_CONFIG_MESEARCHRANGETYPE; - -/** - * @brief Block size specification - */ -typedef enum OMX_VIDEO_BLOCKSIZETYPE { - OMX_Video_Block_Size_16x16=0, - OMX_Video_Block_Size_8x8, - OMX_Video_Block_Size_8x4, - OMX_Video_Block_Size_4x8, - OMX_Video_Block_Size_4x4, - OMX_Video_Block_Size_MAX = 0X7FFFFFFF -}OMX_VIDEO_BLOCKSIZETYPE; - -/* ========================================================================== */ -/*! - @brief OMX_VIDEO_PARAM_MEBLOCKSIZETYPE : to configure the Min Motion Estimation block size for P and B frames - @param eMinBlockSizeP to specify the Min Block size used for Motion Estimation incase of P Frames - @sa OMX_VIDEO_BLOCKSIZETYPE - @param eMinBlockSizeB to specify the Min Block size used for Motion Estimation incase of B Frames -*/ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_PARAM_MEBLOCKSIZETYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_BLOCKSIZETYPE eMinBlockSizeP; - OMX_VIDEO_BLOCKSIZETYPE eMinBlockSizeB; -}OMX_VIDEO_PARAM_MEBLOCKSIZETYPE; - -/** - * @brief to select the chroma component used for Intra Prediction - */ -typedef enum OMX_VIDEO_CHROMACOMPONENTTYPE { - OMX_Video_Chroma_Component_Cr_Only=0, //!< consider only Cr chroma component for Intra prediction - OMX_Video_Chroma_Component_Cb_Cr_Both, //!< consider both (Cb & Cr) chroma components for Intra prediction - OMX_Video_Chroma_Component_MAX = 0X7FFFFFFF -}OMX_VIDEO_CHROMACOMPONENTTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_VIDEO_PARAM_INTRAPREDTYPE : to configure the Modes for the different block sizes during Intra Prediction - @param nLumaIntra4x4Enable to configure the Modes for 4x4 block size during luma intra prediction: bit position specifies the modes that are enabled/disabled - HOR_UP|VERT_LEFT|HOR_DOWN|VERT_RIGHT|DIAG_DOWN_RIGHT|DIAG_DOWN_LEFT|DC|HOR|VER - @param nLumaIntra8x8Enable to configure the Modes for 4x4 block size during luma intra prediction - HOR_UP|VERT_LEFT|HOR_DOWN|VERT_RIGHT|DIAG_DOWN_RIGHT|DIAG_DOWN_LEFT|DC|HOR|VER - @param nLumaIntra16x16Enable to configure the Modes for 4x4 block size during luma intra prediction - PLANE|DC|HOR|VER - @param nChromaIntra8x8Enable to configure the Modes for 4x4 block size during luma intra prediction - PLANE|DC|HOR|VER - @param eChromaComponentEnable to select the chroma components used for the intra prediction - @sa OMX_VIDEO_CHROMACOMPONENTTYPE -*/ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_PARAM_INTRAPREDTYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nLumaIntra4x4Enable; - OMX_U32 nLumaIntra8x8Enable; - OMX_U32 nLumaIntra16x16Enable; - OMX_U32 nChromaIntra8x8Enable; - OMX_VIDEO_CHROMACOMPONENTTYPE eChromaComponentEnable; -}OMX_VIDEO_PARAM_INTRAPREDTYPE; - - -/** - * @brief Encoding Mode Preset - */ -typedef enum OMX_VIDEO_ENCODING_MODE_PRESETTYPE { - OMX_Video_Enc_Default=0, //!< for all the params default values are taken - OMX_Video_Enc_High_Quality, //!< todo: mention the parameters that takes specific values depending on this selection - OMX_Video_Enc_User_Defined, - OMX_Video_Enc_High_Speed_Med_Quality, - OMX_Video_Enc_Med_Speed_Med_Quality, - OMX_Video_Enc_Med_Speed_High_Quality, - OMX_Video_Enc_High_Speed, - OMX_Video_Enc_Preset_MAX = 0X7FFFFFFF -}OMX_VIDEO_ENCODING_MODE_PRESETTYPE; - -/** - * @brief Rate Control Preset - */ -typedef enum OMX_VIDEO_RATECONTROL_PRESETTYPE { - OMX_Video_RC_Low_Delay, //!<todo: mention the parameters that takes specific values depending on this selection - OMX_Video_RC_Storage, - OMX_Video_RC_Twopass, - OMX_Video_RC_None, - OMX_Video_RC_User_Defined, - OMX_Video_RC_MAX = 0X7FFFFFFF -}OMX_VIDEO_RATECONTROL_PRESETTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_VIDEO_PARAM_ENCODER_PRESETTYPE : to select the preset for Encoding Mode & Rate Control - @param eEncodingModePreset to specify Encoding Mode Preset - @sa OMX_VIDEO_ENCODING_MODE_PRESETTYPE - @param eRateControlPreset to specify Rate Control Preset - @sa OMX_VIDEO_RATECONTROL_PRESETTYPE -*/ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_PARAM_ENCODER_PRESETTYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_ENCODING_MODE_PRESETTYPE eEncodingModePreset; - OMX_VIDEO_RATECONTROL_PRESETTYPE eRateControlPreset; -}OMX_VIDEO_PARAM_ENCODER_PRESETTYPE; - - -/** - * @brief input content type - */ -typedef enum OMX_TI_VIDEO_FRAMECONTENTTYPE { - OMX_TI_Video_Progressive = 0, //!<Progressive frame - OMX_TI_Video_Interlace_BothFieldsTogether = 1, //!<Interlaced frame - OMX_TI_Video_Interlace_OneField = 2, - OMX_TI_Video_AVC_2004_StereoInfoType = 3, - OMX_TI_Video_AVC_2010_StereoFramePackingType = 4, - OMX_TI_Video_FrameContentType_MAX = 0x7FFFFFFF -}OMX_TI_VIDEO_FRAMECONTENTTYPE; - -/** - * @brief Specifies the type of interlace content - */ -typedef enum OMX_TI_VIDEO_AVC_INTERLACE_CODINGTYPE { - OMX_TI_Video_Interlace_PICAFF = 0, //!< PicAFF type of interlace coding - OMX_TI_Video_Interlace_MBAFF, //!< MBAFF type of interlace coding - OMX_TI_Video_Interlace_Fieldonly, //!< Field only coding - OMX_TI_Video_Interlace_Fieldonly_MRF=OMX_TI_Video_Interlace_Fieldonly, - OMX_TI_Video_Interlace_Fieldonly_ARF, - OMX_TI_Video_Interlace_Fieldonly_SPF, //!< Field only coding where codec decides the partiy of the field to be used based upon content - OMX_Video_Interlace_MAX = 0x7FFFFFFF -}OMX_TI_VIDEO_AVC_INTERLACE_CODINGTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_FRAMEDATACONTENTTYPE : to configure the data content - @param eContentType to specify Content type - @sa OMX_VIDEO_FRAMECONTENTTYPE -*/ -/* ==========================================================================*/ -typedef struct OMX_TI_VIDEO_PARAM_FRAMEDATACONTENTTYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_VIDEO_FRAMECONTENTTYPE eContentType; -}OMX_TI_VIDEO_PARAM_FRAMEDATACONTENTTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_AVCINTERLACECODING : to configure the interlace encoding related settings - @param eInterlaceCodingType to specify the settings of interlace content - @sa OMX_VIDEO_INTERLACE_CODINGTYPE - @param bTopFieldFirst to specify the first field sent is top or bottom - @param bBottomFieldIntra to specify codec that encode bottomfield also as intra or not -*/ -/* ==========================================================================*/ -typedef struct OMX_TI_VIDEO_PARAM_AVCINTERLACECODING{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_VIDEO_AVC_INTERLACE_CODINGTYPE eInterlaceCodingType; - OMX_BOOL bTopFieldFirst; - OMX_BOOL bBottomFieldIntra; -}OMX_TI_VIDEO_PARAM_AVCINTERLACECODING; -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_AVCENC_STEREOINFO2004 : to configure the 2004 related stereo information type -*/ -/* ==========================================================================*/ - -typedef struct OMX_TI_VIDEO_PARAM_AVCENC_STEREOINFO2004 -{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL btopFieldIsLeftViewFlag; - OMX_BOOL bViewSelfContainedFlag; -} OMX_TI_VIDEO_AVCENC_STEREOINFO2004; - -typedef enum OMX_TI_VIDEO_AVCSTEREO_FRAMEPACKTYPE{ - OMX_TI_Video_FRAMEPACK_CHECKERBOARD = 0, - OMX_TI_Video_FRAMEPACK_COLUMN_INTERLEAVING = 1, - OMX_TI_Video_FRAMEPACK_ROW_INTERLEAVING = 2, - OMX_TI_Video_FRAMEPACK_SIDE_BY_SIDE = 3, - OMX_TI_Video_FRAMEPACK_TOP_BOTTOM = 4, - OMX_TI_Video_FRAMEPACK_TYPE_DEFAULT = OMX_TI_Video_FRAMEPACK_SIDE_BY_SIDE, - OMX_TI_Video_FRAMEPACK_TYPE_MAX = 0x7FFFFFFF -} OMX_TI_VIDEO_AVCSTEREO_FRAMEPACKTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_AVCENC_FRAMEPACKINGINFO2010 : to configure the 2010 related stereo information type -*/ -/* ==========================================================================*/ - -typedef struct OMX_TI_VIDEO_PARAM_AVCENC_FRAMEPACKINGINFO2010 -{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_VIDEO_AVCSTEREO_FRAMEPACKTYPE eFramePackingType; - OMX_U8 nFrame0PositionX; - OMX_U8 nFrame0PositionY; - OMX_U8 nFrame1PositionX; - OMX_U8 nFrame1PositionY; -}OMX_TI_VIDEO_PARAM_AVCENC_FRAMEPACKINGINFO2010; - -/** - * @brief Specifies Transform Block Size - */ -typedef enum OMX_VIDEO_TRANSFORMBLOCKSIZETYPE { - OMX_Video_Transform_Block_Size_4x4 =0, //!< Transform blocks size is 8x8 : Valid for only High Profile - OMX_Video_Transform_Block_Size_8x8, //!< Transform blocks size is 4x4 - OMX_Video_Transform_Block_Size_Adaptive, //!< Adaptive transform block size : encoder decides as per content - OMX_Video_Transform_Block_Size_MAX = 0X7FFFFFFF -}OMX_VIDEO_TRANSFORMBLOCKSIZETYPE; - -/* ========================================================================== */ -/*! - @brief OMX_VIDEO_PARAM_TRANSFORM_BLOCKSIZETYPE : to select the Block Size used for transformation - @param eTransformBlocksize to specify Block size used for transformation - @sa OMX_VIDEO_TRANSFORMBLOCKSIZETYPE -*/ -/* ==========================================================================*/ - -typedef struct OMX_VIDEO_PARAM_TRANSFORM_BLOCKSIZETYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_TRANSFORMBLOCKSIZETYPE eTransformBlocksize; -}OMX_VIDEO_PARAM_TRANSFORM_BLOCKSIZETYPE; - - -/* ========================================================================== */ -/*! - @brief OMX_VIDEO_CONFIG_SLICECODINGTYPE : to configure the Slice Settings - @param eSliceMode to specify the Slice mode - @sa OMX_VIDEO_AVCSLICEMODETYPE - @param nSlicesize to specify the sliceSize -*/ -/* ==========================================================================*/ - -typedef struct OMX_VIDEO_CONFIG_SLICECODINGTYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_AVCSLICEMODETYPE eSliceMode; - OMX_U32 nSlicesize; -}OMX_VIDEO_CONFIG_SLICECODINGTYPE; - -/** - * @brief Specifies Slice Group Change Direction Flag - */ -typedef enum OMX_VIDEO_SLIGRPCHANGEDIRTYPE{ - OMX_Video_Raster_Scan = 0 , //!< 0 : Raster scan order - OMX_Video_Clockwise = 0 , //!< 0 : Clockwise (used for BOX OUT FMO Params) - OMX_Video_Right = 0 , //!< 0 : RIGHT (Used for Wipe FMO type) - OMX_Video_Reverse_Raster_Scan= 1 , //!< 1 : Reverse Raster Scan Order - OMX_Video_Counter_Clockwise = 1 , //!< 1 : Counter Clockwise (used for BOX OUT FMO Params) - OMX_Video_Left = 1, //!< 1 : LEFT (Used for Wipe FMO type) - OMX_Video_Left_MAX = 0X7FFFFFFF -} OMX_VIDEO_SLICEGRPCHANGEDIRTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_FMO_ADVANCEDSETTINGS : to configure the FMO Settings - @param -*/ -/* ==========================================================================*/ -typedef struct OMX_VIDEO_PARAM_AVCADVANCEDFMOTYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U8 nNumSliceGroups; - OMX_U8 nSliceGroupMapType; - OMX_VIDEO_SLICEGRPCHANGEDIRTYPE eSliceGrpChangeDir; - OMX_U32 nSliceGroupChangeRate; - OMX_U32 nSliceGroupChangeCycle; - OMX_U32 nSliceGroupParams[H264ENC_MAXNUMSLCGPS] ; -}OMX_VIDEO_PARAM_AVCADVANCEDFMOTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_CONFIG_QPSETTINGS : to configure the Qp Settings of I, P &B Frames - @param nQpI -*/ -/* ==========================================================================*/ - -typedef struct OMX_VIDEO_CONFIG_QPSETTINGSTYPE{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nQpI; - OMX_U32 nQpMaxI; - OMX_U32 nQpMinI; - OMX_U32 nQpP; - OMX_U32 nQpMaxP; - OMX_U32 nQpMinP; - OMX_U32 nQpOffsetB; - OMX_U32 nQpMaxB; - OMX_U32 nQpMinB; -}OMX_VIDEO_CONFIG_QPSETTINGSTYPE; - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_AVCHRDBUFFERSETTING : to configure the HRD - (Hypothetical Reference Decoder) related params - @param nInitialBufferLevel Initial buffer level for HRD compliance - @param nHRDBufferSize Hypothetical Reference Decoder buffer size - @param nTargetBitrate Target bitrate to encode with -*/ -/* ==========================================================================*/ - -typedef struct OMX_TI_VIDEO_PARAM_AVCHRDBUFFERSETTING { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nInitialBufferLevel; - OMX_U32 nHRDBufferSize; - OMX_U32 nTargetBitrate; -} OMX_TI_VIDEO_PARAM_AVCHRDBUFFERSETTING; - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_CONFIG_AVCHRDBUFFERSETTING : to configure the HRD - (Hypothetical Reference Decoder) related params - @param nHRDBufferSize Hypothetical Reference Decoder Buffer Size - @param nEncodeBitrate Target bitrate to encode with - -*/ -/* ==========================================================================*/ - -typedef struct OMX_TI_VIDEO_CONFIG_AVCHRDBUFFERSETTING { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nHRDBufferSize; - OMX_U32 nEncodeBitrate; -} OMX_TI_VIDEO_CONFIG_AVCHRDBUFFERSETTING; - -/* ========================================================================= */ -/*! - @brief OMX_TI_VIDEO_CODINGTYPE : - Extension to video coding type enum for VP6 and VP7 - @param -*/ -/* ==========================================================================*/ - -typedef enum OMX_TI_VIDEO_CODINGTYPE { - OMX_VIDEO_CodingVP6 = - (OMX_VIDEO_CODINGTYPE) OMX_VIDEO_CodingVendorStartUnused +1, /* VP6 */ - OMX_VIDEO_CodingVP7, /* VP7 */ - OMX_TI_VIDEO_CodingSORENSONSPK, /* Sorenson spark*/ - OMX_VIDEO_CodingSVC, /**< H.264/SVC */ -}OMX_TI_VIDEO_CODINGTYPE; - - -/* ========================================================================= */ -/*! - @brief OMX_TI_VIDEO_MPEG4LEVELTYPE: - Extension to MPEG-4 level to cater to level 6 - @param -*/ -/* ==========================================================================*/ -typedef enum OMX_TI_VIDEO_MPEG4LEVELTYPE { - OMX_TI_VIDEO_MPEG4Level6 = - (OMX_VIDEO_MPEG4LEVELTYPE) OMX_VIDEO_MPEG4LevelVendorStartUnused + 1 -} OMX_TI_VIDEO_MPEG4LEVELTYPE; - - - -/** - * @brief Specifies various intra refresh methods - */ -typedef enum OMX_TI_VIDEO_INTRAREFRESHTYPE { - OMX_TI_VIDEO_IntraRefreshNone = 0, - OMX_TI_VIDEO_IntraRefreshCyclicMbs, - OMX_TI_VIDEO_IntraRefreshCyclicRows, - OMX_TI_VIDEO_IntraRefreshMandatory, - OMX_TI_VIDEO_IntraRefreshMax = 0x7FFFFFFF -} OMX_TI_VIDEO_INTRAREFRESHTYPE; - - -/* ========================================================================== */ -/*! - @brief OMX_TI_VIDEO_PARAM_INTRAREFRESHTYPE : Configuration parameters for - intra refresh settings - @param eRefreshMode Various refresh modes supported - @param nIntraRefreshRate Intra refresh rate -*/ -/* ==========================================================================*/ - -typedef struct OMX_TI_VIDEO_PARAM_INTRAREFRESHTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_TI_VIDEO_INTRAREFRESHTYPE eRefreshMode; - OMX_U32 nIntraRefreshRate; -} OMX_TI_VIDEO_PARAM_INTRAREFRESHTYPE; - - -/* ============================================================================= */ -/*! - @brief OMX_TI_STEREODECINFO : Structure to access 2004 SEI message generated by - H264 decoder as metatadata on its output port. - */ -/* ============================================================================= */ - -typedef struct OMX_TI_STEREODECINFO { - OMX_U32 nFieldViewsFlag; - OMX_U32 nTopFieldIsLeftViewFlag; - OMX_U32 nCurrentFrameIsLeftViewFlag; - OMX_U32 nNextFrameIsSecondViewFlag; - OMX_U32 nLeftViewSelfContainedFlag; - OMX_U32 nRightViewSelfContainedFlag; -} OMX_TI_STEREODECINFO; - -typedef struct OMX_TI_FRAMEPACKINGDECINFO { - OMX_U32 nFramePackingArrangementId; - OMX_U32 nFramePackingArrangementRepetitionPeriod; - OMX_U8 nFramePackingArrangementCancelFlag; - OMX_U8 nFramePackingArrangementType; - OMX_U8 nQuincunxSamplingFlag; - OMX_U8 nContentInterpretationType; - OMX_U8 nSpatialFlippingFlag; - OMX_U8 nFrame0FlippedFlag; - OMX_U8 nFieldViewsFlag; - OMX_U8 nCurrentFrameIsFrame0Flag; - OMX_U8 nFrame0SelfContainedFlag; - OMX_U8 nFrame1SelfContainedFlag; - OMX_U8 nFrame0GridPositionX; - OMX_U8 nFrame0GridPositionY; - OMX_U8 nFrame1GridPositionX; - OMX_U8 nFrame1GridPositionY; - OMX_U8 nFramePackingArrangementReservedByte; - OMX_U8 nFramePackingArrangementExtensionFlag; -} OMX_TI_FRAMEPACKINGDECINFO; - -/* ============================================================================= */ -/*! - @brief OMX_TI_VIDEO_RANGEMAPPING : Structure to access luma and chroma range - mapping generated by decoders as - metatadata on its output port. - @param nRangeMappingLuma Luma scale factor for range mapping. - @param nRangeMappingChroma Chroma scale factor for range mapping. -*/ -/* ============================================================================= */ - -typedef struct OMX_TI_VIDEO_RANGEMAPPING { - OMX_U32 nRangeMappingLuma; - OMX_U32 nRangeMappingChroma; -} OMX_TI_VIDEO_RANGEMAPPING; - -/* ============================================================================= */ -/*! - @brief OMX_TI_VIDEO_RESCALINGMATRIX : Structure to access rescaled - width/height generated by decoders - as metatadata on its output port. - @param nScaledHeight Scaled image width for post processing for decoder. - @param nScaledWidth Scaled image height for post processing for decoder. -*/ -/* ============================================================================= */ - -typedef struct OMX_TI_VIDEO_RESCALINGMATRIX { - OMX_U32 nScaledHeight; - OMX_U32 nScaledWidth; -} OMX_TI_VIDEO_RESCALINGMATRIX; - - -/*==========================================================================*/ -/*! - @brief OMX_TI_PARAM_PAYLOADHEADERFLAG : To specify the payload headerflag - for VP6/VP7 decoder. - @param bPayloadHeaderFlag Flag - TRUE indicates that frame length and - timestamp(for IVF format) will be part of - frame input buffer. - Flag - FALSE indecates that frame length and - timestamp(for IVF format) will not be part of - the input buffer. -*/ -/*==========================================================================*/ - -typedef struct OMX_TI_PARAM_PAYLOADHEADERFLAG { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_BOOL bPayloadHeaderFlag; -} OMX_TI_PARAM_PAYLOADHEADERFLAG; - - -/*==========================================================================*/ -/*! -@brief OMX_TI_PARAM_IVFFLAG : Suport added to handle IVF header Decoding Mode -@param bIvfFlag TRUE enables IVF decoding mode. - FALSE indicates bitstream format is non-IVF. -*/ -/*==========================================================================*/ - -typedef struct OMX_TI_PARAM_IVFFLAG { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_BOOL bIvfFlag; -} OMX_TI_PARAM_IVFFLAG; - -// A pointer to this struct is passed to OMX_SetParameter() when the extension -// index "OMX.google.android.index.storeMetaDataInBuffers" -// is given. -// -// When meta data is stored in the video buffers passed between OMX clients -// and OMX components, interpretation of the buffer data is up to the -// buffer receiver, and the data may or may not be the actual video data, but -// some information helpful for the receiver to locate the actual data. -// The buffer receiver thus needs to know how to interpret what is stored -// in these buffers, with mechanisms pre-determined externally. How to -// interpret the meta data is outside of the scope of this method. -// -// Currently, this is specifically used to pass meta data from video source -// (camera component, for instance) to video encoder to avoid memcpying of -// input video frame data. To do this, bStoreMetaDta is set to OMX_TRUE. -// If bStoreMetaData is set to false, real YUV frame data will be stored -// in the buffers. In addition, if no OMX_SetParameter() call is made -// with the corresponding extension index, real YUV data is stored -// in the buffers. -typedef struct OMX_VIDEO_STOREMETADATAINBUFFERSPARAMS { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bStoreMetaData; -} OMX_VIDEO_STOREMETADATAINBUFFERSPARAMS; - - -/** - * Interlaced Video Content format - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nFormat : bitmapped value indentifying the interlaced formats supported by component - * nTimeStamp : temporal timestamp information for the second field - */ -typedef struct OMX_TI_INTERLACEFORMATTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nFormat; - OMX_TICKS nTimeStamp; -} OMX_TI_INTERLACEFORMATTYPE; - -/** - * Interlace format types - */ -typedef enum OMX_TI_INTERLACETYPE { - OMX_InterlaceFrameProgressive= 0x00, - OMX_InterlaceInterleaveFrameTopFieldFirst= 0x01, - OMX_InterlaceInterleaveFrameBottomFieldFirst= 0x02, - OMX_InterlaceFrameTopFieldFirst= 0x04, - OMX_InterlaceFrameBottomFieldFirst= 0x08, - OMX_InterlaceInterleaveFieldTop= 0x10, - OMX_InterlaceInterleaveFieldBottom= 0x20, - OMX_InterlaceFmtMask= 0x7FFFFFFF -} OMX_TI_INTERLACETYPE; - -/** - * To query if the stream contains interlaced or progressive conten - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * bInterlaceFormat : whether the stream contains interlace or progressive content - * OMX_TRUE indicates interlace and OMX_FALSE indicates progressive - * nInterlaceFormats : bitmapped value identifying the interlace formats detected within the stream - */ -typedef struct OMX_TI_STREAMINTERLACEFORMATTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bInterlaceFormat; - OMX_U32 nInterlaceFormats; -} OMX_TI_STREAMINTERLACEFORMAT; - -/* -@brief OMX_TI_VIDEO_CONFIG_PICSIZECONTROLINFO : Structure to provide the configuration to compute min and max picture size -@param minPicSizeRatio : This ratio is used to compute minimum picture size in the following manner, -minPicSize = averagePicSize >> minPicSizeRatio. Allowed values are 1 to 4. Setting this to 0 will enable encoder chosen ratio. -@param maxPicSizeRatio : This ratio is used to compute maximum picture size in the following manner, -maxPicSize = averagePicSize * maxPicSizeRatio. Allowed values are 2 to 30. Setting this to 0 or 1 will enable encoder chosen ratio. -*/ -/* ============================================================================= */ -typedef struct OMX_TI_VIDEO_CONFIG_PICSIZECONTROLINFO { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U16 minPicSizeRatio; - OMX_U16 maxPicSizeRatio; -} OMX_TI_VIDEO_CONFIG_PICSIZECONTROLINFO; - - -/*!====================================================================! - - Currently we only support SVC baseline profile - - * !====================================================================!*/ - typedef enum OMX_TI_VIDEO_SVCPROFILETYPE { - OMX_VIDEO_SVCProfileBaseline = 0x01, /**< Baseline profile */ - OMX_VIDEO_SVCProfileHigh = 0x02, /**< High profile */ - OMX_VIDEO_SVCProfileHighIntra = 0x03, /**< High Intra profile */ - OMX_VIDEO_SVCProfileMax = 0x7FFFFFFF - } OMX_TI_VIDEO_SVCPROFILETYPE; - - -/*!====================================================================! - - Currently we support only SVC baseline profile upto level 4 for SVC encoder. - - * !====================================================================!*/ - typedef enum OMX_TI_VIDEO_SVCLEVELTYPE { - OMX_VIDEO_SVCLevel1 = 0x01, /**< Level 1 */ - OMX_VIDEO_SVCLevel1b = 0x02, /**< Level 1b */ - OMX_VIDEO_SVCLevel11 = 0x04, /**< Level 1.1 */ - OMX_VIDEO_SVCLevel12 = 0x08, /**< Level 1.2 */ - OMX_VIDEO_SVCLevel13 = 0x10, /**< Level 1.3 */ - OMX_VIDEO_SVCLevel2 = 0x20, /**< Level 2 */ - OMX_VIDEO_SVCLevel21 = 0x40, /**< Level 2.1 */ - OMX_VIDEO_SVCLevel22 = 0x80, /**< Level 2.2 */ - OMX_VIDEO_SVCLevel3 = 0x100, /**< Level 3 */ - OMX_VIDEO_SVCLevel31 = 0x200, /**< Level 3.1 */ - OMX_VIDEO_SVCLevel32 = 0x400, /**< Level 3.2 */ - OMX_VIDEO_SVCLevel4 = 0x800, /**< Level 4 */ - OMX_VIDEO_SVCLevel41 = 0x1000, /**< Level 4.1 */ - OMX_VIDEO_SVCLevel42 = 0x2000, /**< Level 4.2 */ - OMX_VIDEO_SVCLevel5 = 0x4000, /**< Level 5 */ - OMX_VIDEO_SVCLevel51 = 0x8000, /**< Level 5.1 */ - OMX_VIDEO_SVCLevelMax = 0x7FFFFFFF - } OMX_TI_VIDEO_SVCLEVELTYPE; - - - typedef struct OMX_VIDEO_SVC_STD_PARAMS { - OMX_U32 nSliceHeaderSpacing; - OMX_U32 nPFrames; - OMX_U32 nBFrames; - OMX_BOOL bUseHadamard; - OMX_U32 nRefFrames; - OMX_U32 nRefIdx10ActiveMinus1; - OMX_U32 nRefIdx11ActiveMinus1; - OMX_BOOL bEnableUEP; - /* Not needed as per SVC encoder requirements - OMX_BOOL bEnableFMO; - OMX_BOOL bEnableASO; - OMX_BOOL bEnableRS; - */ - OMX_VIDEO_AVCLOOPFILTERTYPE eLoopFilterMode; - OMX_U32 nAllowedPictureTypes; - OMX_BOOL bFrameMBsOnly; - OMX_BOOL bMBAFF; - OMX_BOOL bEntropyCodingCABAC; - OMX_BOOL bWeightedPPrediction; - OMX_U32 nWeightedBipredicitonMode; - OMX_BOOL bconstIpred; - OMX_BOOL bDirect8x8Inference; - OMX_BOOL bDirectSpatialTemporal; - OMX_U32 nCabacInitIdc; - } OMX_VIDEO_SVC_STD_PARAMS; - - - typedef struct OMX_VIDEO_SVC_RECTTYPE { - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; - } OMX_VIDEO_SVC_RECTTYPE; - - - typedef struct OMX_VIDEO_SVC_BITRATETYPE { - OMX_VIDEO_CONTROLRATETYPE eControlRate; - OMX_U32 nTargetBitrate; - } OMX_VIDEO_SVC_BITRATETYPE; - - - typedef struct OMX_VIDEO_SVC_MOTIONVECTORTYPE { - OMX_VIDEO_MOTIONVECTORTYPE eAccuracy; - OMX_BOOL bUnrestrictedMVs; - OMX_BOOL bFourMV; - OMX_S32 sXSearchRange; - OMX_S32 sYSearchRange; - } OMX_VIDEO_SVC_MOTIONVECTORTYPE; - - - typedef struct OMX_VIDEO_SVC_QUANTIZATIONTYPE { - OMX_U32 nQpI; - OMX_U32 nQpP; - OMX_U32 nQpB; - } OMX_VIDEO_SVC_QUANTIZATIONTYPE; - - - typedef struct OMX_VIDEO_SVC_INTRAREFRESHTYPE { - OMX_VIDEO_INTRAREFRESHTYPE eRefreshMode; - OMX_U32 nAirMBs; - OMX_U32 nAirRef; - OMX_U32 nCirMBs; - } OMX_VIDEO_SVC_INTRAREFRESHTYPE; - - - typedef struct OMX_VIDEO_SVC_VBSMCTYPE { - OMX_BOOL b16x16; - OMX_BOOL b16x8; - OMX_BOOL b8x16; - OMX_BOOL b8x8; - OMX_BOOL b8x4; - OMX_BOOL b4x8; - OMX_BOOL b4x4; - } OMX_VIDEO_SVC_VBSMCTYPE; - - - typedef struct OMX_VIDEO_SVC_NALUCONTROLTYPE { - OMX_U32 nStartofSequence; - OMX_U32 nEndofSequence; - OMX_U32 nIDR; - OMX_U32 nIntraPicture; - OMX_U32 nNonIntraPicture; - }OMX_VIDEO_SVC_NALUCONTROLTYPE; - - - typedef struct OMX_VIDEO_SVC_MEBLOCKSIZETYPE { - OMX_VIDEO_BLOCKSIZETYPE eMinBlockSizeP; - OMX_VIDEO_BLOCKSIZETYPE eMinBlockSizeB; - }OMX_VIDEO_SVC_MEBLOCKSIZETYPE; - - - typedef struct OMX_VIDEO_SVC_INTRAPREDTYPE { - OMX_U32 nLumaIntra4x4Enable; - OMX_U32 nLumaIntra8x8Enable; - OMX_U32 nLumaIntra16x16Enable; - OMX_U32 nChromaIntra8x8Enable; - OMX_VIDEO_CHROMACOMPONENTTYPE eChromaComponentEnable; - }OMX_VIDEO_SVC_INTRAPREDTYPE; - - - typedef struct OMX_VIDEO_SVC_ENCODER_PRESETTYPE { - OMX_VIDEO_ENCODING_MODE_PRESETTYPE eEncodingModePreset; - OMX_VIDEO_RATECONTROL_PRESETTYPE eRateControlPreset; - }OMX_VIDEO_SVC_ENCODER_PRESETTYPE; - - - typedef struct OMX_VIDEO_SVC_VUIINFOTYPE { - OMX_BOOL bAspectRatioPresent; - OMX_VIDEO_ASPECTRATIOTYPE ePixelAspectRatio; - OMX_BOOL bFullRange; - }OMX_VIDEO_SVC_VUIINFOTYPE; - - - typedef struct OMX_VIDEO_SVC_HRDBUFFERSETTING { - OMX_U32 nInitialBufferLevel; - OMX_U32 nHRDBufferSize; - OMX_U32 nTargetBitrate; - }OMX_VIDEO_SVC_HRDBUFFERSETTING; - - - typedef struct OMX_VIDEO_SVC_INTRAPERIOD { - OMX_U32 nIDRPeriod; - OMX_U32 nPFrames; - } OMX_VIDEO_SVC_INTRAPERIOD; - - - typedef struct OMX_VIDEO_SVC_PIXELINFOTYPE { - OMX_U32 nWidth; - OMX_U32 nHeight; - } OMX_VIDEO_SVC_PIXELINFOTYPE; - - - typedef struct OMX_VIDEO_SVC_MESEARCHRANGETYPE { - OMX_VIDEO_MOTIONVECTORTYPE eMVAccuracy; - OMX_U32 nHorSearchRangeP; - OMX_U32 nVerSearchRangeP; - OMX_U32 nHorSearchRangeB; - OMX_U32 nVerSearchRangeB; - }OMX_VIDEO_SVC_MESEARCHRANGETYPE; - - - typedef struct OMX_VIDEO_SVC_QPSETTINGSTYPE { - OMX_U32 nQpI; - OMX_U32 nQpMaxI; - OMX_U32 nQpMinI; - OMX_U32 nQpP; - OMX_U32 nQpMaxP; - OMX_U32 nQpMinP; - OMX_U32 nQpOffsetB; - OMX_U32 nQpMaxB; - OMX_U32 nQpMinB; - }OMX_VIDEO_SVC_QPSETTINGSTYPE; - - - typedef struct OMX_VIDEO_SVC_SLICECODINGTYPE { - OMX_VIDEO_AVCSLICEMODETYPE eSliceMode; - OMX_U32 nSlicesize; - }OMX_VIDEO_SVC_SLICECODINGTYPE; - - - typedef struct OMX_VIDEO_EXEC_SVC_HRDBUFFERSETTING { - OMX_U32 nHRDBufferSize; - OMX_U32 nEncodeBitrate; - }OMX_VIDEO_EXEC_SVC_HRDBUFFERSETTING; - -/** - * SVC params - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nSliceHeaderSpacing : Number of macroblocks between slice header, put - * zero if not used - * nPFrames : Number of P frames between each I frame - * nBFrames : Number of B frames between each I frame - * bUseHadamard : Enable/disable Hadamard transform - * nRefFrames : Max number of reference frames to use for inter - * motion search (1-16) - * nRefIdxTrailing : Pic param set ref frame index (index into ref - * frame buffer of trailing frames list), B frame - * support - * nRefIdxForward : Pic param set ref frame index (index into ref - * frame buffer of forward frames list), B frame - * support - * bEnableUEP : Enable/disable unequal error protection. This - * is only valid of data partitioning is enabled. - * bEnableFMO : Enable/disable flexible macroblock ordering - * bEnableASO : Enable/disable arbitrary slice ordering - * bEnableRS : Enable/disable sending of redundant slices - * eProfile : AVC profile(s) to use - * eLevel : AVC level(s) to use - * nAllowedPictureTypes : Specifies the picture types allowed in the - * bitstream - * bFrameMBsOnly : specifies that every coded picture of the - * coded video sequence is a coded frame - * containing only frame macroblocks - * bMBAFF : Enable/disable switching between frame and - * field macroblocks within a picture - * bEntropyCodingCABAC : Entropy decoding method to be applied for the - * syntax elements for which two descriptors appear - * in the syntax tables - * bWeightedPPrediction : Enable/disable weighted prediction shall not - * be applied to P and SP slices - * nWeightedBipredicitonMode : Default weighted prediction is applied to B - * slices - * bconstIpred : Enable/disable intra prediction - * bDirect8x8Inference : Specifies the method used in the derivation - * process for luma motion vectors for B_Skip, - * B_Direct_16x16 and B_Direct_8x8 as specified - * in subclause 8.4.1.2 of the AVC spec - * bDirectSpatialTemporal : Flag indicating spatial or temporal direct - * mode used in B slice coding (related to - * bDirect8x8Inference) . Spatial direct mode is - * more common and should be the default. - * nCabacInitIdx : Index used to init CABAC contexts - * eLoopFilterMode : Enable/disable loop filter - */ - typedef struct OMX_TI_VIDEO_PARAM_SVCTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - - OMX_U32 nActualFrameWidth; - OMX_U32 nActualFrameHeight; - OMX_S32 nStride; - OMX_U32 xFramerate; - OMX_COLOR_FORMATTYPE eColorFormat; - OMX_VIDEO_SVC_RECTTYPE sRecType; - - OMX_VIDEO_SVC_STD_PARAMS sBasicParams; - - OMX_U32 nRefFrames; - OMX_TI_VIDEO_SVCPROFILETYPE eProfile; - OMX_TI_VIDEO_SVCLEVELTYPE eLevel; - - OMX_U32 xEncodeFramerate; - OMX_VIDEO_SVC_BITRATETYPE sBitRateParams; - - OMX_VIDEO_SVC_MOTIONVECTORTYPE sMotionVectorParams; - OMX_VIDEO_SVC_QUANTIZATIONTYPE sQuantizationParams; - OMX_VIDEO_SVC_INTRAREFRESHTYPE sIntraRefreshParams; - OMX_VIDEO_SVC_VBSMCTYPE sVBSMCParams; - - //OMX_NALUFORMATSTYPE eNaluFormat; - OMX_VIDEO_SVC_NALUCONTROLTYPE sNalUnitParams; - - OMX_VIDEO_SVC_MEBLOCKSIZETYPE sMEBlockSizeParams; - OMX_VIDEO_SVC_INTRAPREDTYPE sIntraPredParams; - OMX_VIDEO_SVC_ENCODER_PRESETTYPE sEncPresetParams; - OMX_VIDEO_TRANSFORMBLOCKSIZETYPE eTransformBlocksize; - OMX_VIDEO_SVC_VUIINFOTYPE sVUIInfoParams; - OMX_VIDEO_SVC_HRDBUFFERSETTING sHRDBufferParams; - - OMX_U32 nNumTemporalLayers; - OMX_S32 nDependencyID; - OMX_S32 nQualityID; - //OMX_VIDEO_SVC_ENCODE_MODE eModeOfEncode; - - OMX_U32 nErrorConcealmentMode; - OMX_U32 nDeblockFilterMode; - } OMX_TI_VIDEO_PARAM_SVCTYPE; - - typedef struct OMX_TI_VIDEO_CONFIG_SVCLAYERDETAILS { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - - OMX_U32 nNumLayers; - OMX_U32 nLayerId; - OMX_U8 nPriorityId; - OMX_U8 nDependencyId; - OMX_U8 nQualityId; - OMX_U8 nTemporalId; - OMX_U8 nBitrateInfoPresentFlag; - OMX_U8 nFramerateInfoPresentFlag; - OMX_U8 nFramesizeInfoPresentFlag; - OMX_U16 nAvgBitrate; - OMX_U16 nMaxBitrate; - OMX_U16 nAvgFramerate; - OMX_U32 nFrameWidth; - OMX_U32 nFrameHeight; - - OMX_U32 nLayerIndex; /* Used to query for individual layer details */ - -} OMX_TI_VIDEO_CONFIG_SVCLAYERDETAILS; - -typedef struct OMX_TI_VIDEO_CONFIG_SVCTARGETLAYER { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - - OMX_U32 nSvcTargetLayerDID; - OMX_U32 nSvcTargetLayerTID; - OMX_U32 nSvcTargetLayerQID; - -} OMX_TI_VIDEO_CONFIG_SVCTARGETLAYER; -/* ========================================================================== */ -/*! -@brief OMX_TI_VIDEO_SLICEDATAINFO : to configure the Slice Settings -@param nNumofSlices number of validfields to be read -@param nSliceSizeConfigured variable that indicates the MaxSlice configured - & (n*nSliceSizeConfigured) gives the buff offset - for nth slice in the o/p buffer -@param nSliceSize gives the SliceSize -*/ -/* ==========================================================================*/ -typedef struct OMX_TI_VIDEO_SLICEDATAINFO { - OMX_U32 nNumofSlices; - OMX_U32 nSliceSizeConfigured; - OMX_U32 nSliceSize[OMXH264E_MAX_SLICE_SUPPORTED]; -} OMX_TI_VIDEO_SLICEDATAINFO; -/** -* @brief mode selection for the data that is given to the Codec - */ - -typedef enum _OMX_VIDEO_AVCLTRMODE { - OMX_H264ENC_LTRP_NONE = 0, - /**< No longterm refernce frame in the sequnce - */ - OMX_H264ENC_LTRP_REFERTOIDR = 1, - /**< Mark all the I frames as long term-reference frames and - * based on the frame control IH264ENC_Control, refere to - * a long-term reference frame (I frame). - */ - OMX_H264ENC_LTRP_REFERTOP_PROACTIVE =2, - /**< Two long term frames are supported in this schme and - * long-term index marking and refernce frame update is done based - * the IH264ENC_Control values - */ - OMX_H264ENC_LTRP_REFERTOP_REACTIVE = 3 - /**< This is not supported in the current version of encoder - */ -} OMX_VIDEO_AVCLTRMODE; - - -/* ============================================================================= */ -/* -@brief OMX_TI_VIDEO_PARAM_AVC_LTRP : Structure to enable the configuration of Long Term reference Picture feature in H264 Encoder for the session -Enabling this parameter will instruct encoder to keep its recent I/IDR frame in its reference buffer list. -So it increases the DDR foot print by one frame buffer -@param eLTRMode : enables the LongTerm Reference Picture, possible modes: 0, 1, 2 -@param nLTRInterval : interval of the write indicating to codec interms of the frame number -*/ -/* ============================================================================= */ -typedef struct OMX_TI_VIDEO_PARAM_AVC_LTRP{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_AVCLTRMODE eLTRMode; - OMX_U32 nLTRInterval; -} OMX_TI_VIDEO_PARAM_AVC_LTRP; - -/* -@brief OMX_TI_VIDEO_CONFIG_AVC_LTRP : Structure to provide the configuration to acknowledge successful decode of previous LTR -@param eLTRFrameDecoded : tells the decoder that the LTR has been decoded successfully when set to TRUE -*/ -/* ============================================================================= */ -typedef struct OMX_TI_VIDEO_CONFIG_AVC_LTRP{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnableNextLTR; -} OMX_TI_VIDEO_CONFIG_AVC_LTRP; - -/* ============================================================================= */ -/* -@brief OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL : Structure to enable the update of the LTRP -Interval during runtime -@param nLTRInterval : interval of the write indicating to codec interms of the frame number -*/ -/* ============================================================================= */ -typedef struct OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nLTRInterval; -} OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL; - -/* ============================================================================= */ -/* -@brief OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL : Structure to enable timestamps in decode order - at i/p of decoders. -*/ -/* ============================================================================= */ -typedef struct OMX_TI_PARAM_TIMESTAMP_IN_DECODE_ORDER{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_BOOL bEnabled; -} OMX_TI_PARAM_TIMESTAMP_IN_DECODE_ORDER; - -/* ============================================================================= */ -/* -@brief OMX_TI_VIDEO_PARAM_AUTO_FRAMERATE_UPDATE : Structure to enable dynamic update of frame rate -*/ -/* ============================================================================= */ -typedef struct OMX_TI_VIDEO_PARAM_AUTO_FRAMERATE_UPDATE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnableAutoVFRUpdate; - OMX_U32 nDiffThresholdtoUpdate; - OMX_U32 nMaxSessionFrameRate; -} OMX_TI_VIDEO_PARAM_AUTO_FRAMERATE_UPDATE; - -/* ============================================================================= */ -/* -@brief OMX_TI_PARAM_SKIP_GREY_OUTPUT_FRAMES : Structure to enable feature to skip grey output - frames which doesn't have proper reference. -*/ -/* ============================================================================= */ -typedef struct OMX_TI_PARAM_SKIP_GREY_OUTPUT_FRAMES { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_BOOL bEnabled; -} OMX_TI_PARAM_SKIP_GREY_OUTPUT_FRAMES; - -/* ============================================================================= */ -/* -@brief OMX_TI_PARAM_DECMETADATA : Structure to enable different codec metadata - for video decoders. -*/ -/* ============================================================================= */ -typedef struct OMX_TI_PARAM_DECMETADATA { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnableMBInfo; - OMX_BOOL bEnableTranscodeMode; - OMX_BOOL bEnableSEIInfo; - OMX_BOOL bEnableVUIInfo; -} OMX_TI_PARAM_DECMETADATA; - -/** - ****************************************************************************** - * @enum OMX_TI_VIDEO_MBERRSTATUS - * @brief This enum indicates if a MB was in error or not - * - ****************************************************************************** -*/ -typedef enum { - OMX_TI_VIDEO_MB_NOERROR = 0, - /** - * MB was non-erroneous - */ - OMX_TI_VIDEO_MB_ERROR = 1 - /** - * MB was erroneous - */ -} OMX_TI_VIDEO_MBERRSTATUS; - - -/** - * Macro definitions required for SEI support: HRD sequence parameter set - */ -#define OMX_TI_VIDEO_H264VDEC_MAXCPBCNT 32 - -/** - * Macro definitions required for SEI support: HRD sequence parameter set - */ -#define OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD 300 - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_HrdParams - * - * @brief This structure contains the HRD parameter elements. - * - * @param cpb_cnt_minus1 : Number of alternative CPB specifications in the - * bit-stream - * @param bit_rate_scale : Together with bit_rate_value[i], it specifies the - * maximum input bit-rate for the ith CPB. - * @param cpb_size_scale : Together with cpb_size_value[i], specifies the - * maximum CPB size for the ith CPB. - * @param bit_rate_value_minus1[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT] :Maximum input bitrate - * for the ith CPB - * @param cpb_size_value_minus1[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT] :Maximum CPB size for the - * ith CPB - * @param vbr_cbr_flag[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT] :Specifies the ith CPB is operated - * in Constant Bit-rate mode or variable bit-rate mode - * @param initial_cpb_removal_delay_length_minus1 :Length in bits of - * initial_cpb_removal_length syntax element - * @param cpb_removal_delay_length_minus1 :Length in bits of - * cpb_removal_delay_length syntax element - * @param dpb_output_delay_length_minus1 :Length in bits of - * dpb_output_delay_length syntax element - * @param time_offset_length : Length in bits of time_offset syntax element - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_HrdParams { - OMX_U32 cpb_cnt_minus1; - OMX_U8 bit_rate_scale; - OMX_U8 cpb_size_scale; - OMX_U32 bit_rate_value_minus1[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; - OMX_U32 cpb_size_value_minus1[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; - OMX_U8 vbr_cbr_flag[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; - OMX_U8 initial_cpb_removal_delay_length_minus1; - OMX_U8 cpb_removal_delay_length_minus1; - OMX_U8 dpb_output_delay_length_minus1; - OMX_U8 time_offset_length; -} OMX_TI_VIDEO_H264VDEC_HrdParams; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SVCVuiParams - * - * @brief This structure contains VUI message syntax elements for scalable - * video stream - * - * @param parsed_flag :1 - Indicates that in the current process call, c - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * - * @param svc_vui_ext_num_entries_minus1:(svc_vui_ext_num_entries_minus1 + 1) - * specifies the number of information - * entries that are present in the SVC - * VUI parameters extension syntax - * structure - * @param svc_vui_ext_dependency_id:indicate the max value of DId for the - * i-th subset of coded video sequences - * @param svc_vui_ext_quality_id:indicate the max value of QId for the - * i-th subset of coded video sequences - * @param svc_vui_ext_temporal_id: indicate the max value of TId for the - * i-th subset of coded video sequences - * @param svc_vui_ext_timing_info_present_flag: Flag to tells that - * svc_vui_ext_num_units_in_tick, - * svc_vui_ext_time_scale, - * svc_vui_ext_fixed_frame_rate_flag - * are present for current coded - * sequence or not. - * @param svc_vui_ext_num_units_in_tick: specifies the value of num_units_in_tick - * @param svc_vui_ext_time_scale: specifies the value of time_scale - * @param svc_vui_ext_fixed_frame_rate_flag: specifies the value of - * fixed_frame_rate_flag - * @param svc_vui_ext_nal_hrd_parameters_present_flag:specifies the - * value of nal_hrd_parameters_present_flag - * @param svc_vui_ext_vcl_hrd_parameters_present_flag: ] specifies the - * value of vcl_hrd_parameters_present_flag - * @param svc_vui_ext_low_delay_hrd_flag: specifies the value - * of low_delay_hrd_flag - * @param svc_vui_ext_pic_struct_present_flag: specifies the value - * of pic_struct_present_flag - * - ****************************************************************************** -*/ - -typedef struct sOMX_TI_VIDEO_H264VDEC_SVCVuiParams { - OMX_U32 parsed_flag; - OMX_U16 svc_vui_ext_num_entries_minus1; - OMX_U16 svc_vui_ext_dependency_id; - OMX_U16 svc_vui_ext_quality_id; - OMX_U16 svc_vui_ext_temporal_id; - OMX_U16 svc_vui_ext_timing_info_present_flag; - OMX_U32 svc_vui_ext_num_units_in_tick; - OMX_U32 svc_vui_ext_time_scale; - OMX_U16 svc_vui_ext_fixed_frame_rate_flag; - OMX_U16 svc_vui_ext_nal_hrd_parameters_present_flag; - OMX_U16 svc_vui_ext_vcl_hrd_parameters_present_flag; - OMX_U16 svc_vui_ext_low_delay_hrd_flag; - OMX_U16 svc_vui_ext_pic_struct_present_flag; -} OMX_TI_VIDEO_H264VDEC_SVCVuiParams; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_VuiParams - * - * @brief This structure contains the VUI Sequence Parameter elements. - * - * @param parsed_flag :1 - Indicates that in the current process call, c - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param aspect_ratio_info_present_flag :Indicates whether aspect ratio idc - * is present or not. - * @param aspect_ratio_idc : Aspect ratio of Luma samples - * @param sar_width : Horizontal size of sample aspect ratio - * @param sar_height : Vertical size of sample aspect ratio - * @param overscan_info_present_flag : Cropped decoded pictures are suitable - * for display or not. - * @param overscan_appropriate_flag : Overscan_appropriate_flag - * @param video_signal_type_present_flag : Flag indicates whether - * video_format, video_full_range_flag and colour_description_present_ - * flag are present or not - * @param video_format :Video format indexed by a table. For example,PAL/NTSC - * @param video_full_range_flag : Black level, luma and chroma ranges. It - * should be used for BT.601 compliance - * @param colour_description_present_flag:Indicates whether colour_primaries, - * transfer_characteristics and matrix_coefficients are present. - * @param colour_primaries :Chromaticity co-ordinates of source primaries - * @param transfer_characteristics :Opto-electronic transfer characteristics - * of the source picture - * @param matrix_coefficients :Matrix coefficients for deriving Luma and - * chroma data from RGB components. - * @param chroma_location_info_present_flag : Flag indicates whether - * chroma_sample_loc_type_top field and chroma_sample_loctype - * bottom_field are present. - * @param chroma_sample_loc_type_top_field : Location of chroma_sample top - * field - * @param chroma_sample_loc_type_bottom_field :Location of chroma_sample - * bottom field - * @param timing_info_present_flag :Indicates whether num_units_in_tick, - * time_scale, and fixed_frame_rate_flag are present. - * @param num_units_in_tick :Number of units of a clock that corresponds to 1 - * increment of a clock tick counter - * @param time_scale :Indicates actual increase in time for 1 increment of a - * clock tick counter - * @param fixed_frame_rate_flag :Indicates how the temporal distance between - * HRD output times of any two output pictures is constrained - * @param nal_hrd_parameters_present_flag :Indicates whether - * nal_hrd_parameters are present - * @param nal_hrd_pars : NAL HRD Parameters - * @param vcl_hrd_parameters_present_flag :Indicates whether - * vcl_hrd_parameters are present - * @param vcl_hrd_pars : VCL HRD Parameters - * @param low_delay_hrd_flag :HRD operational mode as in Annex C of the - * standard - * @param pic_struct_present_flag :Indicates whether picture timing SEI - * messages are present - * @param bitstream_restriction_flag :Indicates if the bit-stream restriction - * parameters are present - * @param motion_vectors_over_pic_boundaries_flag :Specifies whether motion - * vectors can point to regions outside the picture boundaries - * @param max_bytes_per_pic_denom :Maximum number of bytes not exceeded by - * the sum of sizes of all VCL NAL units of a single coded picture - * @param max_bits_per_mb_denom :Maximum number of bits taken by any coded MB - * @param log2_max_mv_length_vertical :Maximum value of any motion vector\u2019s - * vertical component - * @param log2_max_mv_length_horizontal :Maximum value of any motion vector\u2019s - * horizontal component - * @param max_dec_frame_reordering : - * @param num_reorder_frames :Maximum number of frames that need to be - * re-ordered - * @param max_dec_frame_buffering :Size of HRD decoded buffer (DPB) in terms - * of frame buffers - * @param svcVuiParams : struct instance of vui parameters for svc - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_VuiParams { - OMX_U32 parsed_flag; - OMX_U8 aspect_ratio_info_present_flag; - OMX_U32 aspect_ratio_idc; - OMX_U32 sar_width; - OMX_U32 sar_height; - OMX_U8 overscan_info_present_flag; - OMX_U8 overscan_appropriate_flag; - OMX_U8 video_signal_type_present_flag; - OMX_U8 video_format; - OMX_U8 video_full_range_flag; - OMX_U8 colour_description_present_flag; - OMX_U8 colour_primaries; - OMX_U8 transfer_characteristics; - OMX_U8 matrix_coefficients; - OMX_U8 chroma_location_info_present_flag; - OMX_U32 chroma_sample_loc_type_top_field; - OMX_U32 chroma_sample_loc_type_bottom_field; - OMX_U8 timing_info_present_flag; - OMX_U32 num_units_in_tick; - OMX_U32 time_scale; - OMX_U8 fixed_frame_rate_flag; - OMX_U8 nal_hrd_parameters_present_flag; - OMX_TI_VIDEO_H264VDEC_HrdParams nal_hrd_pars; - OMX_U8 vcl_hrd_parameters_present_flag; - OMX_TI_VIDEO_H264VDEC_HrdParams vcl_hrd_pars; - OMX_U8 low_delay_hrd_flag; - OMX_U8 pic_struct_present_flag; - OMX_U8 bitstream_restriction_flag; - OMX_U8 motion_vectors_over_pic_boundaries_flag; - OMX_U32 max_bytes_per_pic_denom; - OMX_U32 max_bits_per_mb_denom; - OMX_U32 log2_max_mv_length_vertical; - OMX_U32 log2_max_mv_length_horizontal; - OMX_U32 max_dec_frame_reordering; - OMX_U32 num_reorder_frames; - OMX_U32 max_dec_frame_buffering; - OMX_TI_VIDEO_H264VDEC_SVCVuiParams svcVuiParams; -} OMX_TI_VIDEO_H264VDEC_VuiParams; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiUserDataRegITUT - * - * @brief This structure contains the user data SEI msg elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param num_payload_bytes :Specifies the size of the payload - * @param itu_t_t35_country_code : A byte having a value specified as a - * country code by ITU-T Recommendation T.35 Annex A - * @param itu_t_t35_country_code_extension_byte :A byte having a value - * specified as a country code by ITU-T Recommendation T.35 Annex B - * @param itu_t_t35_payload_byte[] : A byte containing data registered as - * specified by ITU-T Recommendation T.35. - * @param dataOverflowFlag: This indicates if pay load data is more than the - * array size i.e., OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD. - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiUserDataRegITUT { - OMX_U32 parsed_flag; - OMX_U32 num_payload_bytes; - OMX_U8 itu_t_t35_country_code; - OMX_U8 itu_t_t35_country_code_extension_byte; - OMX_U8 itu_t_t35_payload_byte[OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD]; - OMX_U8 dataOverflowFlag; -} OMX_TI_VIDEO_H264VDEC_SeiUserDataRegITUT; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiUserDataUnReg - * - * @brief This structure contains the user data SEI msg elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param num_payload_bytes :Specifies the size of the payload - * @param uuid_iso_iec_11578 :Value specified as a UUID according to the - * procedures of ISO/IEC 11578:1996 Annex A. - * @param user_data_payload_byte :Byte containing data having syntax and - * semantics as specified by the UUID generator. - * @param dataOverflowFlag: This indicates if pay load data is more than the - * array size i.e., OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD. - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiUserDataUnReg { - OMX_U32 parsed_flag; - OMX_U32 num_payload_bytes; - OMX_U8 uuid_iso_iec_11578[16]; - OMX_U8 user_data_payload_byte[OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD]; - OMX_U8 dataOverflowFlag; -} OMX_TI_VIDEO_H264VDEC_SeiUserDataUnReg; - - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiBufferingPeriod - * - * @brief This structure contains the buffering period SEI msg elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param seq_parameter_set_id :Specifies the sequence parameter set that - * contains the sequence HRD attributes - * @param nal_cpb_removal_delay :Specifies the delay for the indexed NAL CPB - * between the time of arrival in the CPB of the first bit of the - * coded data associated with the access unit associated with the - * buffering period SEI message and the time of removal from the CPB - * of the coded data associated with the same access unit, for the - * first buffering period after HRD initialization. - * @param nal_cpb_removal_delay_offset :Used for the indexed NAL CPB in - * combination with the cpb_removal_delay to specify the initial - * delivery time of coded access units to the CPB - * @param vcl_cpb_removal_delay :Specifies the delay for the indexed VCL CPB - * between the time of arrival in the CPB of the first bit of the - * coded data associated with the access unit associated with the - * buffering period SEI message and the time of removal from the CPB - * of the coded data associated with the same access unit, for the - * first buffering period after HRD initialization. - * @param vcl_cpb_removal_delay_offset :Used for the indexed VCL CPB in - * combination with the cpb_removal_delay to specify the initial - * delivery time of coded access units to the CPB - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiBufferingPeriod { - OMX_U32 parsed_flag; - OMX_U32 seq_parameter_set_id; - OMX_U32 nal_cpb_removal_delay[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; - OMX_U32 nal_cpb_removal_delay_offset[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; - OMX_U32 vcl_cpb_removal_delay[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; - OMX_U32 vcl_cpb_removal_delay_offset[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; -}OMX_TI_VIDEO_H264VDEC_SeiBufferingPeriod; -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiPanScanRect - * - * @brief This structure contains the pan scan rectangle SEI msg elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param pan_scan_rect_id :Specifies an identifying number that may be used - * to identify the purpose of the pan-scan rectangle - * @param pan_scan_rect_cancel_flag :Equal to 1 indicates that the SEI - * message cancels the persistence of any previous pan-scan - * rectangle SEI message in output order. - * pan_scan_rect_cancel_flag equal to 0 indicates that - * pan-scan rectangle information follows. - * @param pan_scan_cnt_minus1 :Specifies the number of pan-scan rectangles - * that are present in the SEI message - * @param pan_scan_rect_left_offset :Specifies as signed integer quantities - * in units of one-sixteenth sample spacing relative to the luma - * sampling grid, the location of the pan-scan rectangle - * @param pan_scan_rect_right_offset :Specifies as signed integer quantities - * in units of one-sixteenth sample spacing relative to the luma - * sampling grid, the location of the pan-scan rectangle - * @param pan_scan_rect_top_offset : Top offset - * @param pan_scan_rect_bottom_offset : Bottom offset - * @param pan_scan_rect_repetition_period :Specifies the persistence of the - * pan-scan rectangle SEI message and may specify a picture order - * count interval within which another pan-scan rectangle SEI message - * with the same value of pan_scan_rect_id or the end of the coded - * video sequence shall be present in the bit-stream - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiPanScanRect { - OMX_U32 parsed_flag; - OMX_U32 pan_scan_rect_id; - OMX_U32 pan_scan_rect_cancel_flag; - OMX_U32 pan_scan_cnt_minus1; - OMX_S32 pan_scan_rect_left_offset[3]; - OMX_S32 pan_scan_rect_right_offset[3]; - OMX_S32 pan_scan_rect_top_offset[3]; - OMX_S32 pan_scan_rect_bottom_offset[3]; - OMX_U32 pan_scan_rect_repetition_period; -} OMX_TI_VIDEO_H264VDEC_SeiPanScanRect; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiProgRefineStart - * - * @brief This structure contains the progressive refinement start SEI msg - * elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param progressive_refinement_id :Specifies an identification number for - * the progressive refinement operation. - * @param num_refinement_steps_minus1 :Specifies the number of reference - * frames in the tagged set of consecutive coded pictures - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiProgRefineStart { - OMX_U32 parsed_flag; - OMX_U32 progressive_refinement_id; - OMX_U32 num_refinement_steps_minus1; -} OMX_TI_VIDEO_H264VDEC_SeiProgRefineStart; -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiProgRefineEnd - * - * @brief TThis structure contains the progressive refinement end SEI msg - * elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param progressive_refinement_id :Specifies an identification number for - * the progressive refinement operation. - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiProgRefineEnd { - OMX_U32 parsed_flag; - OMX_U32 progressive_refinement_id; -} OMX_TI_VIDEO_H264VDEC_SeiProgRefineEnd; -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiRecoveryPointInfo - * - * @brief This structure contains the sRecovery Point Info SEI msg elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param exact_match_flag :Indicates whether decoded pictures at and - * subsequent to the specified recovery point in output order derived - * by starting the decoding process at the access unit associated with - * the recovery point SEI message, will be an exact match to the - * pictures that would be produced by starting the decoding process - * at the location of a previous IDR access unit in the NAL unit stream. - * @param recovery_frame_cnt :Specifies the recovery point of output pictures - * in output order - * @param broken_link_flag :Indicates the presence or absence of a broken - * link in the NAL unit stream - * @param changing_slice_group_idc :Indicates whether decoded pictures are - * correct or approximately correct in content at and subsequent to - * the recovery point in output order when all macro-blocks of the - * primary coded pictures are decoded within the changing slice group - * period. - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiRecoveryPointInfo { - OMX_U32 parsed_flag; - OMX_U32 recovery_frame_cnt; - OMX_U32 exact_match_flag; - OMX_U32 broken_link_flag; - OMX_U32 changing_slice_group_idc; -} OMX_TI_VIDEO_H264VDEC_SeiRecoveryPointInfo; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiPictureTiming - * - * @brief This structure contains the picture timing SEI msg elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param NumClockTs : - * @param cpb_removal_delay :Specifies how many clock ticks to wait after - * removal from the CPB of the access unit associated with the - * most recent buffering period SEI message before removing from - * the buffer the access unit data associated with the picture - * timing SEI message. - * @param dpb_output_delay : Used to compute the DPB output time of the - * picture. - * @param pic_struct : Indicates whether a picture should be displayed as - * a frame or field - * @param clock_time_stamp_flag[4]:1 - Indicates number of clock timestamp - * syntax elements present and follow immediately - * 0 \u2013 Indicates associated clock timestamp syntax - * elements not present - * @param ct_type[4] : Indicates the scan type(interlaced or progressive) - * of the source material - * @param nuit_field_based_flag[4] : Used to calculate the clockTimestamp - * @param counting_type[4] : Specifies the method of dropping values of - * n_frames - * @param full_timestamp_flag[4] : 1 - Specifies that the n_frames syntax - * element is followed by seconds_value, - * minutes_value, and hours_value. - * 0 - Specifies that the n_frames syntax - * element is followed by seconds_flag - * @param discontinuity_flag[4] : Indicates whether the difference between - * the current value of clockTimestamp and the value of - * clockTimestamp computed from the previous clockTimestamp in - * output order can be interpreted as the time difference between - * the times of origin or capture of the associated frames or - * fields. - * @param cnt_dropped_flag[4] : Specifies the skipping of one or more - * values of n_frames using the counting method - * @param n_frames[4] : Specifies the value of nFrames used to compute - * clockTimestamp. - * @param seconds_flag[4] : equal to 1 specifies that seconds_value and - * minutes_flag are present when - * full_timestamp_flag is equal to 0. - * @param minutes_flag[4] : equal to 1 specifies that minutes_value and - * hours_flag are present when full_timestamp_flag - * is equal to 0 and seconds_flag is equal to 1. - * @param hours_flag[4] : equal to 1 specifies that hours_value is - * present when full_timestamp_flag is equal to 0 - * and seconds_flag is equal to 1 and minutes_flag - * is equal to 1. - * @param seconds_value[4] : Specifies the value of sS used to compute - * clockTimestamp. - * @param minutes_value[4] : Specifies the value of mM used to compute - * clockTimestamp. - * @param hours_value[4] : Specifies the value of tOffset used to compute - * clockTimestamp - * @param time_offset[4] : Specifies the value of tOffset used to compute - * clockTimestamp - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiPictureTiming { - OMX_U32 parsed_flag; - OMX_U32 NumClockTs; - OMX_U32 cpb_removal_delay; - OMX_U32 dpb_output_delay; - OMX_U32 pic_struct; - OMX_U32 clock_time_stamp_flag[4]; - OMX_U32 ct_type[4]; - OMX_U32 nuit_field_based_flag[4]; - OMX_U32 counting_type[4]; - OMX_U32 full_timestamp_flag[4]; - OMX_U32 discontinuity_flag[4]; - OMX_U32 cnt_dropped_flag[4]; - OMX_U32 n_frames[4]; - OMX_U32 seconds_flag[4]; - OMX_U32 minutes_flag[4]; - OMX_U32 hours_flag[4]; - OMX_U32 seconds_value[4]; - OMX_U32 minutes_value[4]; - OMX_U32 hours_value[4]; - OMX_S32 time_offset[4]; -}OMX_TI_VIDEO_H264VDEC_SeiPictureTiming; -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRep - * - * @brief This structure contains the full frmae freeze repetition SEI msg - * elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param full_frame_freeze_repetition_period :Specifies the persistence of - * the full-frame freeze SEI message - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRep { - OMX_U32 parsed_flag; - OMX_U32 full_frame_freeze_repetition_period; -} OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRep; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRel - * - * @brief This structure contains frame freeze release SEI msg elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param payloadSize : Size of the frame_freeze_release payload - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRel { - OMX_U32 parsed_flag; - OMX_U32 payloadSize; -} OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRel; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiStereoVideoInfo - * - * @brief This structure contains stereo video information SEI msg elements - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param field_views_flag : 1 - indicates that all pictures in the current - * coded video sequence are fields - * 0 - indicates that all pictures in the current - * coded video sequence are frames. - * @param top_field_is_left_view_flag : - * 1 - top field is a left view. - * 0 - topfield is right view. - * @param current_frame_is_left_view_flag : - * 1 - current frame is left view. - * 0 - current frame is right view. - * @param next_frame_is_second_view_flag : - * 1 - current picture and a next picture in - * output order form a stereo video pair. - * 0 - current picture and a previous picture in - * output order form a stereo video pair. - * @param left_view_self_contained_flag : - * 1 - it will not use right view as a reference - * picture for inter prediction - * 0 - it may use right view as a reference - * picture for inter prediction. - * @param right_view_self_contained_flag : - * 1 - it will not use left view as a reference - * picture for inter prediction - * 0 - it may use left view as a reference - * picture for inter prediction. - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiStereoVideoInfo { - OMX_U32 parsed_flag; - OMX_U32 field_views_flag; - OMX_U32 top_field_is_left_view_flag; - OMX_U32 current_frame_is_left_view_flag; - OMX_U32 next_frame_is_second_view_flag; - OMX_U32 left_view_self_contained_flag; - OMX_U32 right_view_self_contained_flag; -} OMX_TI_VIDEO_H264VDEC_SeiStereoVideoInfo; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiFramePacking - * - * @brief This structure contains frame packing arrangement SEI msg elements - * - * @param frame_packing_arrangement_id : - * contains an identifying number that may be used to identify - * the usage of the frame packing arrangement SEI message. - * @param frame_packing_arrangement_cancel_flag : - * 1 - equal to 1 indicates that the frame packing arrangement - * SEI message cancels the persistence of any previous frame - * packing arrangement SEI message in output order. - * 0 - indicates that frame packing arrangement info follows - * @param frame_packing_arrangement_type : - * indicates the type of packing arrangement of the frames - * @param quincunx_sampling_flag : - * 1 - indicates that each color component plane of each - * constituent frame is quincunx sampled - * 0 - indicates that each color component plane of each - * constituent frame is not quincunx sampled - * @param content_interpretation_type : - * 1 - frame 0 being associated with the left view and frame 1 - * being associated with the right view - * 2 - frame 0 being associated with the right view and frame 1 - * being associated with the left view - * @param spatial_flipping_flag : - * 1 - spatial flipping is enabled for any one of the frame - * constituent, if frame_packing_arrangement_type is 3 or 4. - * 0 - spatial flipping is disabled for any one of the frame - * constituent, if frame_packing_arrangement_type is 3 or 4. - * @param frame0_flipped_flag : - * 1 - frame 0 is spatially flipped - * 0 - frame 1 is spatially flipped - * @param field_views_flag : - * 1 - indicates that all pictures in the current coded video - * sequence are coded as complementary field pairs. - * 0 - indicates that all pictures in the current coded video - * sequence are coded as frame. - * @param current_frame_is_frame0_flag : - * 1 - indicates that the current decoded frame is constituent - * frame 0 and the next decoded frame in output order - * is constituent frame 1. - * 0 - indicates that the current decoded frame is constituent - * frame 1 and the next decoded frame in output order - * is constituent frame 0. - * @param frame0_self_contained_flag : - * 1 - indicates that the constituent frame 0 is dependent on - * constituent frame 1 in decoding process - * 0 - indicates that the constituent frame 0 may dependent on - * constituent frame 1 in decoding process - * @param frame1_self_contained_flag : - * 1 - indicates that the constituent frame 1 is dependent on - * constituent frame 0 in decoding process - * 0 - indicates that the constituent frame 1 may dependent on - * constituent frame 0 in decoding process - * @param frame0_grid_position_x : - * specifies the horizontal location of the upper left - * sample of constituent frame 0 in the units of one - * sixteenth of the luma samples - * @param frame0_grid_position_y : - * specifies the vertical location of the upper left - * sample of constituent frame 0 in the units of one - * sixteenth of the luma samples - * @param frame1_grid_position_x : - * specifies the horizontal location of the upper left - * sample of constituent frame 1 in the units of one - * sixteenth of the luma samples - * @param frame1_grid_position_y : - * specifies the vertical location of the upper left - * sample of constituent frame 1 in the units of one - * sixteenth of the luma samples - * @param frame_packing_arrangement_reserved_byte : - * reserved for the future use. - * @param frame_packing_arrangement_repetition_period : - * specifies the persistence of the frame packing arrangement - * SEI message and may specify a frame order count interval - * within which another frame packing arrangement SEI message - * with the same value of frame_packing_arrangement_id or the - * end of the coded video sequence shall be present in the - * bitstream. - * @param frame_packing_arrangement_extension_flag : - * 0 - indicates that no additional data follows within the - * frame packing arrangement SEI message. - * 1 - Reserved for the future use. - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiFramePacking { - OMX_U32 parsed_flag; - OMX_U32 frame_packing_arrangement_id; - OMX_U32 frame_packing_arrangement_repetition_period; - OMX_U8 frame_packing_arrangement_cancel_flag; - OMX_U8 frame_packing_arrangement_type; - OMX_U8 quincunx_sampling_flag; - OMX_U8 content_interpretation_type; - OMX_U8 spatial_flipping_flag; - OMX_U8 frame0_flipped_flag; - OMX_U8 field_views_flag; - OMX_U8 current_frame_is_frame0_flag; - OMX_U8 frame0_self_contained_flag; - OMX_U8 frame1_self_contained_flag; - OMX_U8 frame0_grid_position_x; - OMX_U8 frame0_grid_position_y; - OMX_U8 frame1_grid_position_x; - OMX_U8 frame1_grid_position_y; - OMX_U8 frame_packing_arrangement_reserved_byte; - OMX_U8 frame_packing_arrangement_extension_flag; -} OMX_TI_VIDEO_H264VDEC_SeiFramePacking; - - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_SeiMessages - * - * @brief This structure contains all the supported SEI msg objects - * - * @param parsed_flag :1 - Indicates that in the current process call, - * contents of the structure is updated - * 0 - Indicates contents of the structure is not updated - * @param full_frame_freeze : Full-frame freeze SEI message - * @param full_frame_freeze_release :Cancels the effect of any full-frame - * freeze SEI message sent with pictures that precede the current - * picture in the output order. - * @param prog_refine_start :Specifies the beginning of a set of consecutive - * coded pictures that is labeled as the current picture followed - * by a sequence of one or more pictures of refinement of the - * quality of the current picture, rather than as a representation - * of a continually moving scene. - * @param prog_refine_end : Specifies end of progressive refinement. - * @param user_data_registered :Message contains user data registered as - * specified by ITU-T Recommendation T.35 - * @param user_data_unregistered :Message contains unregistered user data - * identified by a UUID - * @param buffering_period_info :Message specifies the buffering period - * @param pan_scan_rect :Message specifies the coordinates of a rectangle - * relative to the cropping rectangle of the sequence parameter set - * @param recovery_pt_info :The recovery point SEI message assists a decoder - * in determining when the decoding process will produce acceptable - * pictures for display after the decoder initiates random access or - * after the encoder indicates a broken link in the sequence. - * @param pic_timing :Specifies timing information regarding cpb delays, dpb -* output delay, and so on. - * @param stereo_video_info :stereo video information SEI message consist of - * pair of picture forming stereo view content. - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_SeiMessages { - OMX_U32 parsed_flag; - OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRep full_frame_freeze; - OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRel full_frame_freeze_release; - OMX_TI_VIDEO_H264VDEC_SeiProgRefineStart prog_refine_start; - OMX_TI_VIDEO_H264VDEC_SeiProgRefineEnd prog_refine_end; - OMX_TI_VIDEO_H264VDEC_SeiUserDataRegITUT user_data_registered; - OMX_TI_VIDEO_H264VDEC_SeiUserDataUnReg user_data_unregistered; - OMX_TI_VIDEO_H264VDEC_SeiBufferingPeriod buffering_period_info; - OMX_TI_VIDEO_H264VDEC_SeiPanScanRect pan_scan_rect; - OMX_TI_VIDEO_H264VDEC_SeiRecoveryPointInfo recovery_pt_info; - OMX_TI_VIDEO_H264VDEC_SeiPictureTiming pic_timing; - OMX_TI_VIDEO_H264VDEC_SeiStereoVideoInfo stereo_video_info; - OMX_TI_VIDEO_H264VDEC_SeiFramePacking frame_packing; -} OMX_TI_VIDEO_H264VDEC_SeiMessages; - - -/** - ****************************************************************************** - * @struct _sErrConcealStr - * @brief This str holds up the required Info for implementing the SCV EC, - * this will get updated by H.264 decoder while decoding the SVC - * Base/Target Layers - * - * @param CurrMbInfoBufPointer :Base Address of the current decoded frame - * MB Info buffer - * - * @param CurrMbStatusBufPointer: Base Address of the current decoded frame - * MB staus buffer pointer - * - * @param currFrameY : Base Address of the current decoded Luma - * frame buffer pointer (physical pointer) - * - * @param currFrameUV : Base Address of the current decoded Chroma - * frame buffer pointer (physical pointer) - * - * @param refConclY : Base Address of the ref decoded Luma - * frame buffer pointer (virtual pointer) - * - * @param refConclUV : Base Address of the ref decoded Chroma - * frame buffer pointer (virtual pointer) - * - * @param TilerBaseAddress : TBA vaule for the VDMA - * - * @param pSliceInfoFlags : Flag to enable slice info - * - * @param ref_width : Resultant Horizontal LUMA picture size - * after Pad size addition on both Left - * & Right sides. This gets used as - * stride during vDMA programming. - * In case of TILER,the stride is fixed, - * independant of Picture width, and - * only changes with TILER mode. - * - * @param ref_width_c : Resultant Horizontal CHROMA picture size - * after Pad size addition on both Left & - * Right sides. - * - * - * @param ref_frame_height : In case of Interlaced streams,the picure - * store is different i.e., store each field - * by applying PAD on top & bottom lines. - * Hence the picture height will be Height - * plus four times the Pad size. This - * variable holds this resultant value. - * - * @param mb_width : Picture width in terms of Macroblocks - * - * @param mb_height : Picture height in terms of Macroblocks. - * - * @param image_width : Image width of the decoded frame - * - * @param image_width : Image height of the decoded frame - * - * @param frameType : Frame type of the current frame. - * - * @param picaff_frame : Flag to indicate whether current picture - * is of Frame type & referring to Field - * picture as reference. - * - * @param mb_aff_frame_flag : Flag to indicate whether the current - * decoding picture is MBAFF type. - * - * @param field_pic_flag : Flag to indicate whether the current - * decoding picture is field type. - * - * @param bottom_field_flag : This parameter equal to 1 specifies that - * the slice is part of a coded bottom field. - * bottom_field_flag equalto 0 specifies - * that the picture is a coded top field. - * - * @param nonPairedFieldPic : Flag to indicate Non paired field picture. - * - * @param prev_pic_bottom_field : this variable Indicates if the previous - * picture was a bottom field or not (a Flag) - ****************************************************************************** -*/ - -typedef struct OMX_TI_VIDEO_H264VDEC_ErrConcealStr { - OMX_S32 ErrConcealmentEnable; - OMX_S32 CurrMbInfoBufPointer; - OMX_S32 CurrMbStatusBufPointer; - OMX_S32 CurrMbInfoIresBufPointer; - OMX_S32 currFrameY; - OMX_S32 currFrameUV; - OMX_S32 refConclY; - OMX_S32 refConclUV; - OMX_U32 TilerBaseAddress; - OMX_U16 ref_width; - OMX_U16 ref_width_c; - OMX_U16 ref_frame_height; - OMX_U16 mb_width; - OMX_U16 mb_height; - OMX_U16 image_width; - OMX_U16 image_height; - OMX_U8 frameType; - OMX_U8 picaff_frame; - OMX_U8 mb_aff_frame_flag; - OMX_U8 field_pic_flag; - OMX_U8 bottom_field_flag; - OMX_U8 nonPairedFieldPic; - OMX_U8 prev_pic_bottom_field; -}OMX_TI_VIDEO_H264VDEC_ErrConcealStr; - -/** - * Size of sliceinfo flags - We have two slice info flag arrays in SL2, one - * for ECD3 and the other for MC3. ECD3 flag is one bit per MB. Since Maximum - * supported number of MBs in a frame is 128 x 128 = 16384, we need 16384/8 = - * 2048 bytes for the slice info flag array for ECD3. But for the MC3 array, - * we always make the next bit also as 1 to enable loading into ping and pong - * memories of MCBUF. So we need an extra bit for the MC3 array, to avoid - * buffer overflow when the last MB is a new slice. To keep the next SL2 buffer - * in 16-byte aligned position (some buffers need it) we round the size to next - * multiple of 16, i.e., 2064. -*/ -#define OMX_TI_VIDEO_SLICEINFO_FLAGSIZE 2064 - -/** - ****************************************************************************** - * @struct _sErrConcealLayerStr - * @brief This str holds up the required Info for implementing the SCV EC, - * this will get updated by H.264 decoder while decoding the SVC - * Base/Target Layers - * - * @param svcEcStr : structure instance of sSVCErrConcealStr - * - * @param pSliceInfoFlags : Array to store the sliceInfo flag - * - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_ErrConcealLayerStr { - OMX_TI_VIDEO_H264VDEC_ErrConcealStr sECStr; - OMX_U8 pSliceInfoFlags[OMX_TI_VIDEO_SLICEINFO_FLAGSIZE]; -}OMX_TI_VIDEO_H264VDEC_ErrConcealLayerStr; - - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_CommonInfo - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_CommonInfo { - OMX_U32 codec_type : 8; - OMX_U32 fmt_type : 8; - OMX_U32 mb_ll_avail : 1; - OMX_U32 mb_ul_avail : 1; - OMX_U32 mb_uu_avail : 1; - OMX_U32 mb_ur_avail : 1; - OMX_U32 pic_bound_l : 1; - OMX_U32 pic_bound_u : 1; - OMX_U32 pic_bound_r : 1; - OMX_U32 pic_bound_b : 1; - OMX_U32 first_mb_flag : 1; - OMX_U32 error_flag : 1; - OMX_U32 zero : 6; - OMX_U32 zeroes : 16; - OMX_U32 mb_addr : 16; - -} OMX_TI_VIDEO_H264VDEC_CommonInfo; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_MotionVector - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_MotionVector { - OMX_S16 x; - OMX_S16 y; -} OMX_TI_VIDEO_H264VDEC_MotionVector; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_CabacContext - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_CabacContext { - OMX_TI_VIDEO_H264VDEC_MotionVector mvd_l0[4]; - OMX_TI_VIDEO_H264VDEC_MotionVector mvd_l1[4]; - -} OMX_TI_VIDEO_H264VDEC_CabacContext; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_TotalCoefLuma - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_TotalCoefLuma { - OMX_U8 right[3]; - OMX_U8 bottom_right; - OMX_U8 bottom[3]; - OMX_U8 zero; -} OMX_TI_VIDEO_H264VDEC_TotalCoefLuma; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_TotalCoefChroma - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_TotalCoefChroma { - OMX_U8 right_cb; - OMX_U8 bottom_right_cb; - OMX_U8 bottom_cb; - OMX_U8 zero; - OMX_U8 right_cr; - OMX_U8 bottom_right_cr; - OMX_U8 bottom_cr; - OMX_U8 zero1; -} OMX_TI_VIDEO_H264VDEC_TotalCoefChroma; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_CavlcContext - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_CavlcContext { - unsigned long long zeroes[2]; - OMX_TI_VIDEO_H264VDEC_TotalCoefLuma total_coef_luma; - OMX_TI_VIDEO_H264VDEC_TotalCoefChroma total_coef_chroma; - -} OMX_TI_VIDEO_H264VDEC_CavlcContext; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_IntraPredMode - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_IntraPredMode { - OMX_U32 ipred_mode0 : 4; - OMX_U32 ipred_mode1 : 4; - OMX_U32 ipred_mode2 : 4; - OMX_U32 ipred_mode3 : 4; - OMX_U32 ipred_mode4 : 4; - OMX_U32 ipred_mode5 : 4; - OMX_U32 ipred_mode6 : 4; - OMX_U32 ipred_mode7 : 4; - OMX_U32 ipred_mode8 : 4; - OMX_U32 ipred_mode9 : 4; - OMX_U32 ipred_mode10 : 4; - OMX_U32 ipred_mode11 : 4; - OMX_U32 ipred_mode12 : 4; - OMX_U32 ipred_mode13 : 4; - OMX_U32 ipred_mode14 : 4; - OMX_U32 ipred_mode15 : 4; - -} OMX_TI_VIDEO_H264VDEC_IntraPredMode; - - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_MbPredType - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_MbPredType { - OMX_U32 mbskip : 1; - OMX_U32 tr8x8 : 1; - OMX_U32 mb_field : 1; - OMX_U32 cond_mbskip : 1; - OMX_U32 c_ipred_mode : 2; - OMX_U32 zero : 1; - OMX_U32 end_of_slice : 1; - OMX_U32 mb_y_mod2 : 1; - OMX_U32 zero1 : 7; - OMX_U32 refidx_equal_flag_l0 : 1; - OMX_U32 refidx_equal_flag_l1 : 1; - OMX_U32 mv_equal_flag_l0 : 1; - OMX_U32 mv_equal_flag_l1 : 1; - OMX_U32 zeroes : 4; - OMX_U32 mb_type : 8; - OMX_U8 sub_mb_type[4]; - -} OMX_TI_VIDEO_H264VDEC_MbPredType; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_QpCbp - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_QpCbp { - OMX_U32 cbp; - OMX_U8 qp_y; - OMX_U8 qp_cb; - OMX_U8 qp_cr; - OMX_U8 zero; -} OMX_TI_VIDEO_H264VDEC_QpCbp; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_RefPicControl - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_RefPicControl { - OMX_U8 refidx[4]; - OMX_U8 refpicid[4]; - -} OMX_TI_VIDEO_H264VDEC_RefPicControl; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_MvBidirectional16 - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_MvBidirectional16 { - OMX_TI_VIDEO_H264VDEC_MotionVector mv_forward[16]; - OMX_TI_VIDEO_H264VDEC_MotionVector mv_backward[16]; -} OMX_TI_VIDEO_H264VDEC_MvBidirectional16; - - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_MvBidirectional4 - * - * @brief - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_MvBidirectional4 { - OMX_TI_VIDEO_H264VDEC_MotionVector mv_forward[4]; - OMX_TI_VIDEO_H264VDEC_MotionVector mv_backward[4]; - -} OMX_TI_VIDEO_H264VDEC_MvBidirectional4; - -/** - ****************************************************************************** - * @struct OMX_TI_VIDEO_H264VDEC_MbInfo - * - * @brief This structure details the data format for MB information shared to - * application. This helps application to understand all fields - * the way codec uses MB info internally. This structure is of size - * 208 Bytes. - * - * @param info : This elements gives details about the MB placement in the - * frame. - * - * @param cabac: This field holds the context data for a CABAC coded MB - * - * @param cavlc: This field holds the context data for a CAVLC coded MB - * - * @param ipred_mode: This field holds information of intra prediction modes - * at 4x4 level, for intra coded MB. - * - * @param mb_pred_type: This indicates prediction specific details for inter - * coded MB - * - * @param qp_cbp: This gives coded & QP informations for both LUMA & CHROMA - * components of a Macro Block. - * - * @param l0_ref_pic_control: Informs all details about reference indices - * at 8x8 block level in L0 direction - * - * @param l1_ref_pic_control: Informs all details about reference indices - * at 8x8 block level in L1 direction - * - * @param mv_forward: Lists all Motion vectors at 4x4 level in L0 direction - * - * @param bidirectional16: Lists all Motion vectors at 4x4 level in both - * directions - * - * @param bidirectional4: Lists all Motion vectors at 8x8 level in both - * directions - * - ****************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_H264VDEC_MbInfo { - OMX_TI_VIDEO_H264VDEC_CommonInfo info; - - union { - OMX_TI_VIDEO_H264VDEC_CabacContext cabac; - OMX_TI_VIDEO_H264VDEC_CavlcContext cavlc; - } OMX_TI_VIDEO_H264VDEC_context; - - OMX_TI_VIDEO_H264VDEC_IntraPredMode ipred_mode; - OMX_TI_VIDEO_H264VDEC_MbPredType mb_pred_type; - OMX_TI_VIDEO_H264VDEC_QpCbp qp_cbp; - OMX_TI_VIDEO_H264VDEC_RefPicControl l0_ref_pic_control; - OMX_TI_VIDEO_H264VDEC_RefPicControl l1_ref_pic_control; - - union { - OMX_TI_VIDEO_H264VDEC_MotionVector mv_forward[16]; - OMX_TI_VIDEO_H264VDEC_MvBidirectional16 bidirectional16; - OMX_TI_VIDEO_H264VDEC_MvBidirectional4 bidirectional4; - } OMX_TI_VIDEO_H264VDEC_motion_vecs; - -} OMX_TI_VIDEO_H264VDEC_MbInfo; - - - -/** -******************************************************************************** -* @struct OMX_TI_VIDEO_VC1VDEC_MbInfo -* -* @brief MB information structure that is written out by the IVA-HD hardware. -* -* @note None: -* -******************************************************************************** -*/ -typedef struct OMX_TI_VIDEO_VC1VDEC_MbInfo { - /* MB address */ - OMX_U8 mb_addr; - /* Error flag */ - OMX_U8 error_flag; - /* First MB flag */ - OMX_U8 first_mb_flag; - /* Picture bound */ - OMX_U8 pic_bound_b; - /* Upper picture bound */ - OMX_U8 pic_bound_u; - /* Right picture bound */ - OMX_U8 pic_bound_r; - /* Left picture bound */ - OMX_U8 pic_bound_l; - /* Availability of upper right MB */ - OMX_U8 mb_ur_avail; - /* Availability of upper MB */ - OMX_U8 mb_uu_avail; - /* Availability of upper left MB */ - OMX_U8 mb_ul_avail; - /* Availability of left MB */ - OMX_U8 mb_ll_avail; - /* Macroblock header format type */ - OMX_U8 fmt_type; - /* Codec type */ - OMX_U8 codec_type; - /* Indicates DC values of each Y block in current MB */ - OMX_U8 dc_coef_q_y[4]; - /* Indicates DC values of Cr block in current MB */ - OMX_U8 dc_coef_q_cr; - /* Indicates DC values of Cb block in current MB */ - OMX_U8 dc_coef_q_cb; - /* Block type of cr block */ - OMX_U8 block_type_cr; - /* Block type of cb block */ - OMX_U8 block_type_cb; - /* Block types of luma */ - OMX_U8 block_type_y[4]; - /* In decoding, if the current macroblock is the last macroblock in a slice,*/ - /* ECD sets 1 to this field during executing the macroblock. Otherwise, ECD */ - /* sets 0 to this field */ - OMX_U8 end_of_slice; - /* 1 : allow skipping current MB if CBP = 0 */ - OMX_U8 cond_skip_flag; - /* Skipped / non skipped MB */ - OMX_U8 skip; - /* 1 indicates that overlap filtering is in use for the macroblock. */ - OMX_U8 overlap; - /* 1 indicates that AC prediction is in use for the macroblock */ - OMX_U8 acpred; - /* Denotes inter-prediction direction for the macroblock in B-picture */ - OMX_U8 b_picture_direction; - /* Denotes the number of motion vectors. */ - OMX_U8 mv_mode; - /* 1 indicates that the field transform is in use for the macroblock. */ - OMX_U8 fieldtx; - /* 1 indicates that field inter-prediction is in use */ - OMX_U8 mv_type; - /* Equals the reference frame distance */ - OMX_U8 refdist; - /* 1 indicates that macroblock quantizer-scale (MQUANT) overflows */ - OMX_U8 mquant_overflow; - /* Equals the quantizer-scale for the macroblock */ - OMX_U8 quant; - /* 1 indicates that 0.5 shall be added to PQUANT in calculation of */ - /* quantizer-scale. This field is valid for decoding only. */ - OMX_U8 halfqp; - /* Equals the DC coefficient step size which is derived from MQUANT in the */ - /* bit-stream */ - OMX_U8 dc_step_size; - /* Denotes the coded sub-block pattern for cr block */ - OMX_U8 cbp_cr; - /* Denotes the coded sub-block pattern for cb block */ - OMX_U8 cbp_cb; - /* Denotes the coded sub-block pattern for luma blocks */ - OMX_U8 cbp_y[3]; - /* Denotes the backward reference field picture */ - OMX_U8 mv_bw_ref_y[4]; - /* Denotes the forward reference field picture */ - OMX_U8 mv_fw_ref_y[3]; - /* Unclipped forward motion vector for luma */ - OMX_U8 mv_fw_y[4][4]; - /* Unclipped backward motion vector for luma */ - OMX_U8 mv_bw_y[1][1]; - /* Unclipped backward motion vector for chroma */ - OMX_U8 mv_bw_c[2]; - /* Unclipped forward motion vector for chroma */ - OMX_U8 mv_fw_c[2]; - /* Clipped forward motion vector for luma */ - OMX_U8 cmv_fw_y[4][4]; - /* Clipped backward motion vector for luma */ - OMX_U8 cmv_bw_y[4][4]; - /* Clipped forward motion vector for chroma */ - OMX_U8 cmv_fw_c[4][4]; - /* Clipped backward motion vector for chroma */ - OMX_U8 cmv_bw_c[4][4]; - -}OMX_TI_VIDEO_VC1VDEC_MbInfo; - -#endif /* OMX_TI_VIDEO_H */ - diff --git a/domx/omx_core/src/OMX_Core.c b/domx/omx_core/src/OMX_Core.c deleted file mode 100755 index 8d9b529..0000000 --- a/domx/omx_core/src/OMX_Core.c +++ /dev/null @@ -1,953 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <dlfcn.h> /* For dynamic loading */ -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <pthread.h> - - -/* #include "OMX_RegLib.h" */ -#include "OMX_Component.h" -#include "OMX_Core.h" -#include "OMX_ComponentRegistry.h" - -#include "timm_osal_types.h" -#include "timm_osal_error.h" -#include "timm_osal_trace.h" -#include "timm_osal_mutex.h" - -#ifdef CHECK_SECURE_STATE -#include <sys/ioctl.h> -#include <errno.h> -#include <fcntl.h> -#endif - -/** size for the array of allocated components. Sets the maximum - * number of components that can be allocated at once */ -#define MAXCOMP (50) -#define MAXNAMESIZE (128) -#define EMPTY_STRING "\0" - -/** Determine the number of elements in an array */ -#define COUNTOF(x) (sizeof(x)/sizeof(x[0])) - -/** Array to hold the DLL pointers for each allocated component */ -static void *pModules[MAXCOMP] = { 0 }; - -/** Array to hold the component handles for each allocated component */ -static void *pComponents[COUNTOF(pModules)] = { 0 }; - -/* count for call OMX_Init() */ -int count = 0; -pthread_mutex_t mutex; -TIMM_OSAL_PTR pCoreInitMutex = NULL; - -int tableCount = 0; -ComponentTable componentTable[MAX_TABLE_SIZE]; -char *sRoleArray[60][20]; -char compName[60][200]; - - -char *tComponentName[MAXCOMP][MAX_ROLES] = { - /*video and image components */ - {"OMX.TI.DUCATI1.VIDEO.DECODER", - "video_decoder.mpeg4", - "video_decoder.avc", - "video_decoder.h263", - "video_decoder.wmv", - "video_decoder.mpeg2", - "video_decoder.svc", - "video_decoder.sorspk", NULL}, - {"OMX.TI.DUCATI1.VIDEO.DECODER.secure", - "video_decoder.mpeg4", - "video_decoder.avc", - "video_decoder.h263", NULL}, - {"OMX.TI.DUCATI1.VIDEO.H264E", - "video_encoder.avc", NULL}, - {"OMX.TI.DUCATI1.VIDEO.MPEG4E", - "video_encoder.mpeg4", - "video_encoder.h263",NULL}, - {"OMX.TI.DUCATI1.VIDEO.CAMERA", "camera.omx", NULL}, -#ifdef USE_ITTIAM_AAC - {"OMX.ITTIAM.AAC.decode", "audio_decoder.aac", NULL}, - {"OMX.ITTIAM.BSAC.decode", "audio_decoder.aac", NULL}, -#endif - {"OMX.ITTIAM.WMA.decode", "audio_decoder.wma", NULL}, - {"OMX.ITTIAM.WMALSL.decode", "audio_decoder.wmalsl", NULL}, - {"OMX.ITTIAM.WMAPRO.decode", "audio_decoder.wmapro", NULL}, - /* terminate the table */ - {NULL, NULL}, -}; - -//AD -extern OMX_ERRORTYPE OMX_ComponentInit(OMX_HANDLETYPE hComponent); - -#define CORE_assert CORE_paramCheck -#define CORE_require CORE_paramCheck -#define CORE_ensure CORE_paramCheck - -#define CORE_paramCheck(C, V, S) do {\ - if (!(C)) { eError = V;\ - TIMM_OSAL_Error("failed check: " #C);\ - TIMM_OSAL_Error(" - returning error: " #V);\ - if(S) TIMM_OSAL_Error(" - %s", S);\ - goto EXIT; }\ - } while(0) - -/******************************Public*Routine******************************\ -* OMX_Init() -* -* Description:This method will initialize the OMX Core. It is the -* responsibility of the application to call OMX_Init to ensure the proper -* set up of core resources. -* -* Returns: OMX_NOERROR Successful -* -* Note -* -\**************************************************************************/ -OMX_ERRORTYPE OMX_Init() -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eOsalError = TIMM_OSAL_ERR_NONE; - - eOsalError = TIMM_OSAL_MutexObtain(pCoreInitMutex, TIMM_OSAL_SUSPEND); - CORE_assert(eOsalError == TIMM_OSAL_ERR_NONE, - OMX_ErrorInsufficientResources, "Mutex lock failed"); - - count++; - - if (count == 1) - { - pthread_mutex_init(&mutex, NULL); - eError = OMX_BuildComponentTable(); - } - - eOsalError = TIMM_OSAL_MutexRelease(pCoreInitMutex); - CORE_assert(eOsalError == TIMM_OSAL_ERR_NONE, - OMX_ErrorInsufficientResources, "Mutex release failed"); - EXIT: - return eError; -} - -/******************************Public*Routine******************************\ -* OMX_GetHandle -* -* Description: This method will create the handle of the COMPONENTTYPE -* If the component is currently loaded, this method will reutrn the -* hadle of existingcomponent or create a new instance of the component. -* It will call the OMX_ComponentInit function and then the setcallback -* method to initialize the callback functions -* Parameters: -* @param[out] pHandle Handle of the loaded components -* @param[in] cComponentName Name of the component to load -* @param[in] pAppData Used to identify the callbacks of component -* @param[in] pCallBacks Application callbacks -* -* @retval OMX_ErrorUndefined -* @retval OMX_ErrorInvalidComponentName -* @retval OMX_ErrorInvalidComponent -* @retval OMX_ErrorInsufficientResources -* @retval OMX_NOERROR Successful -* -* Note -* -\**************************************************************************/ - -OMX_ERRORTYPE OMX_GetHandle(OMX_HANDLETYPE * pHandle, - OMX_STRING cComponentName, OMX_PTR pAppData, - OMX_CALLBACKTYPE * pCallBacks) -{ - static const char prefix[] = "lib"; - static const char postfix[] = ".so"; - OMX_ERRORTYPE(*pComponentInit) (OMX_HANDLETYPE *); - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *componentType; - int i; - char buf[sizeof(prefix) + MAXNAMESIZE + sizeof(postfix)]; - const char *pErr = dlerror(); - char *dlError = NULL; -#ifdef CHECK_SECURE_STATE - int secure_misc_drv_fd,ret; - OMX_U8 mode, enable=1; -#endif - if (pthread_mutex_lock(&mutex) != 0) - { - TIMM_OSAL_Error("Core: Error in Mutex lock"); - } - - CORE_require(NULL != cComponentName, OMX_ErrorBadParameter, NULL); - CORE_require(NULL != pHandle, OMX_ErrorBadParameter, NULL); - CORE_require(NULL != pCallBacks, OMX_ErrorBadParameter, NULL); - CORE_require(count > 0, OMX_ErrorUndefined, - "OMX_GetHandle called without calling OMX_Init first"); - - /* Verify that the name is not too long and could cause a crash. Notice - * that the comparison is a greater than or equals. This is to make - * sure that there is room for the terminating NULL at the end of the - * name. */ - CORE_require(strlen(cComponentName) < MAXNAMESIZE, - OMX_ErrorInvalidComponentName, NULL); - - /* Locate the first empty slot for a component. If no slots - * are available, error out */ - for (i = 0; i < (int)COUNTOF(pModules); i++) - { - if (pModules[i] == NULL) - break; - } - CORE_assert(i != COUNTOF(pModules), OMX_ErrorInsufficientResources, - NULL); - - /* load the component and check for an error. If filename is not an - * absolute path (i.e., it does not begin with a "/"), then the - * file is searched for in the following locations: - * - * The LD_LIBRARY_PATH environment variable locations - * The library cache, /etc/ld.so.cache. - * /lib - * /usr/lib - * - * If there is an error, we can't go on, so set the error code and exit */ - strcpy(buf, prefix); /* the lengths are defined herein or have been */ - strcat(buf, cComponentName); /* checked already, so strcpy and strcat are */ - strcat(buf, postfix); /* are safe to use in this context. */ - -#ifdef CHECK_SECURE_STATE - //Dont return errors from misc driver to the user if any. - //Since this affects all usecases, secure and non-secure. - //Do log the errors though. - secure_misc_drv_fd = open("/dev/rproc_user", O_SYNC | O_RDONLY); - if (secure_misc_drv_fd < 0) - { - TIMM_OSAL_Error("Can't open misc driver device 0x%x\n", errno); - } - else - { - ret = read(secure_misc_drv_fd, &mode, sizeof(mode)); - if (ret != sizeof(mode)) - { - TIMM_OSAL_Error("Can't read from the misc driver"); - } - else - { - if(mode == enable && strstr(cComponentName,"secure") == NULL) - { - TIMM_OSAL_Error("non-secure component not supported in secure mode"); - eError = OMX_ErrorComponentNotFound; - } - } - ret = close(secure_misc_drv_fd); - if (ret < 0) - { - TIMM_OSAL_Error("Can't close the misc driver"); - } - } - /* Don't allow non-secure usecases if we are in secure state. - * Else some of the memory regions will be unexpected firewalled. - * This provides a clean exit in case we are in secure mode. */ - if (eError == OMX_ErrorComponentNotFound) - { - goto EXIT; - } -#endif //CHECK_SECURE_STATE - - -//#if 0 - pModules[i] = dlopen(buf, RTLD_LAZY | RTLD_GLOBAL); - if (pModules[i] == NULL) - { - dlError = (char *)dlerror(); - TIMM_OSAL_Error("Failed because %s", dlError); - eError = OMX_ErrorComponentNotFound; - goto EXIT; - } - - /* Get a function pointer to the "OMX_ComponentInit" function. If - * there is an error, we can't go on, so set the error code and exit */ - pComponentInit = dlsym(pModules[i], "OMX_ComponentInit"); - pErr = dlerror(); - CORE_assert(((pErr == NULL) && (pComponentInit != NULL)), - OMX_ErrorInvalidComponent, NULL); -//#endif - - /* We now can access the dll. So, we need to call the "OMX_ComponentInit" - * method to load up the "handle" (which is just a list of functions to - * call) and we should be all set.*/ - *pHandle = malloc(sizeof(OMX_COMPONENTTYPE)); - CORE_assert((*pHandle != NULL), OMX_ErrorInsufficientResources, - "Malloc of pHandle* failed"); - - pComponents[i] = *pHandle; - componentType = (OMX_COMPONENTTYPE *) * pHandle; - componentType->nSize = sizeof(OMX_COMPONENTTYPE); - - componentType->nVersion.s.nVersionMajor = 1; - componentType->nVersion.s.nVersionMinor = 1; - componentType->nVersion.s.nRevision = 0; - componentType->nVersion.s.nStep = 0; - - eError = (*pComponentInit) (*pHandle); -//eError = OMX_ComponentInit(*pHandle); - if (OMX_ErrorNone == eError) - { - eError = - (componentType->SetCallbacks) (*pHandle, pCallBacks, - pAppData); - CORE_assert(eError == OMX_ErrorNone, eError, - "Core: Error returned from component SetCallBack"); - } else - { - /* when the component fails to initialize, release the - component handle structure */ - free(*pHandle); - /* mark the component handle as NULL to prevent the caller from - actually trying to access the component with it, should they - ignore the return code */ - *pHandle = NULL; - pComponents[i] = NULL; - dlclose(pModules[i]); - goto EXIT; - } - eError = OMX_ErrorNone; - EXIT: - if (pthread_mutex_unlock(&mutex) != 0) - { - TIMM_OSAL_Error("Core: Error in Mutex unlock"); - } - return (eError); -} - - -/******************************Public*Routine******************************\ -* OMX_FreeHandle() -* -* Description:This method will unload the OMX component pointed by -* OMX_HANDLETYPE. It is the responsibility of the calling method to ensure that -* the Deinit method of the component has been called prior to unloading component -* -* Parameters: -* @param[in] hComponent the component to unload -* -* Returns: OMX_NOERROR Successful -* -* Note -* -\**************************************************************************/ -OMX_ERRORTYPE OMX_FreeHandle(OMX_HANDLETYPE hComponent) -{ - - OMX_ERRORTYPE eError = OMX_ErrorUndefined; - OMX_COMPONENTTYPE *pHandle = (OMX_COMPONENTTYPE *) hComponent; - int i; - - if (pthread_mutex_lock(&mutex) != 0) - { - TIMM_OSAL_Error("Core: Error in Mutex lock"); - } - - CORE_require(pHandle != NULL, OMX_ErrorBadParameter, NULL); - CORE_require(count > 0, OMX_ErrorUndefined, - "OMX_FreeHandle called without calling OMX_Init first"); - - /* Locate the component handle in the array of handles */ - for (i = 0; i < (int)COUNTOF(pModules); i++) - { - if (pComponents[i] == hComponent) - break; - } - - CORE_assert(i != COUNTOF(pModules), OMX_ErrorBadParameter, NULL); - - eError = pHandle->ComponentDeInit(hComponent); - if (eError != OMX_ErrorNone) - { - TIMM_OSAL_Error("Error From ComponentDeInit.."); - } - - /* release the component and the component handle */ - dlclose(pModules[i]); - pModules[i] = NULL; - free(pComponents[i]); - - pComponents[i] = NULL; - eError = OMX_ErrorNone; - - EXIT: - /* The unload is now complete, so set the error code to pass and exit */ - if (pthread_mutex_unlock(&mutex) != 0) - { - TIMM_OSAL_Error("Core: Error in Mutex unlock"); - } - - return eError; -} - -/******************************Public*Routine******************************\ -* OMX_DeInit() -* -* Description:This method will release the resources of the OMX Core. It is the -* responsibility of the application to call OMX_DeInit to ensure the clean up of these -* resources. -* -* Returns: OMX_NOERROR Successful -* -* Note -* -\**************************************************************************/ -OMX_ERRORTYPE OMX_Deinit() -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eOsalError = TIMM_OSAL_ERR_NONE; - - eOsalError = TIMM_OSAL_MutexObtain(pCoreInitMutex, TIMM_OSAL_SUSPEND); - if (eOsalError != TIMM_OSAL_ERR_NONE) - { - TIMM_OSAL_Error("Mutex lock failed"); - } - /*Returning error none because of OMX spec limitation on error codes that - can be returned by OMX_Deinit */ - CORE_assert(count > 0, OMX_ErrorNone, - "OMX_Deinit being called without a corresponding OMX_Init"); - count--; - - if (pthread_mutex_lock(&mutex) != 0) - TIMM_OSAL_Error("Core: Error in Mutex lock"); - - if (count == 0) - { - if (pthread_mutex_unlock(&mutex) != 0) - TIMM_OSAL_Error("Core: Error in Mutex unlock"); - if (pthread_mutex_destroy(&mutex) != 0) - { - /*printf("%d :: Core: Error in Mutex destroy\n",__LINE__); */ - } - } else - { - if (pthread_mutex_unlock(&mutex) != 0) - TIMM_OSAL_Error("Core: Error in Mutex unlock"); - } - - EXIT: - eOsalError = TIMM_OSAL_MutexRelease(pCoreInitMutex); - if (eOsalError != TIMM_OSAL_ERR_NONE) - { - TIMM_OSAL_Error("Mutex release failed"); - } - return eError; -} - -/************************************************************************* -* OMX_SetupTunnel() -* -* Description: Setup the specified tunnel the two components -* -* Parameters: -* @param[in] hOutput Handle of the component to be accessed -* @param[in] nPortOutput Source port used in the tunnel -* @param[in] hInput Component to setup the tunnel with. -* @param[in] nPortInput Destination port used in the tunnel -* -* Returns: OMX_NOERROR Successful -* -* Note -* -**************************************************************************/ -/* OMX_SetupTunnel */ -OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_SetupTunnel(OMX_IN OMX_HANDLETYPE - hOutput, OMX_IN OMX_U32 nPortOutput, OMX_IN OMX_HANDLETYPE hInput, - OMX_IN OMX_U32 nPortInput) -{ - OMX_ERRORTYPE eError = OMX_ErrorNotImplemented; - OMX_COMPONENTTYPE *pCompIn, *pCompOut; - OMX_TUNNELSETUPTYPE oTunnelSetup; - - if (hOutput == NULL && hInput == NULL) - return OMX_ErrorBadParameter; - - oTunnelSetup.nTunnelFlags = 0; - oTunnelSetup.eSupplier = OMX_BufferSupplyUnspecified; - - pCompOut = (OMX_COMPONENTTYPE *) hOutput; - - if (hOutput) - { - eError = - pCompOut->ComponentTunnelRequest(hOutput, nPortOutput, - hInput, nPortInput, &oTunnelSetup); - } - - - if (eError == OMX_ErrorNone && hInput) - { - pCompIn = (OMX_COMPONENTTYPE *) hInput; - eError = - pCompIn->ComponentTunnelRequest(hInput, nPortInput, - hOutput, nPortOutput, &oTunnelSetup); - if (eError != OMX_ErrorNone && hOutput) - { - /* cancel tunnel request on output port since input port failed */ - pCompOut->ComponentTunnelRequest(hOutput, nPortOutput, - NULL, 0, NULL); - } - } - - return eError; -} - -/************************************************************************* -* OMX_ComponentNameEnum() -* -* Description: This method will provide the name of the component at the given nIndex -* -*Parameters: -* @param[out] cComponentName The name of the component at nIndex -* @param[in] nNameLength The length of the component name -* @param[in] nIndex The index number of the component -* -* Returns: OMX_NOERROR Successful -* -* Note -* -**************************************************************************/ -OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum(OMX_OUT OMX_STRING - cComponentName, OMX_IN OMX_U32 nNameLength, OMX_IN OMX_U32 nIndex) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - - CORE_require(cComponentName != NULL, OMX_ErrorBadParameter, NULL); - CORE_require(count > 0, OMX_ErrorUndefined, - "OMX_GetHandle called without calling OMX_Init first"); - - if (nIndex >= (OMX_U32)tableCount) - { - eError = OMX_ErrorNoMore; - } else - { - strcpy(cComponentName, componentTable[nIndex].name); - } - EXIT: - return eError; -} - - -/************************************************************************* -* OMX_GetRolesOfComponent() -* -* Description: This method will query the component for its supported roles -* -*Parameters: -* @param[in] cComponentName The name of the component to query -* @param[in] pNumRoles The number of roles supported by the component -* @param[in] roles The roles of the component -* -* Returns: OMX_NOERROR Successful -* OMX_ErrorBadParameter Faliure due to a bad input parameter -* -* Note -* -**************************************************************************/ -OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent(OMX_IN OMX_STRING - cComponentName, OMX_INOUT OMX_U32 * pNumRoles, OMX_OUT OMX_U8 ** roles) -{ - - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_U32 i = 0; - OMX_U32 j = 0; - OMX_BOOL bFound = OMX_FALSE; - - CORE_require(cComponentName != NULL, OMX_ErrorBadParameter, NULL); - CORE_require(pNumRoles != NULL, OMX_ErrorBadParameter, NULL); - CORE_require(strlen(cComponentName) < MAXNAMESIZE, - OMX_ErrorInvalidComponentName, NULL); - CORE_require(count > 0, OMX_ErrorUndefined, - "OMX_GetHandle called without calling OMX_Init first"); - - while (!bFound && i < (OMX_U32)tableCount) - { - if (strcmp(cComponentName, componentTable[i].name) == 0) - { - bFound = OMX_TRUE; - } else - { - i++; - } - } - if (roles == NULL) - { - *pNumRoles = componentTable[i].nRoles; - goto EXIT; - } else - { - if (bFound && (*pNumRoles == componentTable[i].nRoles)) - { - for (j = 0; j < componentTable[i].nRoles; j++) - { - strcpy((OMX_STRING) roles[j], - componentTable[i].pRoleArray[j]); - } - } - } - EXIT: - return eError; -} - -/************************************************************************* -* OMX_GetComponentsOfRole() -* -* Description: This method will query the component for its supported roles -* -*Parameters: -* @param[in] role The role name to query for -* @param[in] pNumComps The number of components supporting the given role -* @param[in] compNames The names of the components supporting the given role -* -* Returns: OMX_NOERROR Successful -* -* Note -* -**************************************************************************/ -OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole(OMX_IN OMX_STRING role, - OMX_INOUT OMX_U32 * pNumComps, OMX_INOUT OMX_U8 ** compNames) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_U32 i = 0; - OMX_U32 j = 0; - OMX_U32 k = 0; - - CORE_require(role != NULL, OMX_ErrorBadParameter, NULL); - CORE_require(pNumComps != NULL, OMX_ErrorBadParameter, NULL); - CORE_require(count > 0, OMX_ErrorUndefined, - "OMX_GetHandle called without calling OMX_Init first"); - - /* This implies that the componentTable is not filled */ - CORE_assert(componentTable[i].pRoleArray[j] != NULL, - OMX_ErrorBadParameter, NULL); - - for (i = 0; i < (OMX_U32)tableCount; i++) - { - for (j = 0; j < componentTable[i].nRoles; j++) - { - if (strcmp(componentTable[i].pRoleArray[j], - role) == 0) - { - /* the first call to this function should only count the number - of roles so that for the second call compNames can be allocated - with the proper size for that number of roles */ - if (compNames != NULL) - { - strncpy((OMX_STRING) (compNames[k]), - (OMX_STRING) componentTable[i]. - name, MAXNAMESIZE); - } - k++; - } - } - *pNumComps = k; - } - - EXIT: - return eError; -} - - -/*************************************** -PRINT TABLE FOR DEBUGGING PURPOSES ONLY -***************************************/ - -OMX_API OMX_ERRORTYPE OMX_PrintComponentTable() -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - int i = 0; - int j = 0; - - TIMM_OSAL_Info - ("--------Component Table:: %d Components found-------------", - tableCount); - - for (i = 0; i < tableCount; i++) - { - TIMM_OSAL_Info("%i:: %s", i, componentTable[i].name); - for (j = 0; j < componentTable[i].nRoles; j++) - { - TIMM_OSAL_Info(" %s", - componentTable[i].pRoleArray[j]); - } - } - - TIMM_OSAL_Info - ("-----------------End Component Table ------------------"); - - return eError; - -} - - -OMX_ERRORTYPE OMX_BuildComponentTable() -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_CALLBACKTYPE sCallbacks; -#ifndef STATIC_TABLE - OMX_HANDLETYPE hComp = 0; - OMX_U8 cRole[MAXNAMESIZE]; - OMX_STRING tempName = NULL; - OMX_STRING temp = NULL; - static OMX_STRING namePrefix = "OMX"; - static OMX_STRING filePrefix = "libOMX."; - static OMX_STRING suffix = ".so"; -#endif - int j = 0; - int numFiles = 0; - int i, k; - int componentfound = 0; - - /* set up dummy call backs */ - sCallbacks.EventHandler = ComponentTable_EventHandler; - sCallbacks.EmptyBufferDone = ComponentTable_EmptyBufferDone; - sCallbacks.FillBufferDone = ComponentTable_FillBufferDone; - -#ifndef STATIC_TABLE - /* allocate the name table */ - /* - compName = (OMX_STRING *) malloc(MAX_TABLE_SIZE * sizeof(OMX_STRING)); - sRoleArray = (OMX_STRING**) malloc(MAX_TABLE_SIZE * sizeof(OMX_STRING)); - */ - - /* scan the target/lib directory and create a list of files in the directory */ - numFiles = scandir(libdir, &namelist, 0, 0); - tableCount = 0; - while (numFiles--) - { - /* check if the file is an OMX component */ - if (strncmp(namelist[numFiles]->d_name, filePrefix, - strlen(filePrefix)) == 0) - { - - /* if the file is an OMX component, trim the prefix and suffix */ - tempName = (OMX_STRING) malloc(sizeof(namelist[numFiles]->d_name) + 1); /* adding one ensures */ - memset(tempName, 0x00, sizeof(namelist[numFiles]->d_name) + 1); /* that a null terminator will */ - /* always be present */ - /* copy only the name without the suffix */ - strncpy(tempName, namelist[numFiles]->d_name, - strlen(namelist[numFiles]->d_name) - - strlen(suffix)); - /* set a pointer to be after the lib prefix, i.e the beginning of the component name */ - temp = strstr(tempName, namePrefix); - - /* then copy the component name to the table */ - /* - compName[tableCount]= (OMX_STRING) malloc(MAXNAMESIZE); - */ - strncpy(compName[tableCount], temp, strlen(temp) + 1); - componentTable[tableCount].name = - compName[tableCount]; - - /* get the handle for the component and query for the roles of each component */ - eError = - OMX_GetHandle(&hComp, - componentTable[tableCount].name, 0x0, - &sCallbacks); - if (eError == OMX_ErrorNone) - { - j = 0; - while (eError != OMX_ErrorNoMore) - { - eError = - ((OMX_COMPONENTTYPE *) hComp)-> - ComponentRoleEnum(hComp, cRole, - j++); - if (eError == OMX_ErrorNotImplemented) - { - j = 1; - break; - } - } - nRoles = j - 1; - componentTable[tableCount].nRoles = nRoles; - /* sRoleArray[tableCount] = (OMX_STRING *) malloc(nRoles * sizeof(OMX_STRING)); */ - if (nRoles > 0) - { - /* sRoleArray[tableCount] = (OMX_STRING *) malloc(nRoles * sizeof(OMX_STRING)); */ - for (j = 0; j < nRoles; j++) - { - sRoleArray[tableCount][j] = - (OMX_STRING) - malloc(sizeof(OMX_U8) * - MAXNAMESIZE); - ((OMX_COMPONENTTYPE *) - hComp)-> - ComponentRoleEnum(hComp, - (OMX_U8 *) - sRoleArray[tableCount][j], - j); - componentTable[tableCount]. - pRoleArray[j] = - sRoleArray[tableCount][j]; - } - } else - { - /* sRoleArray[tableCount] = (OMX_STRING *) malloc(sizeof(OMX_STRING)); */ - sRoleArray[tableCount][j] = - (OMX_STRING) malloc(sizeof(OMX_U8) - * MAXNAMESIZE); - strcpy(sRoleArray[tableCount][j], - EMPTY_STRING); - componentTable[tableCount]. - pRoleArray[j] = - sRoleArray[tableCount][j]; - } - } - if (hComp) - { - /* free the component handle */ - eError = OMX_FreeHandle(hComp); - if (eError != OMX_ErrorNone) - { - goto EXIT; - } - } - /* increment the table counter index only if above was successful */ - tableCount++; - if (tempName != NULL) - { - free(tempName); - } - - } - } - -#endif - - for (i = 0, numFiles = 0; i < MAXCOMP; i++) - { - if (tComponentName[i][0] == NULL) - { - break; - } - - for (j = 0; j < numFiles; j++) - { - if (!strcmp(componentTable[j].name, - tComponentName[i][0])) - { - componentfound = 1; - break; - } - } - if (componentfound == 1) - { - continue; - } - - if (j == numFiles) - { /* new component */ - k = 1; - while (tComponentName[i][k] != NULL) - { - componentTable[numFiles].pRoleArray[k - 1] = - tComponentName[i][k]; - k++; - } - componentTable[numFiles].nRoles = k - 1; - strcpy(compName[numFiles], tComponentName[i][0]); - componentTable[numFiles].name = compName[numFiles]; - numFiles++; - } - } - tableCount = numFiles; - - CORE_assert(eError == OMX_ErrorNone, eError, - "Could not build Component Table"); - EXIT: - return eError; -} - -OMX_ERRORTYPE ComponentTable_EventHandler(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_PTR pAppData, - OMX_IN OMX_EVENTTYPE eEvent, - OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2, OMX_IN OMX_PTR pEventData) -{ - return OMX_ErrorNotImplemented; -} - -OMX_ERRORTYPE ComponentTable_EmptyBufferDone(OMX_OUT OMX_HANDLETYPE - hComponent, OMX_OUT OMX_PTR pAppData, - OMX_OUT OMX_BUFFERHEADERTYPE * pBuffer) -{ - return OMX_ErrorNotImplemented; -} - -OMX_ERRORTYPE ComponentTable_FillBufferDone(OMX_OUT OMX_HANDLETYPE hComponent, - OMX_OUT OMX_PTR pAppData, OMX_OUT OMX_BUFFERHEADERTYPE * pBuffer) -{ - return OMX_ErrorNotImplemented; -} - - - -/*===============================================================*/ -/** @fn Core_Setup : This function is called when the the OMX Core library is - * loaded. It creates a mutex, which is used during OMX_Init() - */ -/*===============================================================*/ -void __attribute__ ((constructor)) Core_Setup(void) -{ - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - - eError = TIMM_OSAL_MutexCreate(&pCoreInitMutex); - if (eError != TIMM_OSAL_ERR_NONE) - { - TIMM_OSAL_Error("Creation of default mutex failed"); - } -} - - - -/*===============================================================*/ -/** @fn Core_Destroy : This function is called when the the OMX Core library is - * unloaded. It destroys the mutex which was created by - * Core_Setup(). - * - */ -/*===============================================================*/ -void __attribute__ ((destructor)) Core_Destroy(void) -{ - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - - eError = TIMM_OSAL_MutexDelete(pCoreInitMutex); - if (eError != TIMM_OSAL_ERR_NONE) - { - TIMM_OSAL_Error("Destruction of default mutex failed"); - } -} diff --git a/domx/omx_core/src/OMX_Core_Wrapper.c b/domx/omx_core/src/OMX_Core_Wrapper.c deleted file mode 100755 index 6fbf3d7..0000000 --- a/domx/omx_core/src/OMX_Core_Wrapper.c +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef _Android - -/* #include "OMX_RegLib.h" */ -#include "OMX_Component.h" -#include "OMX_Core.h" -#include "OMX_ComponentRegistry.h" - -#include "OMX_Core_Wrapper.h" -#include "timm_osal_trace.h" -#undef LOG_TAG -#define LOG_TAG "OMX_CORE" - -/** determine capabilities of a component before acually using it */ -extern OMX_BOOL TIOMXConfigParser(OMX_PTR aInputParameters, - OMX_PTR aOutputParameters); - -#endif - - -#ifdef _Android -#ifdef _FROYO -OMX_BOOL TIOMXConfigParserRedirect(OMX_PTR aInputParameters, - OMX_PTR aOutputParameters) -{ - TIMM_OSAL_Entering("OMXConfigParserRedirect +\n"); - OMX_BOOL Status = OMX_FALSE; - - Status = TIOMXConfigParser(aInputParameters, aOutputParameters); - - TIMM_OSAL_Exiting("OMXConfigParserRedirect -\n"); - return Status; -} -#endif -OMX_ERRORTYPE TIComponentTable_EventHandler(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_PTR pAppData, - OMX_IN OMX_EVENTTYPE eEvent, - OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2, OMX_IN OMX_PTR pEventData) -{ - return OMX_ErrorNotImplemented; -} - -OMX_ERRORTYPE TIComponentTable_EmptyBufferDone(OMX_OUT OMX_HANDLETYPE - hComponent, OMX_OUT OMX_PTR pAppData, - OMX_OUT OMX_BUFFERHEADERTYPE * pBuffer) -{ - return OMX_ErrorNotImplemented; -} - -OMX_ERRORTYPE TIComponentTable_FillBufferDone(OMX_OUT OMX_HANDLETYPE - hComponent, OMX_OUT OMX_PTR pAppData, - OMX_OUT OMX_BUFFERHEADERTYPE * pBuffer) -{ - return OMX_ErrorNotImplemented; -} - - -OMX_API OMX_ERRORTYPE TIOMX_Init(void) -{ - TIMM_OSAL_Entering("TIOMX_Init\n"); - - return OMX_Init(); -} - -OMX_API OMX_ERRORTYPE TIOMX_Deinit(void) -{ - TIMM_OSAL_Entering("TIOMX_Deinit\n"); - - return OMX_Deinit(); -} - -OMX_API OMX_ERRORTYPE TIOMX_ComponentNameEnum(OMX_OUT OMX_STRING - cComponentName, OMX_IN OMX_U32 nNameLength, OMX_IN OMX_U32 nIndex) -{ - - TIMM_OSAL_Entering("TIOMX_ComponentNameEnum\n"); - - return OMX_ComponentNameEnum(cComponentName, nNameLength, nIndex); -} - -OMX_API OMX_ERRORTYPE TIOMX_GetHandle(OMX_OUT OMX_HANDLETYPE * pHandle, - OMX_IN OMX_STRING cComponentName, - OMX_IN OMX_PTR pAppData, OMX_IN OMX_CALLBACKTYPE * pCallBacks) -{ - - TIMM_OSAL_Entering("TIOMX_GetHandle\n"); - - return OMX_GetHandle(pHandle, cComponentName, pAppData, pCallBacks); -} - -OMX_API OMX_ERRORTYPE TIOMX_FreeHandle(OMX_IN OMX_HANDLETYPE hComponent) -{ - TIMM_OSAL_Entering("TIOMX_FreeHandle\n"); - - return OMX_FreeHandle(hComponent); -} - -OMX_API OMX_ERRORTYPE TIOMX_GetComponentsOfRole(OMX_IN OMX_STRING role, - OMX_INOUT OMX_U32 * pNumComps, OMX_INOUT OMX_U8 ** compNames) -{ - - TIMM_OSAL_Entering("TIOMX_GetComponentsOfRole\n"); - - return OMX_GetComponentsOfRole(role, pNumComps, compNames); -} - -OMX_API OMX_ERRORTYPE TIOMX_GetRolesOfComponent(OMX_IN OMX_STRING compName, - OMX_INOUT OMX_U32 * pNumRoles, OMX_OUT OMX_U8 ** roles) -{ - - TIMM_OSAL_Entering("TIOMX_GetRolesOfComponent\n"); - - return OMX_GetRolesOfComponent(compName, pNumRoles, roles); -} - -OMX_API OMX_ERRORTYPE TIOMX_SetupTunnel(OMX_IN OMX_HANDLETYPE hOutput, - OMX_IN OMX_U32 nPortOutput, - OMX_IN OMX_HANDLETYPE hInput, OMX_IN OMX_U32 nPortInput) -{ - - TIMM_OSAL_Entering("TIOMX_SetupTunnel\n"); - - return OMX_SetupTunnel(hOutput, nPortOutput, hInput, nPortInput); -} - -OMX_API OMX_ERRORTYPE TIOMX_GetContentPipe(OMX_OUT OMX_HANDLETYPE * hPipe, - OMX_IN OMX_STRING szURI) -{ - - TIMM_OSAL_Entering("TIOMX_GetContentPipe\n"); - - //return OMX_GetContentPipe( - // hPipe, - // szURI); - return 0; -} -#endif diff --git a/domx/omx_proxy_component/Android.mk b/domx/omx_proxy_component/Android.mk deleted file mode 100644 index 93386e9..0000000 --- a/domx/omx_proxy_component/Android.mk +++ /dev/null @@ -1,208 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -# -# libOMX.TI.DUCATI1.VIDEO.DECODER -# - -include $(CLEAR_VARS) - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/../omx_core/inc \ - $(LOCAL_PATH)/../mm_osal/inc \ - $(LOCAL_PATH)/../domx \ - $(LOCAL_PATH)/../domx/omx_rpc/inc \ - hardware/libhardware/include \ - $(DEVICE_FOLDER)/hwc/ \ - frameworks/native/include/media/openmax - -LOCAL_SHARED_LIBRARIES := \ - libmm_osal \ - libc \ - libOMX_Core \ - liblog \ - libdomx \ - libhardware - -LOCAL_CFLAGS += -DLINUX -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER -LOCAL_CFLAGS += -D_Android -DSET_STRIDE_PADDING_FROM_PROXY -DANDROID_QUIRK_CHANGE_PORT_VALUES -DUSE_ENHANCED_PORTRECONFIG -LOCAL_CFLAGS += -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION -DENABLE_GRALLOC_BUFFERS - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := omx_video_dec/src/omx_proxy_videodec.c omx_video_dec/src/omx_proxy_videodec_utils.c -LOCAL_MODULE := libOMX.TI.DUCATI1.VIDEO.DECODER -include $(BUILD_SHARED_LIBRARY) - -# -# libOMX.TI.DUCATI1.MISC.SAMPLE -# - -include $(CLEAR_VARS) - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/../omx_core/inc \ - $(LOCAL_PATH)/../mm_osal/inc \ - $(LOCAL_PATH)/../domx \ - $(LOCAL_PATH)/../domx/omx_rpc/inc \ - frameworks/native/include/media/openmax - -LOCAL_SHARED_LIBRARIES := \ - libmm_osal \ - libc \ - libOMX_Core \ - liblog \ - libdomx - -LOCAL_CFLAGS += -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER -LOCAL_CFLAGS += -D_Android -DSET_STRIDE_PADDING_FROM_PROXY -DANDROID_QUIRK_CHANGE_PORT_VALUES -DUSE_ENHANCED_PORTRECONFIG -LOCAL_CFLAGS += -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := omx_sample/src/omx_proxy_sample.c -LOCAL_MODULE := libOMX.TI.DUCATI1.MISC.SAMPLE -include $(BUILD_SHARED_LIBRARY) - - -# -# libOMX.TI.DUCATI1.VIDEO.CAMERA -# - -include $(CLEAR_VARS) - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/../omx_core/inc \ - $(LOCAL_PATH)/../mm_osal/inc \ - $(LOCAL_PATH)/../domx \ - $(DEVICE_FOLDER)/libion_ti/ \ - $(LOCAL_PATH)/../domx/omx_rpc/inc \ - frameworks/native/include/media/openmax - -LOCAL_SHARED_LIBRARIES := \ - libmm_osal \ - libc \ - libOMX_Core \ - liblog \ - libion_ti \ - libdomx - -LOCAL_CFLAGS += -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER -LOCAL_CFLAGS += -D_Android -DSET_STRIDE_PADDING_FROM_PROXY -DANDROID_QUIRK_CHANGE_PORT_VALUES -DUSE_ENHANCED_PORTRECONFIG -LOCAL_CFLAGS += -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := omx_camera/src/omx_proxy_camera.c -LOCAL_MODULE := libOMX.TI.DUCATI1.VIDEO.CAMERA -include $(BUILD_SHARED_LIBRARY) - -# -# libOMX.TI.DUCATI1.VIDEO.H264E -# - -include $(CLEAR_VARS) - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/../omx_core/inc \ - $(LOCAL_PATH)/../mm_osal/inc \ - $(LOCAL_PATH)/../domx \ - $(LOCAL_PATH)/../domx/omx_rpc/inc \ - system/core/include/cutils \ - $(DEVICE_FOLDER)/hwc \ - $(DEVICE_FOLDER)/camera/inc \ - frameworks/base/include/media/stagefright \ - frameworks/native/include/media/hardware \ - frameworks/native/include/media/openmax - -LOCAL_SHARED_LIBRARIES := \ - libmm_osal \ - libc \ - libOMX_Core \ - liblog \ - libdomx \ - libhardware \ - libcutils - - -LOCAL_CFLAGS += -DLINUX -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER -LOCAL_CFLAGS += -D_Android -DSET_STRIDE_PADDING_FROM_PROXY -DANDROID_QUIRK_CHANGE_PORT_VALUES -DUSE_ENHANCED_PORTRECONFIG -LOCAL_CFLAGS += -DENABLE_GRALLOC_BUFFER -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION -LOCAL_CFLAGS += -DANDROID_CUSTOM_OPAQUECOLORFORMAT - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := omx_h264_enc/src/omx_proxy_h264enc.c -LOCAL_MODULE := libOMX.TI.DUCATI1.VIDEO.H264E -include $(BUILD_SHARED_LIBRARY) - -# -# libOMX.TI.DUCATI1.VIDEO.MPEG4E -# - -include $(CLEAR_VARS) - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/../omx_core/inc \ - $(LOCAL_PATH)/../mm_osal/inc \ - $(LOCAL_PATH)/../domx \ - $(LOCAL_PATH)/../domx/omx_rpc/inc \ - system/core/include/cutils \ - $(DEVICE_FOLDER)/hwc \ - $(DEVICE_FOLDER)/camera/inc \ - frameworks/base/include/media/stagefright \ - frameworks/native/include/media/hardware \ - frameworks/native/include/media/openmax - -LOCAL_SHARED_LIBRARIES := \ - libmm_osal \ - libc \ - libOMX_Core \ - liblog \ - libdomx \ - libhardware \ - libcutils - -LOCAL_CFLAGS += -DLINUX -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER -LOCAL_CFLAGS += -D_Android -DSET_STRIDE_PADDING_FROM_PROXY -DANDROID_QUIRK_CHANGE_PORT_VALUES -DUSE_ENHANCED_PORTRECONFIG -LOCAL_CFLAGS += -DENABLE_GRALLOC_BUFFER -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION -LOCAL_CFLAGS += -DANDROID_CUSTOM_OPAQUECOLORFORMAT - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := omx_mpeg4_enc/src/omx_proxy_mpeg4enc.c -LOCAL_MODULE := libOMX.TI.DUCATI1.VIDEO.MPEG4E -include $(BUILD_SHARED_LIBRARY) - -# -# libOMX.TI.DUCATI1.VIDEO.DECODER.secure -# - -include $(CLEAR_VARS) - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/../omx_core/inc \ - $(LOCAL_PATH)/../mm_osal/inc \ - $(LOCAL_PATH)/../domx \ - $(LOCAL_PATH)/../domx/omx_rpc/inc \ - hardware/libhardware/include \ - $(DEVICE_FOLDER)/hwc/ \ - frameworks/native/include/media/openmax - -LOCAL_SHARED_LIBRARIES := \ - libmm_osal \ - libc \ - libOMX_Core \ - liblog \ - libdomx \ - libhardware \ - libOMX.TI.DUCATI1.VIDEO.DECODER - -LOCAL_CFLAGS += -DLINUX -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER -LOCAL_CFLAGS += -D_Android -DSET_STRIDE_PADDING_FROM_PROXY -DANDROID_QUIRK_CHANGE_PORT_VALUES -DUSE_ENHANCED_PORTRECONFIG -LOCAL_CFLAGS += -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION -DENABLE_GRALLOC_BUFFERS - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := omx_video_dec/src/omx_proxy_videodec_secure.c -LOCAL_MODULE := libOMX.TI.DUCATI1.VIDEO.DECODER.secure -include $(BUILD_SHARED_LIBRARY) diff --git a/domx/omx_proxy_component/Makefile b/domx/omx_proxy_component/Makefile deleted file mode 100755 index 1ddc22b..0000000 --- a/domx/omx_proxy_component/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -# -# Copyright 2001-2008 Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# SEP xx,2002 REF=ORG Swamy MC -# Original version. -# ---------------------------------------------------------------------------- - -#PROJROOT = $(ROOTDIR)/src - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = DEBUG - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. -#TARGETTYPE = ST_LIB -TARGETTYPE = - -# For shared object library, soname is filename.so.maj_ver -SH_SONAME = - -# Folders in which gmake will run before building current target - -SUBMODULES = \ -omx_sample \ -omx_video_dec \ -omx_h264_enc \ -omx_mpeg4_enc \ - -#video/omx_proxy_component/test - -# Filename must not begin with '.', '/' or '\' - -SOURCES = - -# Search path for include files - -INCLUDES = - -# Libraries needed for linking. - -ST_LIBS = -SH_LIBS = - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk - diff --git a/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c b/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c deleted file mode 100755 index 0afb95e..0000000 --- a/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c +++ /dev/null @@ -1,909 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_proxy_camera.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework Tunnel Proxy component. - ****************************************************************************** - This is the proxy specific wrapper that passes the component name to the - generic proxy init() The proxy wrapper also does some runtime/static time - config on per proxy basis This is a thin wrapper that is called when - componentiit() of the proxy is called static OMX_ERRORTYPE PROXY_Wrapper_init - (OMX_HANDLETYPE hComponent, OMX_PTR pAppData); - this layer gets called first whenever a proxy s get handle is called - ****************************************************************************** - * @path WTSD_DucatiMMSW\omx\omx_il_1_x\omx_proxy_component\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include <dirent.h> -#include <stdio.h> -#include <string.h> -#include <pthread.h> -#include <sys/time.h> -#include <stdlib.h> -#include <errno.h> - -#include <timm_osal_interfaces.h> -#include <OMX_TI_IVCommon.h> -#include <OMX_TI_Index.h> -#include "omx_proxy_common.h" -#include "timm_osal_mutex.h" - -#ifdef USE_ION -#include <unistd.h> -#include <ion_ti/ion.h> -#include <sys/ioctl.h> -#include <sys/mman.h> -#include <sys/eventfd.h> -#include <fcntl.h> -#include <errno.h> -#endif - -#define COMPONENT_NAME "OMX.TI.DUCATI1.VIDEO.CAMERA" -/*Needs to be specific for every configuration wrapper*/ - -#undef LOG_TAG -#define LOG_TAG "CameraHAL" - -#define DEFAULT_DCC 1 - -#define LINUX_PAGE_SIZE (4 * 1024) - -#define _PROXY_OMX_INIT_PARAM(param,type) do { \ - TIMM_OSAL_Memset((param), 0, sizeof (type)); \ - (param)->nSize = sizeof (type); \ - (param)->nVersion.s.nVersionMajor = 1; \ - (param)->nVersion.s.nVersionMinor = 1; \ - } while(0) - -/* VTC specific changes */ -#define MAX_NUM_INTERNAL_BUFFERS 4 -#define MAX_VTC_WIDTH 1920 -#define MAX_VTC_HEIGHT 1080 -#define BORDER_WIDTH 32 -#define BORDER_HEIGHT 32 -#define MAX_VTC_WIDTH_WITH_VNF (MAX_VTC_WIDTH + BORDER_WIDTH) -#define MAX_VTC_HEIGHT_WITH_VNF (MAX_VTC_HEIGHT + BORDER_HEIGHT) -#ifndef OMAP_TUNA -OMX_PTR gCamIonHdl[MAX_NUM_INTERNAL_BUFFERS][2]; -#endif - -/* Tiler heap resservation specific */ -#define OMAP_ION_HEAP_TILER_ALLOCATION_MASK (1<<4) -#ifndef OMAP_TUNA -/* store handles for tracking and freeing */ -OMX_PTR gComponentBufferAllocation[PROXY_MAXNUMOFPORTS][MAX_NUM_INTERNAL_BUFFERS]; -#endif - -/* Incase of multiple instance, making sure DCC is initialized only for - first instance */ -static OMX_S16 numofInstance = 0; -int dcc_flag = 0; -TIMM_OSAL_PTR cam_mutex = NULL; - -/* To store DCC buffer size */ -OMX_S32 dccbuf_size = 0; - -/* Ducati Mapped Addr */ -OMX_PTR DCC_Buff = NULL; - -#ifdef USE_ION -OMX_PTR DCC_Buff_ptr = NULL; -int ion_fd; -int mmap_fd; -#endif - -OMX_S32 read_DCCdir(OMX_PTR, OMX_STRING *, OMX_U16); -OMX_ERRORTYPE DCC_Init(OMX_HANDLETYPE); -OMX_ERRORTYPE send_DCCBufPtr(OMX_HANDLETYPE hComponent); -void DCC_DeInit(); -OMX_ERRORTYPE PROXY_ComponentDeInit(OMX_HANDLETYPE); -OMX_ERRORTYPE __PROXY_SetConfig(OMX_HANDLETYPE, OMX_INDEXTYPE, - OMX_PTR, OMX_PTR); -OMX_ERRORTYPE __PROXY_GetConfig(OMX_HANDLETYPE, OMX_INDEXTYPE, - OMX_PTR, OMX_PTR); -OMX_ERRORTYPE __PROXY_SetParameter(OMX_IN OMX_HANDLETYPE, OMX_INDEXTYPE, - OMX_PTR, OMX_PTR, OMX_U32); -OMX_ERRORTYPE __PROXY_GetParameter(OMX_IN OMX_HANDLETYPE, OMX_INDEXTYPE, - OMX_PTR, OMX_PTR); -OMX_ERRORTYPE PROXY_SendCommand(OMX_HANDLETYPE, OMX_COMMANDTYPE, - OMX_U32,OMX_PTR); -OMX_ERRORTYPE CameraMaptoTilerDuc(OMX_TI_CONFIG_SHAREDBUFFER *, OMX_PTR *); -//COREID TARGET_CORE_ID = CORE_APPM3; - -static OMX_ERRORTYPE ComponentPrivateDeInit(OMX_IN OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eOsalError = TIMM_OSAL_ERR_NONE; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U32 i, j; - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - if (dcc_flag) - { - eOsalError = - TIMM_OSAL_MutexObtain(cam_mutex, TIMM_OSAL_SUSPEND); - if (eOsalError != TIMM_OSAL_ERR_NONE) - { - TIMM_OSAL_Error("Mutex Obtain failed"); - } - - numofInstance = numofInstance - 1; - - eOsalError = TIMM_OSAL_MutexRelease(cam_mutex); - PROXY_assert(eOsalError == TIMM_OSAL_ERR_NONE, - OMX_ErrorInsufficientResources, "Mutex release failed"); - } -#ifndef OMAP_TUNA - for(i=0; i < MAX_NUM_INTERNAL_BUFFERS; i++) { - if (gCamIonHdl[i][0] != NULL) { - ion_free(pCompPrv->ion_fd, gCamIonHdl[i][0]); - gCamIonHdl[i][0] = NULL; - } - if (gCamIonHdl[i][1] != NULL) { - ion_free(pCompPrv->ion_fd, gCamIonHdl[i][1]); - gCamIonHdl[i][1] = NULL; - } - } - - for (i = 0; i < PROXY_MAXNUMOFPORTS; i++) { - for (j = 0; j < MAX_NUM_INTERNAL_BUFFERS; j++) { - if (gComponentBufferAllocation[i][j]) { - ion_free(pCompPrv->ion_fd, gComponentBufferAllocation[i][j]); - } - gComponentBufferAllocation[i][j] = NULL; - } - } -#endif - - eError = PROXY_ComponentDeInit(hComponent); - - EXIT: - return eError; -} - -static OMX_ERRORTYPE Camera_SendCommand(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_COMMANDTYPE eCmd, - OMX_IN OMX_U32 nParam, OMX_IN OMX_PTR pCmdData) - -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - static OMX_BOOL dcc_loaded = OMX_FALSE; - - OMX_ERRORTYPE dcc_eError = OMX_ErrorNone; - TIMM_OSAL_ERRORTYPE eOsalError = TIMM_OSAL_ERR_NONE; - OMX_U32 i; - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - if ((eCmd == OMX_CommandStateSet) && - (nParam == (OMX_STATETYPE) OMX_StateIdle)) - { - if (!dcc_loaded) - { - dcc_eError = DCC_Init(hComponent); - if (dcc_eError != OMX_ErrorNone) - { - DOMX_ERROR(" Error in DCC Init"); - } - /* Configure Ducati to use DCC buffer from A9 side - *ONLY* if DCC_Init is successful. */ - if (dcc_eError == OMX_ErrorNone) - { - dcc_eError = send_DCCBufPtr(hComponent); - if (dcc_eError != OMX_ErrorNone) - { - DOMX_ERROR(" Error in Sending DCC Buf ptr"); - } - DCC_DeInit(); - } - dcc_loaded = OMX_TRUE; - } - } -#ifndef OMAP_TUNA - else if (eCmd == OMX_CommandPortDisable) { - int i, j; - for (i = 0; i < MAX_NUM_INTERNAL_BUFFERS; i++) { - for (j = 0; j < PROXY_MAXNUMOFPORTS; j++) { - if (((j == nParam) || (nParam == OMX_ALL)) && - gComponentBufferAllocation[i][j]) - { - ion_free(pCompPrv->ion_fd, gComponentBufferAllocation[i][j]); - gComponentBufferAllocation[i][j] = NULL; - } - } - } - } -#endif - - eError = - PROXY_SendCommand(hComponent,eCmd,nParam,pCmdData); - - -EXIT: - - DOMX_EXIT("eError: %d", eError); - return eError; - -} - -/* ===========================================================================*/ -/** - * @name CameraGetConfig() - * @brief For some specific indices, buffer allocated on A9 side - * needs to be mapped and sent to Ducati. - * @param - * @return OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ - -static OMX_ERRORTYPE CameraGetConfig(OMX_IN OMX_HANDLETYPE - hComponent, OMX_IN OMX_INDEXTYPE nParamIndex, - OMX_INOUT OMX_PTR pComponentParameterStructure) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_TI_CONFIG_SHAREDBUFFER *pConfigSharedBuffer = NULL; - OMX_PTR pTempSharedBuff = NULL; - OMX_U32 status = 0; - - switch (nParamIndex) - { - case OMX_TI_IndexConfigAAAskipBuffer: - case OMX_TI_IndexConfigCamCapabilities: - case OMX_TI_IndexConfigExifTags: - case OMX_TI_IndexConfigAlgoAreas: - pConfigSharedBuffer = - (OMX_TI_CONFIG_SHAREDBUFFER *) pComponentParameterStructure; - - pTempSharedBuff = pConfigSharedBuffer->pSharedBuff; - - // TODO(XXX): Cache API is not yet available. Client needs to - // allocate tiler buffer directly and assign to pSharedBuff. - // Ptr allocated by MemMgr_Alloc in uncacheable so there - // would be no need to cache API - - eError = __PROXY_GetConfig(hComponent, - nParamIndex, - pConfigSharedBuffer, - &(pConfigSharedBuffer->pSharedBuff)); - - PROXY_assert((eError == OMX_ErrorNone), eError, - "Error in GetConfig"); - - pConfigSharedBuffer->pSharedBuff = pTempSharedBuff; - - goto EXIT; - break; - default: - break; - } - - return __PROXY_GetConfig(hComponent, - nParamIndex, - pComponentParameterStructure, - NULL); - - EXIT: - return eError; -} - -/* ===========================================================================*/ -/** - * @name CameraSetConfig() - * @brief For some specific indices, buffer allocated on A9 side needs to - * be mapped and sent to Ducati. - * @param - * @return OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ - - -static OMX_ERRORTYPE CameraSetConfig(OMX_IN OMX_HANDLETYPE - hComponent, OMX_IN OMX_INDEXTYPE nParamIndex, - OMX_INOUT OMX_PTR pComponentParameterStructure) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_TI_CONFIG_SHAREDBUFFER *pConfigSharedBuffer = NULL; - OMX_PTR pTempSharedBuff = NULL; - OMX_U32 status = 0; - - switch (nParamIndex) - { - case OMX_TI_IndexConfigAAAskipBuffer: - case OMX_TI_IndexConfigCamCapabilities: - case OMX_TI_IndexConfigExifTags: - case OMX_TI_IndexConfigAlgoAreas: - pConfigSharedBuffer = - (OMX_TI_CONFIG_SHAREDBUFFER *) - pComponentParameterStructure; - - pTempSharedBuff = pConfigSharedBuffer->pSharedBuff; - - // TODO(XXX): Cache API is not yet available. Client needs to - // allocate tiler buffer directly and assign to pSharedBuff. - // Ptr allocated by MemMgr_Alloc in uncacheable so there - // would be no need to cache API - - eError = __PROXY_SetConfig(hComponent, - nParamIndex, - pConfigSharedBuffer, - &(pConfigSharedBuffer->pSharedBuff)); - - PROXY_assert((eError == OMX_ErrorNone), eError, - "Error in GetConfig"); - - pConfigSharedBuffer->pSharedBuff = pTempSharedBuff; - - goto EXIT; - break; - default: - break; - } - - return __PROXY_SetConfig(hComponent, - nParamIndex, - pComponentParameterStructure, - NULL); - - EXIT: - return eError; -} - -static OMX_ERRORTYPE CameraSetParam(OMX_IN OMX_HANDLETYPE - hComponent, OMX_IN OMX_INDEXTYPE nParamIndex, - OMX_INOUT OMX_PTR pComponentParameterStructure) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *)hComponent; -#ifndef OMAP_TUNA - struct ion_handle *handle; - OMX_U32 i =0; - OMX_S32 ret = 0; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_U32 stride_Y = 0, stride_UV = 0; -#ifndef OMAP_TUNA - OMX_TI_PARAM_VTCSLICE *pVtcConfig;// = (OMX_TI_PARAM_VTCSLICE *)pComponentParameterStructure; - OMX_TI_PARAM_COMPONENTBUFALLOCTYPE *bufferalloc = NULL; -#endif - int size = 0; - int fd1 = -1, fd2 = -1; - - pCompPrv = (PROXY_COMPONENT_PRIVATE *)hComp->pComponentPrivate; - //fprintf(stdout, "DOMX: CameraSetParam: called!!!\n"); - switch (nParamIndex) - { -#ifndef OMAP_TUNA - case OMX_TI_IndexParamVtcSlice: - pVtcConfig = (OMX_TI_PARAM_VTCSLICE *)pComponentParameterStructure; - fprintf(stdout, "DOMX: CameraSetParam: OMX_TI_IndexParamVtcSlice is called!!!\n"); - DOMX_ERROR("CameraSetParam Called for Vtc Slice index\n"); - - //fprintf(stdout, "CameraSetParam Called for Vtc Slice height = %d\n", ((OMX_TI_PARAM_VTCSLICE *)pComponentParameterStructure)->nSliceHeight); - // MAX_NUM_INTERNAL_BUFFERS; - - for(i=0; i < MAX_NUM_INTERNAL_BUFFERS; i++) { - pVtcConfig->nInternalBuffers = i; - ret = ion_alloc_tiler(pCompPrv->ion_fd, MAX_VTC_WIDTH_WITH_VNF, MAX_VTC_HEIGHT_WITH_VNF, TILER_PIXEL_FMT_8BIT, OMAP_ION_HEAP_TILER_MASK, &handle, (size_t *)&stride_Y); - if (ret < 0) { - DOMX_ERROR ("ION allocation failed - %s", strerror(errno)); - goto EXIT; - } - - ret = ion_share(pCompPrv->ion_fd, handle, &fd1); - if (ret < 0) { - DOMX_ERROR("ION share failed"); - ion_free(pCompPrv->ion_fd, handle); - goto EXIT; - } - - pVtcConfig->IonBufhdl[0] = (OMX_PTR)(fd1); - - //fprintf(stdout, "DOMX: ION Buffer#%d: Y: 0x%x\n", i, pVtcConfig->IonBufhdl[0]); - - ret = ion_alloc_tiler(pCompPrv->ion_fd, MAX_VTC_WIDTH_WITH_VNF/2, MAX_VTC_HEIGHT_WITH_VNF/2, TILER_PIXEL_FMT_16BIT, OMAP_ION_HEAP_TILER_MASK, &handle, (size_t *)&stride_UV); - if (ret < 0) { - DOMX_ERROR ("ION allocation failed - %s", strerror(errno)); - goto EXIT; - } - - ret = ion_share(pCompPrv->ion_fd, handle, &fd2); - if (ret < 0) { - DOMX_ERROR("ION share failed"); - ion_free(pCompPrv->ion_fd, handle); - goto EXIT; - } - - pVtcConfig->IonBufhdl[1] = (OMX_PTR)(fd2); - gCamIonHdl[i][0] = pVtcConfig->IonBufhdl[0]; - gCamIonHdl[i][1] = pVtcConfig->IonBufhdl[1]; - //fprintf(stdout, "DOMX: ION Buffer#%d: UV: 0x%x\n", i, pVtcConfig->IonBufhdl[1]); - eError = __PROXY_SetParameter(hComponent, - OMX_TI_IndexParamVtcSlice, - pVtcConfig, - pVtcConfig->IonBufhdl, 2); - close(fd1); - close(fd2); - } - goto EXIT; - case OMX_TI_IndexParamComponentBufferAllocation: { - OMX_U32 port = 0, index = 0; - int fd; - bufferalloc = (OMX_TI_PARAM_COMPONENTBUFALLOCTYPE *) - pComponentParameterStructure; - - port = bufferalloc->nPortIndex; - index = bufferalloc->nIndex; - - size = bufferalloc->nAllocWidth * bufferalloc->nAllocLines; - ret = ion_alloc_tiler (pCompPrv->ion_fd, size, 1, - TILER_PIXEL_FMT_PAGE, - OMAP_ION_HEAP_TILER_ALLOCATION_MASK, - &handle, &stride_Y); - if (ret < 0) { - DOMX_ERROR ("ION allocation failed - %s", strerror(errno)); - goto EXIT; - } - - ret = ion_share(pCompPrv->ion_fd, handle, &fd); - if (ret < 0) { - DOMX_ERROR("ION share failed"); - ion_free(pCompPrv->ion_fd, handle); - goto EXIT; - } - - bufferalloc->pBuf[0] = fd; - eError = __PROXY_SetParameter(hComponent, - OMX_TI_IndexParamComponentBufferAllocation, - bufferalloc, &bufferalloc->pBuf[0], 1); - if (eError != OMX_ErrorNone) { - ion_free(pCompPrv->ion_fd, handle); - } else { - if (gComponentBufferAllocation[port][index]) { - ion_free(pCompPrv->ion_fd, gComponentBufferAllocation[port][index]); - } - gComponentBufferAllocation[port][index] = handle; - } - close (fd); - } - goto EXIT; - break; -#endif - default: - break; - } -#endif - eError = __PROXY_SetParameter(hComponent, - nParamIndex, - pComponentParameterStructure, - NULL, 0); - - if (eError != OMX_ErrorNone) { - DOMX_ERROR(" CameraSetParam: Error in SetParam 0x%x", eError); - } -EXIT: - return eError; -} -OMX_ERRORTYPE OMX_ComponentInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_ERRORTYPE dcc_eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pComponentPrivate; - OMX_U32 i = 0, j = 0; - pHandle = (OMX_COMPONENTTYPE *) hComponent; - TIMM_OSAL_ERRORTYPE eOsalError = TIMM_OSAL_ERR_NONE; - DOMX_ENTER("_____________________INSIDE CAMERA PROXY" - "WRAPPER__________________________\n"); - pHandle->pComponentPrivate = (PROXY_COMPONENT_PRIVATE *) - TIMM_OSAL_Malloc(sizeof(PROXY_COMPONENT_PRIVATE), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - - pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - if (pHandle->pComponentPrivate == NULL) - { - DOMX_ERROR(" ERROR IN ALLOCATING PROXY COMPONENT" - "PRIVATE STRUCTURE"); - eError = OMX_ErrorInsufficientResources; - goto EXIT; - } - TIMM_OSAL_Memset(pComponentPrivate, 0, - sizeof(PROXY_COMPONENT_PRIVATE)); - - pComponentPrivate->cCompName = - TIMM_OSAL_Malloc(MAX_COMPONENT_NAME_LENGTH * sizeof(OMX_U8), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - /*Copying component Name - this will be picked up in the proxy common */ - assert(strlen(COMPONENT_NAME) + 1 < MAX_COMPONENT_NAME_LENGTH); - TIMM_OSAL_Memcpy(pComponentPrivate->cCompName, COMPONENT_NAME, - strlen(COMPONENT_NAME) + 1); - - /*Calling Proxy Common Init() */ - eError = OMX_ProxyCommonInit(hComponent); - if (eError != OMX_ErrorNone) - { - DOMX_ERROR("\Error in Initializing Proxy"); - TIMM_OSAL_Free(pComponentPrivate->cCompName); - TIMM_OSAL_Free(pComponentPrivate); - goto EXIT; - } -#ifndef OMAP_TUNA - for(i=0; i < MAX_NUM_INTERNAL_BUFFERS; i++) { - gCamIonHdl[i][0] = NULL; - gCamIonHdl[i][1] = NULL; - } - - for (i = 0; i < PROXY_MAXNUMOFPORTS; i++) { - for (j = 0; j < MAX_NUM_INTERNAL_BUFFERS; j++) { - gComponentBufferAllocation[i][j] = NULL; - } - } -#endif - pHandle->ComponentDeInit = ComponentPrivateDeInit; - pHandle->GetConfig = CameraGetConfig; - pHandle->SetConfig = CameraSetConfig; - pHandle->SendCommand = Camera_SendCommand; - pHandle->SetParameter = CameraSetParam; - - EXIT: - return eError; -} - -/* ===========================================================================*/ -/** - * @name DCC_Init() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE DCC_Init(OMX_HANDLETYPE hComponent) -{ - OMX_TI_PARAM_DCCURIINFO param; - OMX_PTR ptempbuf; - OMX_U16 nIndex = 0; - OMX_ERRORTYPE eError = OMX_ErrorNone; -#ifdef USE_ION - int ret; - size_t stride; -#endif - - OMX_S32 status = 0; - OMX_STRING dcc_dir[200]; - OMX_U16 i; - _PROXY_OMX_INIT_PARAM(¶m, OMX_TI_PARAM_DCCURIINFO); - - DOMX_ENTER("ENTER"); - /* Read the the DCC URI info */ - for (nIndex = 0; eError != OMX_ErrorNoMore; nIndex++) - { - param.nIndex = nIndex; - eError = - OMX_GetParameter(hComponent, - OMX_TI_IndexParamDccUriInfo, ¶m); - - PROXY_assert((eError == OMX_ErrorNone) || - (eError == OMX_ErrorNoMore), eError, - "Error in GetParam for Dcc URI info"); - - if (eError == OMX_ErrorNone) - { - DOMX_DEBUG("DCC URI's %s ", param.sDCCURI); - dcc_dir[nIndex] = - TIMM_OSAL_Malloc(sizeof(OMX_U8) * - (strlen(DCC_PATH) + MAX_URI_LENGTH + 1), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - PROXY_assert(dcc_dir[nIndex] != NULL, - OMX_ErrorInsufficientResources, "Malloc failed"); - strcpy(dcc_dir[nIndex], DCC_PATH); - strncat(dcc_dir[nIndex], (OMX_STRING) param.sDCCURI, MAX_URI_LENGTH); - strcat(dcc_dir[nIndex], "/"); - } - } - - /* setting back errortype OMX_ErrorNone */ - if (eError == OMX_ErrorNoMore) - { - eError = OMX_ErrorNone; - } - - dccbuf_size = read_DCCdir(NULL, dcc_dir, nIndex); - - if(dccbuf_size <= 0) - { - DOMX_DEBUG("No DCC files found, switching back to default DCC"); - return OMX_ErrorInsufficientResources; - } - -#ifdef USE_ION - ion_fd = ion_open(); - if(ion_fd == 0) - { - DOMX_ERROR("ion_open failed!!!"); - return OMX_ErrorInsufficientResources; - } - dccbuf_size = (dccbuf_size + LINUX_PAGE_SIZE -1) & ~(LINUX_PAGE_SIZE - 1); - ret = ion_alloc(ion_fd, dccbuf_size, 0x1000, 1 << ION_HEAP_TYPE_CARVEOUT, - (struct ion_handle **)&DCC_Buff); - - if (ret || ((int)DCC_Buff == -ENOMEM)) { - ret = ion_alloc_tiler(ion_fd, dccbuf_size, 1, TILER_PIXEL_FMT_PAGE, - OMAP_ION_HEAP_TILER_MASK, &DCC_Buff, &stride); - } - - if (ret || ((int)DCC_Buff == -ENOMEM)) { - DOMX_ERROR("FAILED to allocate DCC buffer of size=%d. ret=0x%x", - dccbuf_size, ret); - return OMX_ErrorInsufficientResources; - } - - if (ion_map(ion_fd, DCC_Buff, dccbuf_size, PROT_READ | PROT_WRITE, MAP_SHARED, 0, - (unsigned char **)&DCC_Buff_ptr, &mmap_fd) < 0) - { - DOMX_ERROR("userspace mapping of ION buffers returned error"); - return OMX_ErrorInsufficientResources; - } - ptempbuf = DCC_Buff_ptr; -#endif - dccbuf_size = read_DCCdir(ptempbuf, dcc_dir, nIndex); - - PROXY_assert(dccbuf_size > 0, OMX_ErrorInsufficientResources, - "ERROR in copy DCC files into buffer"); - - EXIT: - for (i = 0; i < nIndex - 1; i++) - { - TIMM_OSAL_Free(dcc_dir[i]); - } - - return eError; - -} - -/* ===========================================================================*/ -/** - * @name send_DCCBufPtr() - * @brief : Sending the DCC uri buff addr to ducati - * @param void - * @return return = 0 is successful - * @sa TBD - * - */ -/* ===========================================================================*/ - -OMX_ERRORTYPE send_DCCBufPtr(OMX_HANDLETYPE hComponent) -{ - OMX_TI_CONFIG_SHAREDBUFFER uribufparam; - OMX_ERRORTYPE eError = OMX_ErrorNone; - - _PROXY_OMX_INIT_PARAM(&uribufparam, OMX_TI_CONFIG_SHAREDBUFFER); - uribufparam.nPortIndex = OMX_ALL; - - DOMX_ENTER("ENTER"); - - uribufparam.nSharedBuffSize = dccbuf_size; -#ifdef USE_ION - uribufparam.pSharedBuff = (OMX_PTR) mmap_fd; -#else - uribufparam.pSharedBuff = (OMX_PTR) DCC_Buff; -#endif - - DOMX_DEBUG("SYSLINK MAPPED ADDR: 0x%x sizeof buffer %d", - uribufparam.pSharedBuff, uribufparam.nSharedBuffSize); - - eError = __PROXY_SetParameter(hComponent, - OMX_TI_IndexParamDccUriBuffer, - &uribufparam, - &(uribufparam.pSharedBuff), 1); - - if (eError != OMX_ErrorNone) { - DOMX_ERROR(" Error in SetParam for DCC Uri Buffer 0x%x", eError); - } - - DOMX_EXIT("EXIT"); - return eError; -} - -/* ===========================================================================*/ -/** - * @name read_DCCdir() - * @brief : copies all the dcc profiles into the allocated 1D-Tiler buffer - * and returns the size of the buffer. - * @param void : OMX_PTR is null then returns the size of the DCC directory - * @return return = size of the DCC directory or error in case of any failures - * in file read or open - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_S32 read_DCCdir(OMX_PTR buffer, OMX_STRING * dir_path, OMX_U16 numofURI) -{ - FILE *pFile; - OMX_S32 lSize; - OMX_S32 dcc_buf_size = 0; - size_t result; - OMX_STRING filename; - char temp[200]; - OMX_STRING dotdot = ".."; - DIR *d; - struct dirent *dir; - OMX_U16 i = 0; - OMX_S32 ret = 0; - - DOMX_ENTER("ENTER"); - for (i = 0; i < numofURI - 1; i++) - { - d = opendir(dir_path[i]); - if (d) - { - /* read each filename */ - while ((dir = readdir(d)) != NULL) - { - filename = dir->d_name; - strcpy(temp, dir_path[i]); - strcat(temp, filename); - if ((*filename != *dotdot)) - { - DOMX_DEBUG - ("\n\t DCC Profiles copying into buffer => %s mpu_addr: %p", - temp, buffer); - pFile = fopen(temp, "rb"); - if (pFile == NULL) - { - DOMX_ERROR("File open error"); - ret = -1; - } else - { - fseek(pFile, 0, SEEK_END); - lSize = ftell(pFile); - rewind(pFile); - /* buffer is not NULL then copy all the DCC profiles into buffer - else return the size of the DCC directory */ - if (buffer) - { - // copy file into the buffer: - result = - fread(buffer, 1, - lSize, pFile); - if (result != (size_t) lSize) - { - DOMX_ERROR - ("fread: Reading error"); - ret = -1; - } - buffer = - buffer + lSize; - } - /* getting the size of the total dcc files available in FS */ - dcc_buf_size = - dcc_buf_size + lSize; - // terminate - fclose(pFile); - } - } - } - closedir(d); - } - } - if (ret == 0) - ret = dcc_buf_size; - - DOMX_EXIT("return %d", ret); - return ret; -} - -/* ===========================================================================*/ -/** - * @name DCC_Deinit() - * @brief - * @param void - * @return void - * @sa TBD - * - */ -/* ===========================================================================*/ -void DCC_DeInit() -{ - DOMX_ENTER("ENTER"); - - if (DCC_Buff) - { -#ifdef USE_ION - munmap(DCC_Buff_ptr, dccbuf_size); - close(mmap_fd); - ion_free(ion_fd, DCC_Buff); - ion_close(ion_fd); - DCC_Buff = NULL; -#endif - } - - DOMX_EXIT("EXIT"); -} - - - -/*===============================================================*/ -/** @fn Cam_Setup : This function is called when the the OMX Camera library is - * loaded. It creates a mutex, which is used during DCC_Init() - */ -/*===============================================================*/ -void __attribute__ ((constructor)) Cam_Setup(void) -{ - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - - eError = TIMM_OSAL_MutexCreate(&cam_mutex); - if (eError != TIMM_OSAL_ERR_NONE) - { - TIMM_OSAL_Error("Creation of default mutex failed"); - } -} - - -/*===============================================================*/ -/** @fn Cam_Destroy : This function is called when the the OMX Camera library is - * unloaded. It destroys the mutex which was created by - * Core_Setup(). - * - */ -/*===============================================================*/ -void __attribute__ ((destructor)) Cam_Destroy(void) -{ - TIMM_OSAL_ERRORTYPE eError = TIMM_OSAL_ERR_NONE; - - eError = TIMM_OSAL_MutexDelete(cam_mutex); - if (eError != TIMM_OSAL_ERR_NONE) - { - TIMM_OSAL_Error("Destruction of default mutex failed"); - } -} diff --git a/domx/omx_proxy_component/omx_h264_enc/Makefile b/domx/omx_proxy_component/omx_h264_enc/Makefile deleted file mode 100755 index c528740..0000000 --- a/domx/omx_proxy_component/omx_h264_enc/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -# -# Copyright (C) Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# REF=ORG -# Original version. -# ---------------------------------------------------------------------------- - - - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = -ifeq ($(BUILD),udeb) -CDEFS += DEBUG -endif -CDEFS += - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = libOMX.TI.DUCATI1.VIDEO.H264E.so - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = SH_LIB - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = lib - -# install directory relative to the root filesystem -ROOTFSRELEASE = lib - -# Folders in which gmake will run before building current target - -SUBMODULES = \ - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ -src/omx_proxy_h264enc.c \ - - - -# Search path for include files - -INCLUDES = \ - $(PROJROOT)/omx_core/inc \ - $(PROJROOT)/mm_osal/inc \ - $(PROJROOT)/domx \ - $(PROJROOT)/domx/omx_rpc/inc \ - - -# Libraries needed for linking. - -ST_LIBS = -#mm_osal domx -SH_LIBS = domx omx_core mm_osal -#pthread rt utils procmgr ipc rcm notify -#SH_LIBS += sysmgr sysmemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = $(PROJROOT)/mm_osal \ - $(PROJROOT)/domx \ - $(PROJROOT)/omx_core - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk diff --git a/domx/omx_proxy_component/omx_h264_enc/src/omx_proxy_h264enc.c b/domx/omx_proxy_component/omx_h264_enc/src/omx_proxy_h264enc.c deleted file mode 100644 index 21cc417..0000000 --- a/domx/omx_proxy_component/omx_h264_enc/src/omx_proxy_h264enc.c +++ /dev/null @@ -1,1099 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_proxy_h264enc.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework Proxy component. - ********************************************************************************************* - This is the proxy specific wrapper that passes the component name to the generic proxy init() - The proxy wrapper also does some runtime/static time onfig on per proxy basis - This is a thin wrapper that is called when componentiit() of the proxy is called - static OMX_ERRORTYPE PROXY_Wrapper_init(OMX_HANDLETYPE hComponent, OMX_PTR pAppData); - this layer gets called first whenever a proxy's get handle is called - ************************************************************************************************ - * @path WTSD_DucatiMMSW\omx\omx_il_1_x\omx_proxy_component\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - * 26-August-2011 Abhishek Ranka : Support for color conv at encoder - * input port - * - *! 20-August-2010 Sarthak Aggarwal sarthak@ti.com: Initial Version - *================================================================*/ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ - -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include "omx_proxy_common.h" -#include <timm_osal_interfaces.h> -#include "OMX_TI_IVCommon.h" -#include "OMX_TI_Video.h" -#include "OMX_TI_Index.h" - -#include <MetadataBufferType.h> -#ifdef ENABLE_GRALLOC_BUFFER -#include "native_handle.h" -#include <hal_public.h> -#include <VideoMetadata.h> -#endif - -#include <stdlib.h> -#include <cutils/properties.h> - -#define COMPONENT_NAME "OMX.TI.DUCATI1.VIDEO.H264E" -/* needs to be specific for every configuration wrapper */ - -#define OMX_H264E_INPUT_PORT 0 -#define LINUX_PAGE_SIZE 4096 - -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES - -OMX_ERRORTYPE LOCAL_PROXY_H264E_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct); - -OMX_ERRORTYPE LOCAL_PROXY_H264E_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct); - -#endif - - -#define OMX_INIT_STRUCT(_s_, _name_) \ - memset(&(_s_), 0x0, sizeof(_name_)); \ - (_s_).nSize = sizeof(_name_); \ - (_s_).nVersion.s.nVersionMajor = 0x1; \ - (_s_).nVersion.s.nVersionMinor = 0x1; \ - (_s_).nVersion.s.nRevision = 0x0; \ - (_s_).nVersion.s.nStep = 0x0 - - -/* Params needed for Dynamic Frame Rate Control*/ -#define FRAME_RATE_THRESHOLD 1 /* Change in Frame rate to configure the encoder */ -OMX_U32 nFrameRateThreshold = 0;/* Frame Rate threshold for every frame rate update */ -OMX_U32 nPortFrameRate = 0; /* Port FPS initially set to the Encoder */ -OMX_U32 nFrameCounter = 0; /* Number of input frames recieved since last framerate calculation */ -OMX_TICKS nVideoTime = 0; /* Video duration since last framerate calculation */ -OMX_TICKS nLastFrameRateUpdateTime = 0; /*Time stamp at last frame rate update */ -OMX_U16 nBFrames = 0; /* Number of B Frames in H264 Encoder */ - - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT -/* Opaque color format requires below quirks to be enabled - * ENABLE_GRALLOC_BUFFER - * ANDROID_QUIRCK_CHANGE_PORT_VALUES - */ -#define OMX_H264VE_NUM_INTERNAL_BUF (8) -#ifndef HAL_PIXEL_FORMAT_TI_NV12 -#define HAL_PIXEL_FORMAT_TI_NV12 (0x100) -#endif - -#define COLORCONVERT_MAX_SUB_BUFFERS (3) - -#define COLORCONVERT_BUFTYPE_VIRTUAL (0x0) -#define COLORCONVERT_BUFTYPE_ION (0x1) -#define COLORCONVERT_BUFTYPE_GRALLOCOPAQUE (0x2) - -int COLORCONVERT_open(void **hCC, PROXY_COMPONENT_PRIVATE *pCompPrv); -int COLORCONVERT_PlatformOpaqueToNV12(void *hCC, void *pSrc[], - void *pDst[], int nWidth, - int nHeight, int nStride, - int nSrcBufType, int nDstBufType); -int COLORCONVERT_close(void *hCC,PROXY_COMPONENT_PRIVATE *pCompPrv); -static int COLORCONVERT_AllocateBuffer(OMX_HANDLETYPE hComponent, OMX_U32 nStride); -static OMX_ERRORTYPE LOCAL_PROXY_H264E_AllocateBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, OMX_IN OMX_U32 nPortIndex, - OMX_IN OMX_PTR pAppPrivate, OMX_IN OMX_U32 nSizeBytes); - -static OMX_ERRORTYPE LOCAL_PROXY_H264E_FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_BUFFERHEADERTYPE * pBufferHdr); - -static OMX_ERRORTYPE LOCAL_PROXY_H264E_ComponentDeInit(OMX_HANDLETYPE hComponent); - -typedef struct _OMX_PROXY_H264E_PRIVATE -{ - OMX_PTR hBufPipe; - OMX_BOOL bAndroidOpaqueFormat; - OMX_PTR hCC; - IMG_native_handle_t* gralloc_handle[OMX_H264VE_NUM_INTERNAL_BUF]; - OMX_S32 nCurBufIndex; - alloc_device_t* mAllocDev; -}OMX_PROXY_H264E_PRIVATE; - -RPC_OMX_ERRORTYPE RPC_RegisterBuffer(OMX_HANDLETYPE hRPCCtx, int fd, - OMX_PTR *handle1, OMX_PTR *handle2, - PROXY_BUFFER_TYPE proxyBufferType); -RPC_OMX_ERRORTYPE RPC_UnRegisterBuffer(OMX_HANDLETYPE hRPCCtx, OMX_PTR handle); -#endif - - -OMX_ERRORTYPE LOCAL_PROXY_H264E_GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE * pIndexType); - -OMX_ERRORTYPE LOCAL_PROXY_H264E_EmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr); - -static OMX_ERRORTYPE OMX_ConfigureDynamicFrameRate( OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_U32 nTargetFrameRate = 0; /* Target Frame Rate to be provided to Encoder */ - OMX_U32 nCurrentFrameRate = 0; /* Current Frame Rate currently set in Encoder */ - OMX_CONFIG_FRAMERATETYPE tFrameRate; - OMX_COMPONENTTYPE *pHandle; - if (hComponent == NULL){ - DOMX_ERROR("Component is invalid/ not present "); - return OMX_ErrorBadParameter; - } - pHandle = (OMX_COMPONENTTYPE *) hComponent; - - /* Initialise the OMX structures */ - OMX_INIT_STRUCT(tFrameRate,OMX_CONFIG_FRAMERATETYPE); - - /* Intialise nLastFrameRateUpdateTime for the 1st frame */ - if((!nFrameCounter) && (!nLastFrameRateUpdateTime)){ - nLastFrameRateUpdateTime = pBufferHdr-> nTimeStamp; - } - - /* Increment the Frame Counter and Calculate Frame Rate*/ - nFrameCounter++; - nVideoTime = pBufferHdr->nTimeStamp - nLastFrameRateUpdateTime; - - if(nVideoTime < 0) { - return OMX_ErrorBadParameter; - } - - /*Get Port Frame Rate if not read yet*/ - if(!nFrameRateThreshold) { - tFrameRate.nPortIndex = OMX_H264E_INPUT_PORT; /* As per ducati support-set for input port */ - - /* Read Current FrameRate */ - eError = pHandle->GetConfig(hComponent,OMX_IndexConfigVideoFramerate,&tFrameRate); - if (eError != OMX_ErrorNone) - DOMX_ERROR ("pHandle->GetConfig OMX_IndexConfigVideoFramerate eError :0x%x \n",eError); - nFrameRateThreshold = tFrameRate.xEncodeFramerate >>16; - nPortFrameRate = nFrameRateThreshold; - DOMX_DEBUG(" Port Frame Rate is %d ", nPortFrameRate); - } - nCurrentFrameRate = nFrameRateThreshold; - - /* If Number of frames is less than the Threshold - * Frame Rate udpate is not necessary - */ - if(nFrameCounter < nFrameRateThreshold){ - DOMX_EXIT(" Threshold not reached, no update necessary"); - return OMX_ErrorNone; - } - - /*Calculate the new target Frame Rate*/ - if (nVideoTime != 0) - nTargetFrameRate = nFrameCounter * 1000000 / nVideoTime; - - /* For 1080p record, max FPS supported by Codec for profile 4.1 is 30. - * When Dynamic Frame Rate is enabled, there might be scenario when FPS - * calculated is more than 30. Hence adding the check so that Dynamic Frame - * Rate set is never greater than the port FPS initially set. - */ - if(nTargetFrameRate > nPortFrameRate){ - DOMX_DEBUG("Frame Rate Calculated is more than initial port set Frame Rate"); - nTargetFrameRate = nPortFrameRate; - } - - /* Difference in Frame Rate is more than Threshold - Only then update Frame Rate*/ - if((( (OMX_S32)nTargetFrameRate) -((OMX_S32) nCurrentFrameRate) >= FRAME_RATE_THRESHOLD) || - (((OMX_S32) nCurrentFrameRate) - ( (OMX_S32)nTargetFrameRate) >= FRAME_RATE_THRESHOLD)) { - - /* Now Send the new Frame Rate */ - tFrameRate.nPortIndex = OMX_H264E_INPUT_PORT; /* As per ducati support-set for input port */ - tFrameRate.xEncodeFramerate = (OMX_U32)(nTargetFrameRate * (1 << 16)); - eError = pHandle->SetConfig(hComponent,OMX_IndexConfigVideoFramerate,&tFrameRate); - if(eError != OMX_ErrorNone){ - DOMX_ERROR(" Error while configuring Dynamic Frame Rate,Error info = %d",eError); - return eError; - } else { - DOMX_DEBUG("Dynamic Frame Rate configuration successful \n"); - } - nFrameRateThreshold = nTargetFrameRate; /*Update the threshold */ - } - - /* reset all params */ - nFrameCounter = 0 ; - nVideoTime = 0; - nLastFrameRateUpdateTime = pBufferHdr->nTimeStamp; - return OMX_ErrorNone; -} - -static OMX_ERRORTYPE ComponentPrivateEmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - - eError = OMX_ConfigureDynamicFrameRate(hComponent, pBufferHdr); - if( eError != OMX_ErrorNone) - DOMX_ERROR(" Error while configuring FrameRate Dynamically.Error info = %d",eError); - - DOMX_DEBUG("Redirection from ComponentPricateEmptyThisBuffer to PROXY_EmptyThisBuffer"); - return LOCAL_PROXY_H264E_EmptyThisBuffer (hComponent,pBufferHdr); -} - -OMX_ERRORTYPE OMX_ComponentInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pComponentPrivate = NULL; - pHandle = (OMX_COMPONENTTYPE *) hComponent; - OMX_TI_PARAM_ENHANCEDPORTRECONFIG tParamStruct; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; -#endif - char value[OMX_MAX_STRINGNAME_SIZE]; - OMX_U32 mEnableVFR = 1; /* Flag used to enable/disable VFR for Encoder */ - property_get("debug.vfr.enable", value, "1"); - mEnableVFR = atoi(value); - - DOMX_ENTER(""); - - DOMX_DEBUG("Component name provided is %s", COMPONENT_NAME); - - pHandle->pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) - TIMM_OSAL_Malloc(sizeof(PROXY_COMPONENT_PRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pHandle->pComponentPrivate != NULL, - OMX_ErrorInsufficientResources, - "ERROR IN ALLOCATING PROXY COMPONENT PRIVATE STRUCTURE"); - - pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - TIMM_OSAL_Memset(pComponentPrivate, 0, - sizeof(PROXY_COMPONENT_PRIVATE)); - - pComponentPrivate->cCompName = - TIMM_OSAL_Malloc(MAX_COMPONENT_NAME_LENGTH * sizeof(OMX_U8), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pComponentPrivate->cCompName != NULL, - OMX_ErrorInsufficientResources, - " Error in Allocating space for proxy component table"); - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pComponentPrivate->pCompProxyPrv = - (OMX_PROXY_H264E_PRIVATE *) - TIMM_OSAL_Malloc(sizeof(OMX_PROXY_H264E_PRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pComponentPrivate->pCompProxyPrv != NULL, - OMX_ErrorInsufficientResources, - " Could not allocate proxy component private"); - - TIMM_OSAL_Memset(pComponentPrivate->pCompProxyPrv, 0, - sizeof(OMX_PROXY_H264E_PRIVATE)); - - pProxy = (OMX_PROXY_H264E_PRIVATE *) pComponentPrivate->pCompProxyPrv; - - /* Create Pipe of for encoder input buffers */ - eOSALStatus = TIMM_OSAL_CreatePipe(&pProxy->hBufPipe, sizeof(OMX_U32), - OMX_H264VE_NUM_INTERNAL_BUF, 1); - PROXY_assert(eOSALStatus == TIMM_OSAL_ERR_NONE, - OMX_ErrorInsufficientResources, - "Pipe creation failed"); -#endif - - // Copying component Name - this will be picked up in the proxy common - PROXY_assert(strlen(COMPONENT_NAME) + 1 < MAX_COMPONENT_NAME_LENGTH, - OMX_ErrorInvalidComponentName, - "Length of component name is longer than the max allowed"); - TIMM_OSAL_Memcpy(pComponentPrivate->cCompName, COMPONENT_NAME, - strlen(COMPONENT_NAME) + 1); - - eError = OMX_ProxyCommonInit(hComponent); // Calling Proxy Common Init() -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES - pHandle->SetParameter = LOCAL_PROXY_H264E_SetParameter; - pHandle->GetParameter = LOCAL_PROXY_H264E_GetParameter; -#endif - pComponentPrivate->IsLoadedState = OMX_TRUE; - pHandle->EmptyThisBuffer = LOCAL_PROXY_H264E_EmptyThisBuffer; - pHandle->GetExtensionIndex = LOCAL_PROXY_H264E_GetExtensionIndex; - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pHandle->ComponentDeInit = LOCAL_PROXY_H264E_ComponentDeInit; - pHandle->FreeBuffer = LOCAL_PROXY_H264E_FreeBuffer; - pHandle->AllocateBuffer = LOCAL_PROXY_H264E_AllocateBuffer; -#endif - - if(mEnableVFR) - pHandle->EmptyThisBuffer = ComponentPrivateEmptyThisBuffer; - - EXIT: - if (eError != OMX_ErrorNone) - { - DOMX_DEBUG("Error in Initializing Proxy"); - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - if(pProxy->hBufPipe != NULL) - { - TIMM_OSAL_DeletePipe(pProxy->hBufPipe); - pProxy->hBufPipe = NULL; - } - - if(pComponentPrivate->pCompProxyPrv != NULL) - { - TIMM_OSAL_Free(pComponentPrivate->pCompProxyPrv); - pComponentPrivate->pCompProxyPrv = NULL; - pProxy = NULL; - } -#endif - if (pComponentPrivate->cCompName != NULL) - { - TIMM_OSAL_Free(pComponentPrivate->cCompName); - pComponentPrivate->cCompName = NULL; - } - if (pComponentPrivate != NULL) - { - TIMM_OSAL_Free(pComponentPrivate); - pComponentPrivate = NULL; - } - } - return eError; -} - -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES - -/* ===========================================================================*/ -/** - * @name PROXY_H264E_GetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE LOCAL_PROXY_H264E_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PARAM_PORTDEFINITIONTYPE* pPortDef = NULL; - OMX_VIDEO_PARAM_PORTFORMATTYPE* pPortParam = NULL; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; -#endif - - PROXY_require((pParamStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_assert((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; -#endif - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nParamIndex = %d, pParamStruct = %p", - hComponent, pCompPrv, nParamIndex, pParamStruct); - - eError = PROXY_GetParameter(hComponent,nParamIndex, pParamStruct); - - if(nParamIndex == OMX_IndexParamPortDefinition) - { - pPortDef = (OMX_PARAM_PORTDEFINITIONTYPE *)pParamStruct; - - if(pPortDef->format.video.eColorFormat == OMX_COLOR_FormatYUV420PackedSemiPlanar) - { -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - if(pProxy->bAndroidOpaqueFormat == OMX_TRUE) - { - pPortDef->format.video.eColorFormat = OMX_COLOR_FormatAndroidOpaque; - } - else -#endif - { - pPortDef->format.video.eColorFormat = OMX_TI_COLOR_FormatYUV420PackedSemiPlanar; - } - } - - if(pPortDef->nPortIndex == OMX_H264E_INPUT_PORT) - { - if(pCompPrv->proxyPortBuffers[OMX_H264E_INPUT_PORT].proxyBufferType == EncoderMetadataPointers) - { - pPortDef->nBufferSize = sizeof(video_metadata_t); - } - } - } - else if (nParamIndex == OMX_IndexParamVideoPortFormat) - { - pPortParam = (OMX_VIDEO_PARAM_PORTFORMATTYPE *)pParamStruct; - - if((eError == OMX_ErrorNone) && - (pPortParam->eColorFormat == OMX_COLOR_FormatYUV420PackedSemiPlanar)) - { - pPortParam->eColorFormat = OMX_TI_COLOR_FormatYUV420PackedSemiPlanar; - } -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - else if ((eError == OMX_ErrorNoMore) && - (pPortParam->nIndex == 1)) - { - /* HACK:Remote OMX-H264E supports only 1 color format (index 0). The - * OMX_COLOR_FormatAndroidOpaque is supported only at the proxy. - * Call GetParameter() to fill in defaults for parameters and - * override color format and index for the additional - * OMX_COLOR_FormatAndroidOpaque support*/ - pPortParam->nIndex = 0; - eError = PROXY_GetParameter(hComponent, nParamIndex, pParamStruct); - pPortParam->nIndex = 1; - pPortParam->eColorFormat = OMX_COLOR_FormatAndroidOpaque; - eError = OMX_ErrorNone; - } -#endif - } -#ifndef OMAP_TUNA - else if (nParamIndex == OMX_TI_IndexComponentHandle) - { - OMX_TI_COMPONENT_HANDLE * pCompHandle = pParamStruct; - pCompHandle->pHandle = hComponent; - eError = OMX_ErrorNone; - } -#endif - PROXY_assert((eError == OMX_ErrorNone) || (eError == OMX_ErrorNoMore), - eError," Error in Proxy GetParameter"); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_H264E_SetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE LOCAL_PROXY_H264E_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_IN OMX_PTR pParamStruct) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PARAM_PORTDEFINITIONTYPE* pPortDef = NULL; - OMX_VIDEO_PARAM_PORTFORMATTYPE* pPortParams = NULL; - OMX_VIDEO_STOREMETADATAINBUFFERSPARAMS* pStoreMetaData = NULL; - OMX_TI_PARAM_BUFFERPREANNOUNCE tParamSetNPA; - OMX_PARAM_PORTDEFINITIONTYPE sPortDef; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; -#endif - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nParamIndex = %d, pParamStruct = %p", - hComponent, pCompPrv, nParamIndex, pParamStruct); - - PROXY_require((pParamStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; -#endif - - if(nParamIndex == OMX_IndexParamPortDefinition) - { - pPortDef = (OMX_PARAM_PORTDEFINITIONTYPE *)pParamStruct; - - if(pPortDef->format.video.eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar) - { - pPortDef->format.video.eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - else if(pPortDef->format.video.eColorFormat == OMX_COLOR_FormatAndroidOpaque) - { - if(COLORCONVERT_open(&pProxy->hCC,pCompPrv) != 0) - { - PROXY_assert(0, OMX_ErrorInsufficientResources, - "Failed to open Color converting service"); - } - pProxy->bAndroidOpaqueFormat = OMX_TRUE; - pPortDef->format.video.eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } -#endif - } - else if(nParamIndex == OMX_IndexParamVideoPortFormat) - { - pPortParams = (OMX_VIDEO_PARAM_PORTFORMATTYPE *)pParamStruct; - - if(pPortParams->eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar) - { - pPortParams->eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - else if(pPortParams->eColorFormat == OMX_COLOR_FormatAndroidOpaque) - { - if(COLORCONVERT_open(&pProxy->hCC,pCompPrv) != 0) - { - PROXY_assert(0, OMX_ErrorInsufficientResources, - "Failed to open Color converting service"); - } - pProxy->bAndroidOpaqueFormat = OMX_TRUE; - pPortParams->eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } -#endif - } - else if(nParamIndex == (OMX_INDEXTYPE) OMX_TI_IndexEncoderStoreMetadatInBuffers) - { - pStoreMetaData = (OMX_VIDEO_STOREMETADATAINBUFFERSPARAMS *) pParamStruct; - - DOMX_DEBUG("Moving to Metadatamode"); - if (pStoreMetaData->nPortIndex == OMX_H264E_INPUT_PORT && pStoreMetaData->bStoreMetaData == OMX_TRUE) - { - tParamSetNPA.nSize = sizeof(OMX_TI_PARAM_BUFFERPREANNOUNCE); - tParamSetNPA.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - tParamSetNPA.nVersion.s.nVersionMinor = OMX_VER_MINOR; - tParamSetNPA.nVersion.s.nRevision = 0x0; - tParamSetNPA.nVersion.s.nStep = 0x0; - tParamSetNPA.nPortIndex = OMX_H264E_INPUT_PORT; - tParamSetNPA.bEnabled = OMX_FALSE; - //Call NPA on OMX encoder on ducati. - PROXY_SetParameter(hComponent,OMX_TI_IndexParamBufferPreAnnouncement, &tParamSetNPA); - pCompPrv->proxyPortBuffers[pStoreMetaData->nPortIndex].proxyBufferType = EncoderMetadataPointers; - DOMX_DEBUG("Moving to Metadatamode done"); - - /*Initializing Structure */ - sPortDef.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); - sPortDef.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - sPortDef.nVersion.s.nVersionMinor = OMX_VER_MINOR; - sPortDef.nVersion.s.nRevision = 0x0; - sPortDef.nVersion.s.nStep = 0x0; - sPortDef.nPortIndex = OMX_H264E_INPUT_PORT; - - eError = PROXY_GetParameter(hComponent,OMX_IndexParamPortDefinition, &sPortDef); - PROXY_assert(eError == OMX_ErrorNone, eError," Error in Proxy GetParameter for Port Def"); - - sPortDef.format.video.nStride = LINUX_PAGE_SIZE; - - eError = PROXY_SetParameter(hComponent,OMX_IndexParamPortDefinition, &sPortDef); - - PROXY_assert(eError == OMX_ErrorNone, eError," Error in Proxy SetParameter for Port Def"); - } - goto EXIT; - } - - eError = PROXY_SetParameter(hComponent, nParamIndex, pParamStruct); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy SetParameter"); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -#endif - - -/* ===========================================================================*/ -/** - * @name PROXY_GetExtensionIndex() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE LOCAL_PROXY_H264E_GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE * pIndexType) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = hComponent; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - PROXY_require(cParameterName != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(pIndexType != NULL, OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER("%s hComponent = %p, pCompPrv = %p, cParameterName = %s", - __FUNCTION__,hComponent, pCompPrv, cParameterName); - - // Check for NULL Parameters - PROXY_require((cParameterName != NULL && pIndexType != NULL), - OMX_ErrorBadParameter, NULL); - - // Ensure that String length is not greater than Max allowed length - PROXY_require(strlen(cParameterName) <= 127, OMX_ErrorBadParameter, NULL); - - if(strcmp(cParameterName, "OMX.google.android.index.storeMetaDataInBuffers") == 0) - { - // If Index type is 2D Buffer Allocated Dimension - *pIndexType = (OMX_INDEXTYPE) OMX_TI_IndexEncoderStoreMetadatInBuffers; - goto EXIT; - } - - eError = PROXY_GetExtensionIndex(hComponent, cParameterName, pIndexType); - - EXIT: - DOMX_EXIT("%s eError: %d",__FUNCTION__, eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_H264E_EmptyThisBuffer() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE LOCAL_PROXY_H264E_EmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PTR pBufferOrig = NULL; - OMX_U32 nStride = 0, nNumLines = 0; - OMX_PARAM_PORTDEFINITIONTYPE tParamStruct; - OMX_U32 nFilledLen = 0, nAllocLen = 0; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - OMX_U32 nBufIndex = 0, nSize=0, nRet=0; -#endif -#ifdef ENABLE_GRALLOC_BUFFER - OMX_PTR pAuxBuf0 = NULL, pAuxBuf1 = NULL; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_ERRORTYPE eCompReturn = OMX_ErrorNone; - IMG_native_handle_t* pGrallocHandle=NULL; -#endif - - PROXY_require(pBufferHdr != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - PROXY_CHK_VERSION(pBufferHdr, OMX_BUFFERHEADERTYPE); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; -#endif - - tParamStruct.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); - tParamStruct.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - tParamStruct.nVersion.s.nVersionMinor = OMX_VER_MINOR; - tParamStruct.nVersion.s.nRevision = 0x0; - tParamStruct.nVersion.s.nStep = 0x0; - tParamStruct.nPortIndex = OMX_H264E_INPUT_PORT; - - eError = PROXY_GetParameter(hComponent, OMX_IndexParamPortDefinition, &tParamStruct); - PROXY_require(eError == OMX_ErrorNone, OMX_ErrorBadParameter, "Error is Get Parameter for port def"); - nFilledLen = pBufferHdr->nFilledLen; - nAllocLen = pBufferHdr->nAllocLen; - if(nFilledLen != 0) - { - pBufferHdr->nFilledLen = tParamStruct.nBufferSize; - } - pBufferHdr->nAllocLen = tParamStruct.nBufferSize; - - DOMX_DEBUG - ("%s hComponent=%p, pCompPrv=%p, nFilledLen=%d, nOffset=%d, nFlags=%08x", - __FUNCTION__,hComponent, pCompPrv, pBufferHdr->nFilledLen, - pBufferHdr->nOffset, pBufferHdr->nFlags); - - if( pCompPrv->proxyPortBuffers[OMX_H264E_INPUT_PORT].proxyBufferType == EncoderMetadataPointers ) - { - OMX_U32 *pTempBuffer; - OMX_U32 nMetadataBufferType; - DOMX_DEBUG("Passing meta data to encoder"); - - pBufferOrig = pBufferHdr->pBuffer; - - pTempBuffer = (OMX_U32 *) (pBufferHdr->pBuffer); - nMetadataBufferType = *pTempBuffer; - - if(nMetadataBufferType == kMetadataBufferTypeCameraSource) - { -#ifdef ENABLE_GRALLOC_BUFFER - video_metadata_t* pVideoMetadataBuffer; - DOMX_DEBUG("MetadataBufferType is kMetadataBufferTypeCameraSource"); - - pVideoMetadataBuffer = (video_metadata_t*) ((OMX_U32 *)(pBufferHdr->pBuffer)); - pGrallocHandle = (IMG_native_handle_t*) (pVideoMetadataBuffer->handle); - DOMX_DEBUG("Grallloc buffer recieved in metadata buffer 0x%x",pGrallocHandle ); - if( pGrallocHandle->iFormat != HAL_PIXEL_FORMAT_TI_NV12 && pProxy->gralloc_handle[0] == NULL ) { - DOMX_DEBUG("Allocating NV12 buffers internally within DOMX actual count: %d", pCompPrv->nAllocatedBuffers); - pProxy->nCurBufIndex = 0; - - while( (unsigned) pProxy->nCurBufIndex < pCompPrv->nAllocatedBuffers ) { - eError = COLORCONVERT_AllocateBuffer(hComponent, nStride); - PROXY_require(eError == OMX_ErrorNone, eError, "Error allocating buffers for color conversion"); - pProxy->nCurBufIndex++; - } - } - pBufferHdr->pBuffer = (OMX_U8 *)(pGrallocHandle->fd[0]); - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)-> - pAuxBuf1 = (OMX_PTR) pGrallocHandle->fd[1]; - DOMX_DEBUG("%s Gralloc=0x%x, Y-fd=%d, UV-fd=%d", __FUNCTION__, pGrallocHandle, - pGrallocHandle->fd[0], pGrallocHandle->fd[1]); - - pBufferHdr->nOffset = pVideoMetadataBuffer->offset; -#endif - } - else if(nMetadataBufferType == kMetadataBufferTypeGrallocSource) - { -#ifdef ENABLE_GRALLOC_BUFFER - buffer_handle_t tBufHandle; - DOMX_DEBUG("MetadataBufferType is kMetadataBufferTypeGrallocSource"); - - pTempBuffer++; - tBufHandle = *((buffer_handle_t *)pTempBuffer); - pGrallocHandle = (IMG_native_handle_t*) tBufHandle; - DOMX_DEBUG("Grallloc buffer recieved in metadata buffer 0x%x",pGrallocHandle ); - if( pGrallocHandle->iFormat != HAL_PIXEL_FORMAT_TI_NV12 && pProxy->gralloc_handle[0] == NULL ) { - DOMX_DEBUG("Allocating NV12 buffers internally within DOMX actual count: %d", pCompPrv->nAllocatedBuffers); - pProxy->nCurBufIndex = 0; - - while( (unsigned) pProxy->nCurBufIndex < pCompPrv->nAllocatedBuffers ) { - eError = COLORCONVERT_AllocateBuffer(hComponent, nStride); - PROXY_require(eError == OMX_ErrorNone, eError, "Error allocating buffers for color conversion"); - pProxy->nCurBufIndex++; - } - } - - pBufferHdr->pBuffer = (OMX_U8 *)(pGrallocHandle->fd[0]); - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)-> - pAuxBuf1 = (OMX_PTR) pGrallocHandle->fd[1]; - DOMX_DEBUG("%s Gralloc=0x%x, Y-fd=%d, UV-fd=%d", __FUNCTION__, pGrallocHandle, - pGrallocHandle->fd[0], pGrallocHandle->fd[1]); -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - if (pProxy->bAndroidOpaqueFormat && pGrallocHandle->iFormat != HAL_PIXEL_FORMAT_TI_NV12) - { - /* Dequeue NV12 buffer for encoder */ - eOSALStatus = TIMM_OSAL_ReadFromPipe(pProxy->hBufPipe, &nBufIndex, - sizeof(OMX_PTR), (TIMM_OSAL_U32 *)(&nSize), - TIMM_OSAL_SUSPEND); - PROXY_assert(eOSALStatus == TIMM_OSAL_ERR_NONE, OMX_ErrorBadParameter, NULL); - - if(nFilledLen != 0) - { - /* Get NV12 data after colorconv*/ - nRet = COLORCONVERT_PlatformOpaqueToNV12(pProxy->hCC, (void **) &pGrallocHandle, (void **) &pProxy->gralloc_handle[nBufIndex], - pGrallocHandle->iWidth, - pGrallocHandle->iHeight, - 4096, COLORCONVERT_BUFTYPE_GRALLOCOPAQUE, - COLORCONVERT_BUFTYPE_GRALLOCOPAQUE ); - - if(nRet != 0) - { - eOSALStatus = TIMM_OSAL_WriteToPipe(pProxy->hBufPipe, (void *) &nBufIndex, - sizeof(OMX_U32), TIMM_OSAL_SUSPEND); - PROXY_assert(0, OMX_ErrorBadParameter, "Color conversion routine failed"); - } - } - - /* Update pBufferHdr with NV12 buffers for OMX component */ - pBufferHdr->pBuffer= (OMX_U8 *)(pProxy->gralloc_handle[nBufIndex]->fd[0]); - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)->pAuxBuf1 = (OMX_PTR)(pProxy->gralloc_handle[nBufIndex]->fd[1]); - } -#endif -#endif - } - else - { - DOMX_ERROR("MetadataBufferType is unknow. Returning 'OMX_ErrorBadParameter'"); - eError = OMX_ErrorBadParameter; - goto EXIT; //need to restore lenght fields in pBufferHdr - } -#ifdef ENABLE_GRALLOC_BUFFER - eRPCError = RPC_RegisterBuffer(pCompPrv->hRemoteComp, pBufferHdr->pBuffer, - &pAuxBuf0, &pAuxBuf1, - GrallocPointers); - PROXY_checkRpcError(); - if (pAuxBuf0) - pBufferHdr->pBuffer = pAuxBuf0; - if (pAuxBuf1) - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)->pAuxBuf1 = pAuxBuf1; -#endif - } - - eError = PROXY_EmptyThisBuffer(hComponent, pBufferHdr); -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - if (pProxy->bAndroidOpaqueFormat -#ifdef ENABLE_GRALLOC_BUFFER -&& pGrallocHandle != NULL && pGrallocHandle->iFormat != HAL_PIXEL_FORMAT_TI_NV12 -#endif -) - { - /*Write buffer to end of pipe for re-circulation for future ETB()*/ - eOSALStatus = TIMM_OSAL_WriteToPipe(pProxy->hBufPipe, (void *) &nBufIndex, - sizeof(OMX_U32), TIMM_OSAL_SUSPEND); - PROXY_assert(eOSALStatus == TIMM_OSAL_ERR_NONE, OMX_ErrorBadParameter, "Pipe write failed"); - } -#endif - -EXIT: - if( pBufferHdr!=NULL && pCompPrv->proxyPortBuffers[pBufferHdr->nInputPortIndex].proxyBufferType == EncoderMetadataPointers) - { - pBufferHdr->pBuffer = pBufferOrig; - pBufferHdr->nFilledLen = nFilledLen; - pBufferHdr->nAllocLen = nAllocLen; -#ifdef ENABLE_GRALLOC_BUFFER - RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, pAuxBuf0); - RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, pAuxBuf1); -#endif - } - return eError; -} - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT -static OMX_ERRORTYPE LOCAL_PROXY_H264E_AllocateBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE ** ppBufferHdr, OMX_U32 nPortIndex, - OMX_PTR pAppPrivate, OMX_U32 nSizeBytes) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - int err, nStride; - - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; - - - eError = PROXY_AllocateBuffer(hComponent, ppBufferHdr, nPortIndex, - pAppPrivate, nSizeBytes); -EXIT: - return eError; -} - -static OMX_ERRORTYPE LOCAL_PROXY_H264E_FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_U32 nBufIndex, nSize, nCount=0; - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; - - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; - - if((nPortIndex == OMX_H264E_INPUT_PORT) && - (pProxy->bAndroidOpaqueFormat) && (pProxy->gralloc_handle[0] != NULL)) - { - pProxy->nCurBufIndex--; - PROXY_require(pProxy->nCurBufIndex >=0, - OMX_ErrorBadParameter, "Buffer index underflow"); - - if(pProxy->gralloc_handle[pProxy->nCurBufIndex]) - { - pProxy->mAllocDev->free(pProxy->mAllocDev, (buffer_handle_t)(pProxy->gralloc_handle[pProxy->nCurBufIndex])); - pProxy->gralloc_handle[pProxy->nCurBufIndex] = NULL; - } - - /*Clear the Bufindex pipe by dummy reads*/ - TIMM_OSAL_GetPipeReadyMessageCount(pProxy->hBufPipe, (TIMM_OSAL_U32 *)&nCount); - if(nCount) - { - TIMM_OSAL_ReadFromPipe(pProxy->hBufPipe, &nBufIndex, - sizeof(OMX_PTR), (TIMM_OSAL_U32 *)&nSize, TIMM_OSAL_NO_SUSPEND); - } - } - - eError = PROXY_FreeBuffer(hComponent, nPortIndex, pBufferHdr); - -EXIT: - return eError; -} - -int COLORCONVERT_AllocateBuffer(OMX_HANDLETYPE hComponent, OMX_U32 nStride) -{ - OMX_CONFIG_RECTTYPE tParam; - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - OMX_U32 err; - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; - - tParam.nSize = sizeof(OMX_CONFIG_RECTTYPE); - tParam.nVersion.s.nVersionMajor = 1; - tParam.nVersion.s.nVersionMinor = 1; - tParam.nVersion.s.nRevision = 0; - tParam.nVersion.s.nStep = 0; - tParam.nPortIndex = OMX_H264E_INPUT_PORT; - eError = PROXY_GetParameter(hComponent, (OMX_INDEXTYPE)OMX_TI_IndexParam2DBufferAllocDimension, &tParam); - PROXY_assert(eError == OMX_ErrorNone, eError, " Error in Proxy GetParameter"); - err = pProxy->mAllocDev->alloc(pProxy->mAllocDev, (int) tParam.nWidth, (int) tParam.nHeight, (int) HAL_PIXEL_FORMAT_TI_NV12, (int) GRALLOC_USAGE_HW_RENDER, (const struct native_handle_t * *)(&(pProxy->gralloc_handle[pProxy->nCurBufIndex])), (int *) &nStride); - PROXY_assert(!err, err, " Error in allocating Gralloc buffers"); - eOSALStatus = TIMM_OSAL_WriteToPipe(pProxy->hBufPipe, (void *) &pProxy->nCurBufIndex, sizeof(OMX_U32), TIMM_OSAL_SUSPEND); - PROXY_assert(eOSALStatus == TIMM_OSAL_ERR_NONE, OMX_ErrorBadParameter, "Pipe write failed"); - -EXIT: - return eError; -} -OMX_ERRORTYPE LOCAL_PROXY_H264E_ComponentDeInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - OMX_U32 i; - - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; - - if(pProxy->hBufPipe != NULL) - { - eOSALStatus = TIMM_OSAL_DeletePipe(pProxy->hBufPipe); - pProxy->hBufPipe = NULL; - - if(eOSALStatus != TIMM_OSAL_ERR_NONE) - { - DOMX_ERROR("Pipe deletion failed"); - } - } - - if(pProxy->bAndroidOpaqueFormat == OMX_TRUE) - { - /* Cleanup internal buffers in pipe if not freed on FreeBuffer */ - for(i=0; i<OMX_H264VE_NUM_INTERNAL_BUF; i++) - { - if(pProxy->gralloc_handle[i]) - { - pProxy->mAllocDev->free(pProxy->mAllocDev, (buffer_handle_t)(pProxy->gralloc_handle[i])); - pProxy->gralloc_handle[i] = NULL; - } - } - - - COLORCONVERT_close(pProxy->hCC,pCompPrv); - pProxy->bAndroidOpaqueFormat = OMX_FALSE; - - if(pCompPrv->pCompProxyPrv != NULL) - { - TIMM_OSAL_Free(pCompPrv->pCompProxyPrv); - pCompPrv->pCompProxyPrv = NULL; - } - } - - eError = PROXY_ComponentDeInit(hComponent); -EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -int COLORCONVERT_open(void **hCC, PROXY_COMPONENT_PRIVATE *pCompPrv) -{ - int nErr = -1; - hw_module_t const* module = NULL; - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; - - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; - nErr = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module); - - if (nErr == 0) - { - *hCC = (void *) ((IMG_gralloc_module_public_t const *)module); - } - else - { - DOMX_ERROR("FATAL: gralloc api hw_get_module() returned error: Can't find \ - %s module err = %x", GRALLOC_HARDWARE_MODULE_ID, nErr); - } - - gralloc_open(module, &(pProxy->mAllocDev)); - - return nErr; -} - -int COLORCONVERT_PlatformOpaqueToNV12(void *hCC, - void *pSrc[COLORCONVERT_MAX_SUB_BUFFERS], - void *pDst[COLORCONVERT_MAX_SUB_BUFFERS], - int nWidth, int nHeight, int nStride, - int nSrcBufType,int nDstBufType) -{ - IMG_gralloc_module_public_t const* module = hCC; - int nErr = -1; - - if((nSrcBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE) && (nDstBufType == COLORCONVERT_BUFTYPE_VIRTUAL)) - { - nErr = module->Blit(module, pSrc[0], pDst, HAL_PIXEL_FORMAT_TI_NV12); - } - else if((nSrcBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE) && (nDstBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE )) - { - nErr = module->Blit2(module, pSrc[0], pDst[0], nWidth, nHeight, 0, 0); - } - - return nErr; -} - -int COLORCONVERT_close(void *hCC,PROXY_COMPONENT_PRIVATE *pCompPrv) -{ - OMX_PROXY_H264E_PRIVATE *pProxy = NULL; - pProxy = (OMX_PROXY_H264E_PRIVATE *) pCompPrv->pCompProxyPrv; - if(pProxy && pProxy->mAllocDev) - { - gralloc_close(pProxy->mAllocDev); - } - return 0; -} -#endif diff --git a/domx/omx_proxy_component/omx_mpeg4_enc/Makefile b/domx/omx_proxy_component/omx_mpeg4_enc/Makefile deleted file mode 100644 index f342e66..0000000 --- a/domx/omx_proxy_component/omx_mpeg4_enc/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -# -# Copyright (C) Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# REF=ORG -# Original version. -# ---------------------------------------------------------------------------- - - - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = -ifeq ($(BUILD),udeb) -CDEFS += DEBUG -endif -CDEFS += - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = libOMX.TI.DUCATI1.VIDEO.MPEG4E.so - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = SH_LIB - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = lib - -# install directory relative to the root filesystem -ROOTFSRELEASE = lib - -# Folders in which gmake will run before building current target - -SUBMODULES = \ - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ -src/omx_proxy_mpeg4enc.c \ - - - -# Search path for include files - -INCLUDES = \ - $(PROJROOT)/omx_core/inc \ - $(PROJROOT)/mm_osal/inc \ - $(PROJROOT)/domx \ - $(PROJROOT)/domx/omx_rpc/inc \ - - -# Libraries needed for linking. - -ST_LIBS = -#mm_osal domx -SH_LIBS = domx omx_core mm_osal -#pthread rt utils procmgr ipc rcm notify -#SH_LIBS += sysmgr sysmemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = $(PROJROOT)/mm_osal \ - $(PROJROOT)/domx \ - $(PROJROOT)/omx_core - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk diff --git a/domx/omx_proxy_component/omx_mpeg4_enc/src/omx_proxy_mpeg4enc.c b/domx/omx_proxy_component/omx_mpeg4_enc/src/omx_proxy_mpeg4enc.c deleted file mode 100644 index 9767d89..0000000 --- a/domx/omx_proxy_component/omx_mpeg4_enc/src/omx_proxy_mpeg4enc.c +++ /dev/null @@ -1,1050 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_proxy_mpeg4enc.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework Proxy component. - ********************************************************************************************* - This is the proxy specific wrapper that passes the component name to the generic proxy init() - The proxy wrapper also does some runtime/static time onfig on per proxy basis - This is a thin wrapper that is called when componentiit() of the proxy is called - static OMX_ERRORTYPE PROXY_Wrapper_init(OMX_HANDLETYPE hComponent, OMX_PTR pAppData); - this layer gets called first whenever a proxy's get handle is called - ************************************************************************************************ - * @path WTSD_DucatiMMSW\omx\omx_il_1_x\omx_proxy_component\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - * 31-August-2011 Lakshman N : Support for color conv at encoder - * input port - * - *! 20-August-2010 Sarthak Aggarwal sarthak@ti.com: Initial Version - *================================================================*/ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ - -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include "omx_proxy_common.h" -#include <timm_osal_interfaces.h> -#include "OMX_TI_IVCommon.h" -#include "OMX_TI_Video.h" -#include "OMX_TI_Index.h" - -#include <MetadataBufferType.h> -#ifdef ENABLE_GRALLOC_BUFFER -#include "native_handle.h" -#include <hal_public.h> -#include <VideoMetadata.h> -#endif - -#include <stdlib.h> -#include <cutils/properties.h> - -#define COMPONENT_NAME "OMX.TI.DUCATI1.VIDEO.MPEG4E" -/* needs to be specific for every configuration wrapper */ - -#define OMX_MPEG4E_INPUT_PORT 0 -#define LINUX_PAGE_SIZE 4096 - -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES -/* Opaque color format requires below quirks to be enabled - * ENABLE_GRALLOC_BUFFER - * ANDROID_QUIRK_CHANGE_PORT_VALUES - */ -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct); - -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct); - -#endif - - -#define OMX_INIT_STRUCT(_s_, _name_) \ - memset(&(_s_), 0x0, sizeof(_name_)); \ - (_s_).nSize = sizeof(_name_); \ - (_s_).nVersion.s.nVersionMajor = 0x1; \ - (_s_).nVersion.s.nVersionMinor = 0x1; \ - (_s_).nVersion.s.nRevision = 0x0; \ - (_s_).nVersion.s.nStep = 0x0 - - -/* Params needed for Dynamic Frame Rate Control*/ -#define FRAME_RATE_THRESHOLD 1 /* Change in Frame rate to configure the encoder */ -OMX_U32 nFrameRateThreshold = 0;/* Frame Rate threshold for every frame rate update */ -OMX_U32 nPortFrameRate = 0; /* Port FPS initially set to the Encoder */ -OMX_U32 nFrameCounter = 0; /* Number of input frames recieved since last framerate calculation */ -OMX_TICKS nVideoTime = 0; /* Video duration since last framerate calculation */ -OMX_TICKS nLastFrameRateUpdateTime = 0; /*Time stamp at last frame rate update */ -OMX_U16 nBFrames = 0; /* Number of B Frames in H264 Encoder */ - - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT -#define OMX_MPEG4E_NUM_INTERNAL_BUF (8) -#define HAL_PIXEL_FORMAT_TI_NV12 (0x100) - -#define COLORCONVERT_MAX_SUB_BUFFERS (3) - -#define COLORCONVERT_BUFTYPE_VIRTUAL (0x0) -#define COLORCONVERT_BUFTYPE_ION (0x1) -#define COLORCONVERT_BUFTYPE_GRALLOCOPAQUE (0x2) - -int COLORCONVERT_open(void **hCC, PROXY_COMPONENT_PRIVATE *pCompPrv); -int COLORCONVERT_PlatformOpaqueToNV12(void *hCC, void *pSrc[], - void *pDst[], int nWidth, - int nHeight, int nStride, - int nSrcBufType, int nDstBufType); -int COLORCONVERT_close(void *hCC,PROXY_COMPONENT_PRIVATE *pCompPrv); - -static OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_AllocateBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_INOUT OMX_BUFFERHEADERTYPE ** ppBufferHdr, OMX_IN OMX_U32 nPortIndex, - OMX_IN OMX_PTR pAppPrivate, OMX_IN OMX_U32 nSizeBytes); - -static OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_BUFFERHEADERTYPE * pBufferHdr); - -static OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_ComponentDeInit(OMX_HANDLETYPE hComponent); - -typedef struct _OMX_PROXY_MPEG4E_PRIVATE -{ - OMX_PTR hBufPipe; - OMX_BOOL bAndroidOpaqueFormat; - OMX_PTR hCC; - IMG_native_handle_t* gralloc_handle[OMX_MPEG4E_NUM_INTERNAL_BUF]; - OMX_S32 nCurBufIndex; - alloc_device_t* mAllocDev; -}OMX_PROXY_MPEG4E_PRIVATE; - -RPC_OMX_ERRORTYPE RPC_RegisterBuffer(OMX_HANDLETYPE hRPCCtx, int fd, - OMX_PTR *handle1, OMX_PTR *handle2, - PROXY_BUFFER_TYPE proxyBufferType); -RPC_OMX_ERRORTYPE RPC_UnRegisterBuffer(OMX_HANDLETYPE hRPCCtx, OMX_PTR handle); -#endif - -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE * pIndexType); - -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_EmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr); - -static OMX_ERRORTYPE OMX_ConfigureDynamicFrameRate( OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_U32 nTargetFrameRate = 0; /* Target Frame Rate to be provided to Encoder */ - OMX_U32 nCurrentFrameRate = 0; /* Current Frame Rate currently set in Encoder */ - OMX_CONFIG_FRAMERATETYPE tFrameRate; - OMX_COMPONENTTYPE *pHandle; - if (hComponent == NULL){ - DOMX_ERROR("Component is invalid/ not present "); - return OMX_ErrorBadParameter; - } - pHandle = (OMX_COMPONENTTYPE *) hComponent; - - /* Initialise the OMX structures */ - OMX_INIT_STRUCT(tFrameRate,OMX_CONFIG_FRAMERATETYPE); - - /* Intialise nLastFrameRateUpdateTime for the 1st frame */ - if((!nFrameCounter) && (!nLastFrameRateUpdateTime)){ - nLastFrameRateUpdateTime = pBufferHdr-> nTimeStamp; - } - - /* Increment the Frame Counter and Calculate Frame Rate*/ - nFrameCounter++; - nVideoTime = pBufferHdr->nTimeStamp - nLastFrameRateUpdateTime; - - if(nVideoTime < 0) { - return OMX_ErrorBadParameter; - } - - /*Get Port Frame Rate if not read yet*/ - if(!nFrameRateThreshold) { - tFrameRate.nPortIndex = OMX_MPEG4E_INPUT_PORT; /* As per ducati support-set for input port */ - - /* Read Current FrameRate */ - eError = pHandle->GetConfig(hComponent,OMX_IndexConfigVideoFramerate,&tFrameRate); - if (eError != OMX_ErrorNone) - DOMX_ERROR ("pHandle->GetConfig OMX_IndexConfigVideoFramerate eError :0x%x \n",eError); - nFrameRateThreshold = tFrameRate.xEncodeFramerate >>16; - nPortFrameRate = nFrameRateThreshold; - DOMX_DEBUG(" Port Frame Rate is %d ", nPortFrameRate); - } - nCurrentFrameRate = nFrameRateThreshold; - - /* If Number of frames is less than the Threshold - * Frame Rate udpate is not necessary - */ - if(nFrameCounter < nFrameRateThreshold){ - DOMX_EXIT(" Threshold not reached, no update necessary"); - return OMX_ErrorNone; - } - - /*Calculate the new target Frame Rate*/ - if (nVideoTime != 0) - nTargetFrameRate = nFrameCounter * 1000000 / nVideoTime; - - /* For 1080p record, max FPS supported by Codec for profile 4.1 is 30. - * When Dynamic Frame Rate is enabled, there might be scenario when FPS - * calculated is more than 30. Hence adding the check so that Dynamic Frame - * Rate set is never greater than the port FPS initially set. - */ - if(nTargetFrameRate > nPortFrameRate){ - DOMX_DEBUG("Frame Rate Calculated is more than initial port set Frame Rate"); - nTargetFrameRate = nPortFrameRate; - } - - /* Difference in Frame Rate is more than Threshold - Only then update Frame Rate*/ - if((( (OMX_S32)nTargetFrameRate) -((OMX_S32) nCurrentFrameRate) >= FRAME_RATE_THRESHOLD) || - (((OMX_S32) nCurrentFrameRate) - ( (OMX_S32)nTargetFrameRate) >= FRAME_RATE_THRESHOLD)) { - - /* Now Send the new Frame Rate */ - tFrameRate.nPortIndex = OMX_MPEG4E_INPUT_PORT; /* As per ducati support-set for input port */ - tFrameRate.xEncodeFramerate = (OMX_U32)(nTargetFrameRate * (1 << 16)); - eError = pHandle->SetConfig(hComponent,OMX_IndexConfigVideoFramerate,&tFrameRate); - if(eError != OMX_ErrorNone){ - DOMX_ERROR(" Error while configuring Dynamic Frame Rate,Error info = %d",eError); - return eError; - } else { - DOMX_DEBUG("Dynamic Frame Rate configuration successful \n"); - } - nFrameRateThreshold = nTargetFrameRate; /*Update the threshold */ - } - - /* reset all params */ - nFrameCounter = 0 ; - nVideoTime = 0; - nLastFrameRateUpdateTime = pBufferHdr->nTimeStamp; - return OMX_ErrorNone; -} - -static OMX_ERRORTYPE ComponentPrivateEmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - - eError = OMX_ConfigureDynamicFrameRate(hComponent, pBufferHdr); - if( eError != OMX_ErrorNone) - DOMX_ERROR(" Error while configuring FrameRate Dynamically.Error info = %d",eError); - - DOMX_DEBUG("Redirection from ComponentPricateEmptyThisBuffer to PROXY_EmptyThisBuffer"); - return LOCAL_PROXY_MPEG4E_EmptyThisBuffer (hComponent,pBufferHdr); -} - -OMX_ERRORTYPE OMX_ComponentInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pComponentPrivate = NULL; - pHandle = (OMX_COMPONENTTYPE *) hComponent; - OMX_TI_PARAM_ENHANCEDPORTRECONFIG tParamStruct; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; -#endif - char value[OMX_MAX_STRINGNAME_SIZE]; - OMX_U32 mEnableVFR = 1; /* Flag used to enable/disable VFR for Encoder */ - property_get("debug.vfr.enable", value, "1"); - mEnableVFR = atoi(value); - - DOMX_ENTER(""); - - DOMX_DEBUG("Component name provided is %s", COMPONENT_NAME); - - pHandle->pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) - TIMM_OSAL_Malloc(sizeof(PROXY_COMPONENT_PRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pHandle->pComponentPrivate != NULL, - OMX_ErrorInsufficientResources, - "ERROR IN ALLOCATING PROXY COMPONENT PRIVATE STRUCTURE"); - - pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - TIMM_OSAL_Memset(pComponentPrivate, 0, - sizeof(PROXY_COMPONENT_PRIVATE)); - - pComponentPrivate->cCompName = - TIMM_OSAL_Malloc(MAX_COMPONENT_NAME_LENGTH * sizeof(OMX_U8), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pComponentPrivate->cCompName != NULL, - OMX_ErrorInsufficientResources, - " Error in Allocating space for proxy component table"); - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pComponentPrivate->pCompProxyPrv = - (OMX_PROXY_MPEG4E_PRIVATE *) - TIMM_OSAL_Malloc(sizeof(OMX_PROXY_MPEG4E_PRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pComponentPrivate->pCompProxyPrv != NULL, - OMX_ErrorInsufficientResources, - " Could not allocate proxy component private"); - - TIMM_OSAL_Memset(pComponentPrivate->pCompProxyPrv, 0, - sizeof(OMX_PROXY_MPEG4E_PRIVATE)); - - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pComponentPrivate->pCompProxyPrv; - - /* Create Pipe of for encoder input buffers */ - eOSALStatus = TIMM_OSAL_CreatePipe(&pProxy->hBufPipe, sizeof(OMX_U32), - OMX_MPEG4E_NUM_INTERNAL_BUF, 1); - PROXY_assert(eOSALStatus == TIMM_OSAL_ERR_NONE, - OMX_ErrorInsufficientResources, - "Pipe creation failed"); - -#endif - - // Copying component Name - this will be picked up in the proxy common - PROXY_assert(strlen(COMPONENT_NAME) + 1 < MAX_COMPONENT_NAME_LENGTH, - OMX_ErrorInvalidComponentName, - "Length of component name is longer than the max allowed"); - TIMM_OSAL_Memcpy(pComponentPrivate->cCompName, COMPONENT_NAME, - strlen(COMPONENT_NAME) + 1); - - eError = OMX_ProxyCommonInit(hComponent); // Calling Proxy Common Init() -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES - pHandle->SetParameter = LOCAL_PROXY_MPEG4E_SetParameter; - pHandle->GetParameter = LOCAL_PROXY_MPEG4E_GetParameter; -#endif - pHandle->ComponentDeInit = LOCAL_PROXY_MPEG4E_ComponentDeInit; - pHandle->FreeBuffer = LOCAL_PROXY_MPEG4E_FreeBuffer; - pHandle->AllocateBuffer = LOCAL_PROXY_MPEG4E_AllocateBuffer; - - pComponentPrivate->IsLoadedState = OMX_TRUE; - pHandle->EmptyThisBuffer = LOCAL_PROXY_MPEG4E_EmptyThisBuffer; - pHandle->GetExtensionIndex = LOCAL_PROXY_MPEG4E_GetExtensionIndex; - - if(mEnableVFR) - pHandle->EmptyThisBuffer = ComponentPrivateEmptyThisBuffer; - - EXIT: - if (eError != OMX_ErrorNone) - { - DOMX_DEBUG("Error in Initializing Proxy"); - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - if(pProxy->hBufPipe != NULL) - { - TIMM_OSAL_DeletePipe(pProxy->hBufPipe); - pProxy->hBufPipe = NULL; - } - - if(pComponentPrivate->pCompProxyPrv != NULL) - { - TIMM_OSAL_Free(pComponentPrivate->pCompProxyPrv); - pComponentPrivate->pCompProxyPrv = NULL; - pProxy = NULL; - } -#endif - if (pComponentPrivate->cCompName != NULL) - { - TIMM_OSAL_Free(pComponentPrivate->cCompName); - pComponentPrivate->cCompName = NULL; - } - if (pComponentPrivate != NULL) - { - TIMM_OSAL_Free(pComponentPrivate); - pComponentPrivate = NULL; - } - } - return eError; -} - -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES - -/* ===========================================================================*/ -/** - * @name PROXY_MPEG4E_GetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PARAM_PORTDEFINITIONTYPE* pPortDef = NULL; - OMX_VIDEO_PARAM_PORTFORMATTYPE* pPortParam = NULL; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; -#endif - - PROXY_require((pParamStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_assert((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pCompPrv->pCompProxyPrv; -#endif - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nParamIndex = %d, pParamStruct = %p", - hComponent, pCompPrv, nParamIndex, pParamStruct); - - eError = PROXY_GetParameter(hComponent,nParamIndex, pParamStruct); - - if(nParamIndex == OMX_IndexParamPortDefinition) - { - pPortDef = (OMX_PARAM_PORTDEFINITIONTYPE *)pParamStruct; - - if(pPortDef->format.video.eColorFormat == OMX_COLOR_FormatYUV420PackedSemiPlanar) - { -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - if(pProxy->bAndroidOpaqueFormat == OMX_TRUE) - { - pPortDef->format.video.eColorFormat = OMX_COLOR_FormatAndroidOpaque; - } - else -#endif - { - pPortDef->format.video.eColorFormat = OMX_TI_COLOR_FormatYUV420PackedSemiPlanar; - } - } - } - else if (nParamIndex == OMX_IndexParamVideoPortFormat) - { - pPortParam = (OMX_VIDEO_PARAM_PORTFORMATTYPE *)pParamStruct; - - if((eError == OMX_ErrorNone) && - (pPortParam->eColorFormat == OMX_COLOR_FormatYUV420PackedSemiPlanar)) - { - pPortParam->eColorFormat = OMX_TI_COLOR_FormatYUV420PackedSemiPlanar; - } -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - else if ((eError == OMX_ErrorNoMore) && (pPortParam->nIndex == 1)) - { - /* HACK:Remote OMX-MPEG4E supports only 1 color format (index 0). The - * OMX_COLOR_FormatAndroidOpaque is supported only at the proxy. - * Call GetParameter() to fill in defaults for parameters and - * override color format and index for the additional - * OMX_COLOR_FormatAndroidOpaque support*/ - pPortParam->nIndex = 0; - eError = PROXY_GetParameter(hComponent, nParamIndex, pParamStruct); - pPortParam->nIndex = 1; - pPortParam->eColorFormat = OMX_COLOR_FormatAndroidOpaque; - eError = OMX_ErrorNone; - } -#endif - } - - PROXY_assert((eError == OMX_ErrorNone) || (eError == OMX_ErrorNoMore), - eError," Error in Proxy GetParameter"); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_MPEG4E_SetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_IN OMX_PTR pParamStruct) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PARAM_PORTDEFINITIONTYPE* pPortDef = (OMX_PARAM_PORTDEFINITIONTYPE *)pParamStruct; - OMX_VIDEO_PARAM_PORTFORMATTYPE* pPortParams = (OMX_VIDEO_PARAM_PORTFORMATTYPE *)pParamStruct; - OMX_VIDEO_STOREMETADATAINBUFFERSPARAMS* pStoreMetaData = (OMX_VIDEO_STOREMETADATAINBUFFERSPARAMS *) pParamStruct; - OMX_TI_PARAM_BUFFERPREANNOUNCE tParamSetNPA; - OMX_PARAM_PORTDEFINITIONTYPE sPortDef; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; -#endif - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nParamIndex = %d, pParamStruct = %p", - hComponent, pCompPrv, nParamIndex, pParamStruct); - - PROXY_require((pParamStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pCompPrv->pCompProxyPrv; -#endif - - if(nParamIndex == OMX_IndexParamPortDefinition) - { - if(pPortDef->format.video.eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar) - { - pPortDef->format.video.eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - else if(pPortDef->format.video.eColorFormat == OMX_COLOR_FormatAndroidOpaque) - { - if(COLORCONVERT_open(&pProxy->hCC,pCompPrv) != 0) - { - PROXY_assert(0, OMX_ErrorInsufficientResources, - "Failed to open Color converting service"); - } - pProxy->bAndroidOpaqueFormat = OMX_TRUE; - pPortDef->format.video.eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } -#endif - } - else if(nParamIndex == OMX_IndexParamVideoPortFormat) - { - if(pPortParams->eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar) - { - pPortParams->eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - else if(pPortParams->eColorFormat == OMX_COLOR_FormatAndroidOpaque) - { - if(COLORCONVERT_open(&pProxy->hCC,pCompPrv) != 0) - { - PROXY_assert(0, OMX_ErrorInsufficientResources, - "Failed to open Color converting service"); - } - pProxy->bAndroidOpaqueFormat = OMX_TRUE; - pPortParams->eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } -#endif - } - else if(nParamIndex == (OMX_INDEXTYPE) OMX_TI_IndexEncoderStoreMetadatInBuffers) - { - DOMX_DEBUG("Moving to Metadatamode"); - if (pStoreMetaData->nPortIndex == OMX_MPEG4E_INPUT_PORT && pStoreMetaData->bStoreMetaData == OMX_TRUE) - { - tParamSetNPA.nSize = sizeof(OMX_TI_PARAM_BUFFERPREANNOUNCE); - tParamSetNPA.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - tParamSetNPA.nVersion.s.nVersionMinor = OMX_VER_MINOR; - tParamSetNPA.nVersion.s.nRevision = 0x0; - tParamSetNPA.nVersion.s.nStep = 0x0; - tParamSetNPA.nPortIndex = OMX_MPEG4E_INPUT_PORT; - tParamSetNPA.bEnabled = OMX_TRUE; - //Call NPA on OMX encoder on ducati. - PROXY_SetParameter(hComponent,OMX_TI_IndexParamBufferPreAnnouncement, &tParamSetNPA); - pCompPrv->proxyPortBuffers[pStoreMetaData->nPortIndex].proxyBufferType = EncoderMetadataPointers; - DOMX_DEBUG("Moving to Metadatamode done"); - - /*Initializing Structure */ - sPortDef.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); - sPortDef.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - sPortDef.nVersion.s.nVersionMinor = OMX_VER_MINOR; - sPortDef.nVersion.s.nRevision = 0x0; - sPortDef.nVersion.s.nStep = 0x0; - sPortDef.nPortIndex = OMX_MPEG4E_INPUT_PORT; - - eError = PROXY_GetParameter(hComponent,OMX_IndexParamPortDefinition, &sPortDef); - PROXY_assert(eError == OMX_ErrorNone, eError," Error in Proxy GetParameter for Port Def"); - - sPortDef.format.video.nStride = LINUX_PAGE_SIZE; - - eError = PROXY_SetParameter(hComponent,OMX_IndexParamPortDefinition, &sPortDef); - - PROXY_assert(eError == OMX_ErrorNone, eError," Error in Proxy SetParameter for Port Def"); - } - goto EXIT; - } - - eError = PROXY_SetParameter(hComponent, nParamIndex, pParamStruct); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy SetParameter"); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -#endif - - -/* ===========================================================================*/ -/** - * @name PROXY_GetExtensionIndex() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE * pIndexType) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = hComponent; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - PROXY_require(cParameterName != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(pIndexType != NULL, OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER("%s hComponent = %p, pCompPrv = %p, cParameterName = %s", - __FUNCTION__,hComponent, pCompPrv, cParameterName); - - // Check for NULL Parameters - PROXY_require((cParameterName != NULL && pIndexType != NULL), - OMX_ErrorBadParameter, NULL); - - // Ensure that String length is not greater than Max allowed length - PROXY_require(strlen(cParameterName) <= 127, OMX_ErrorBadParameter, NULL); - - if(strcmp(cParameterName, "OMX.google.android.index.storeMetaDataInBuffers") == 0) - { - // If Index type is 2D Buffer Allocated Dimension - *pIndexType = (OMX_INDEXTYPE) OMX_TI_IndexEncoderStoreMetadatInBuffers; - goto EXIT; - } - - eError = PROXY_GetExtensionIndex(hComponent, cParameterName, pIndexType); - - EXIT: - DOMX_EXIT("%s eError: %d",__FUNCTION__, eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_MPEG4E_EmptyThisBuffer() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_EmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PTR pBufferOrig = NULL; - OMX_U32 nStride = 0, nNumLines = 0; - OMX_PARAM_PORTDEFINITIONTYPE tParamStruct; - OMX_U32 nFilledLen, nAllocLen; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - OMX_U32 nBufIndex = 0, nSize=0, nRet=0; -#endif -#ifdef ENABLE_GRALLOC_BUFFER - OMX_PTR pAuxBuf0 = NULL, pAuxBuf1 = NULL; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - OMX_ERRORTYPE eCompReturn = OMX_ErrorNone; -#endif - - PROXY_require(pBufferHdr != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - PROXY_CHK_VERSION(pBufferHdr, OMX_BUFFERHEADERTYPE); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pCompPrv->pCompProxyPrv; -#endif - - tParamStruct.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); - tParamStruct.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - tParamStruct.nVersion.s.nVersionMinor = OMX_VER_MINOR; - tParamStruct.nVersion.s.nRevision = 0x0; - tParamStruct.nVersion.s.nStep = 0x0; - tParamStruct.nPortIndex = OMX_MPEG4E_INPUT_PORT; - - eError = PROXY_GetParameter(hComponent, OMX_IndexParamPortDefinition, &tParamStruct); - PROXY_require(eError == OMX_ErrorNone, OMX_ErrorBadParameter, "Error is Get Parameter for port def"); - nFilledLen = pBufferHdr->nFilledLen; - nAllocLen = pBufferHdr->nAllocLen; - if(nFilledLen != 0) - { - pBufferHdr->nFilledLen = tParamStruct.nBufferSize; - } - pBufferHdr->nAllocLen = tParamStruct.nBufferSize; - - DOMX_DEBUG - ("%s hComponent=%p, pCompPrv=%p, nFilledLen=%d, nOffset=%d, nFlags=%08x", - __FUNCTION__,hComponent, pCompPrv, pBufferHdr->nFilledLen, - pBufferHdr->nOffset, pBufferHdr->nFlags); - - if( pCompPrv->proxyPortBuffers[OMX_MPEG4E_INPUT_PORT].proxyBufferType == EncoderMetadataPointers - && nFilledLen != 0) - { - OMX_U32 *pTempBuffer; - OMX_U32 nMetadataBufferType; - DOMX_DEBUG("Passing meta data to encoder"); - - pBufferOrig = pBufferHdr->pBuffer; - - pTempBuffer = (OMX_U32 *) (pBufferHdr->pBuffer); - nMetadataBufferType = *pTempBuffer; - - if(nMetadataBufferType == kMetadataBufferTypeCameraSource) - { -#ifdef ENABLE_GRALLOC_BUFFER - IMG_native_handle_t* pGrallocHandle; - video_metadata_t* pVideoMetadataBuffer; - DOMX_DEBUG("MetadataBufferType is kMetadataBufferTypeCameraSource"); - - pVideoMetadataBuffer = (video_metadata_t*) ((OMX_U32 *)(pBufferHdr->pBuffer)); - pGrallocHandle = (IMG_native_handle_t*) (pVideoMetadataBuffer->handle); - DOMX_DEBUG("Grallloc buffer recieved in metadata buffer 0x%x",pGrallocHandle ); - - pBufferHdr->pBuffer = (OMX_U8 *)(pGrallocHandle->fd[0]); - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)-> - pAuxBuf1 = (OMX_PTR) pGrallocHandle->fd[1]; - DOMX_DEBUG("%s Gralloc=0x%x, Y-fd=%d, UV-fd=%d", __FUNCTION__, pGrallocHandle, - pGrallocHandle->fd[0], pGrallocHandle->fd[1]); - - pBufferHdr->nOffset = pVideoMetadataBuffer->offset; -#endif - } - else if(nMetadataBufferType == kMetadataBufferTypeGrallocSource) - { -#ifdef ENABLE_GRALLOC_BUFFER - IMG_native_handle_t* pGrallocHandle; - buffer_handle_t tBufHandle; - DOMX_DEBUG("MetadataBufferType is kMetadataBufferTypeGrallocSource"); - - pTempBuffer++; - tBufHandle = *((buffer_handle_t *)pTempBuffer); - pGrallocHandle = (IMG_native_handle_t*) tBufHandle; - DOMX_DEBUG("Grallloc buffer recieved in metadata buffer 0x%x",pGrallocHandle ); - - pBufferHdr->pBuffer = (OMX_U8 *)(pGrallocHandle->fd[0]); - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)-> - pAuxBuf1 = (OMX_PTR) pGrallocHandle->fd[1]; - DOMX_DEBUG("%s Gralloc=0x%x, Y-fd=%d, UV-fd=%d", __FUNCTION__, pGrallocHandle, - pGrallocHandle->fd[0], pGrallocHandle->fd[1]); -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - if (pProxy->bAndroidOpaqueFormat) - { - DOMX_DEBUG(" ++TIMM_OSAL_ReadFromPipe() "); - /* Dequeue NV12 buffer for encoder */ - eOSALStatus = TIMM_OSAL_ReadFromPipe(pProxy->hBufPipe, &nBufIndex, - sizeof(OMX_PTR), (TIMM_OSAL_U32 *)(&nSize), - TIMM_OSAL_SUSPEND); - PROXY_assert(eOSALStatus == TIMM_OSAL_ERR_NONE, OMX_ErrorBadParameter, NULL); - - /* Get NV12 data after colorconv*/ - nRet = COLORCONVERT_PlatformOpaqueToNV12(pProxy->hCC, (void **) &pGrallocHandle, (void **) &pProxy->gralloc_handle[nBufIndex], - pGrallocHandle->iWidth, - pGrallocHandle->iHeight, - 4096, COLORCONVERT_BUFTYPE_GRALLOCOPAQUE, - COLORCONVERT_BUFTYPE_GRALLOCOPAQUE ); - if(nRet != 0) - { - eOSALStatus = TIMM_OSAL_WriteToPipe(pProxy->hBufPipe, (void *) &nBufIndex, - sizeof(OMX_U32), TIMM_OSAL_SUSPEND); - PROXY_assert(0, OMX_ErrorBadParameter, "Color conversion routine failed"); - } - DOMX_DEBUG(" --COLORCONVERT_PlatformOpaqueToNV12() "); - - /* Update pBufferHdr with NV12 buffers for OMX component */ - pBufferHdr->pBuffer= (OMX_U8 *)(pProxy->gralloc_handle[nBufIndex]->fd[0]); - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)->pAuxBuf1 = (OMX_PTR)(pProxy->gralloc_handle[nBufIndex]->fd[1]); - } -#endif -#endif - } - else - { - return OMX_ErrorBadParameter; - } -#ifdef ENABLE_GRALLOC_BUFFER - eRPCError = RPC_RegisterBuffer(pCompPrv->hRemoteComp, pBufferHdr->pBuffer, - &pAuxBuf0, &pAuxBuf1, - GrallocPointers); - PROXY_checkRpcError(); - if (pAuxBuf0) - pBufferHdr->pBuffer = pAuxBuf0; - if (pAuxBuf1) - ((OMX_TI_PLATFORMPRIVATE *) pBufferHdr->pPlatformPrivate)->pAuxBuf1 = pAuxBuf1; -#endif - } - - eError = PROXY_EmptyThisBuffer(hComponent, pBufferHdr); -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT - if (pProxy->bAndroidOpaqueFormat) - { - /*Write buffer to end of pipe for re-circulation for future ETB()*/ - eOSALStatus = TIMM_OSAL_WriteToPipe(pProxy->hBufPipe, (void *) &nBufIndex, - sizeof(OMX_U32), TIMM_OSAL_SUSPEND); - PROXY_assert(eOSALStatus == TIMM_OSAL_ERR_NONE, OMX_ErrorBadParameter, "Pipe write failed"); - } -#endif - - if( pCompPrv->proxyPortBuffers[pBufferHdr->nInputPortIndex].proxyBufferType == EncoderMetadataPointers) { - pBufferHdr->pBuffer = pBufferOrig; -#ifdef ENABLE_GRALLOC_BUFFER - RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, pAuxBuf0); - RPC_UnRegisterBuffer(pCompPrv->hRemoteComp, pAuxBuf1); -#endif - } - EXIT: - return eError; -} - -#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT -static OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_AllocateBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE ** ppBufferHdr, OMX_U32 nPortIndex, - OMX_PTR pAppPrivate, OMX_U32 nSizeBytes) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_CONFIG_RECTTYPE tParamRect; - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - DOMX_DEBUG(" ++LOCAL_PROXY_MPEG4E_AllocateBuffer"); - int err, nStride; - - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pCompPrv->pCompProxyPrv; - - if((nPortIndex == OMX_MPEG4E_INPUT_PORT) && - (pProxy->bAndroidOpaqueFormat)) - { - tParamRect.nSize = sizeof(OMX_CONFIG_RECTTYPE); - tParamRect.nVersion.s.nVersionMajor = 1; - tParamRect.nVersion.s.nVersionMinor = 1; - tParamRect.nVersion.s.nRevision = 0; - tParamRect.nVersion.s.nStep = 0; - tParamRect.nPortIndex = nPortIndex; - - eError = PROXY_GetParameter(hComponent, (OMX_INDEXTYPE)OMX_TI_IndexParam2DBufferAllocDimension, &tParamRect); - PROXY_assert(eError == OMX_ErrorNone, eError," Error in Proxy GetParameter from 2d index in allocate buffer"); - - err = pProxy->mAllocDev->alloc(pProxy->mAllocDev,(int) tParamRect.nWidth,(int) tParamRect.nHeight, - (int) HAL_PIXEL_FORMAT_TI_NV12,(int) GRALLOC_USAGE_HW_RENDER, - (const struct native_handle_t **)(&(pProxy->gralloc_handle[pProxy->nCurBufIndex])), &nStride); - } - - eError = PROXY_AllocateBuffer(hComponent, ppBufferHdr, nPortIndex, - pAppPrivate, nSizeBytes); -EXIT: - if((nPortIndex == OMX_MPEG4E_INPUT_PORT) && - (pProxy->bAndroidOpaqueFormat)) - { - if(eError != OMX_ErrorNone) - { - err = pProxy->mAllocDev->free(pProxy->mAllocDev, (buffer_handle_t)(pProxy->gralloc_handle[pProxy->nCurBufIndex])); - } - else - { - /*Populate buffer to pipe*/ - eOSALStatus = TIMM_OSAL_WriteToPipe(pProxy->hBufPipe, (void *) &pProxy->nCurBufIndex, - sizeof(OMX_U32), TIMM_OSAL_SUSPEND); - pProxy->nCurBufIndex++; - } - } - DOMX_DEBUG(" --LOCAL_PROXY_MPEG4E_AllocateBuffer"); - return eError; -} - -static OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_U32 nBufIndex, nSize, nCount=0; - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; - - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pCompPrv->pCompProxyPrv; - - if((nPortIndex == OMX_MPEG4E_INPUT_PORT) && - (pProxy->bAndroidOpaqueFormat)) - { - pProxy->nCurBufIndex--; - PROXY_require(pProxy->nCurBufIndex >=0, - OMX_ErrorBadParameter, "Buffer index underflow"); - - if(pProxy->gralloc_handle[pProxy->nCurBufIndex]) - { - pProxy->mAllocDev->free(pProxy->mAllocDev, (buffer_handle_t)(pProxy->gralloc_handle[pProxy->nCurBufIndex])); - pProxy->gralloc_handle[pProxy->nCurBufIndex] = NULL; - } - - /*Clear the Bufindex pipe by dummy reads*/ - TIMM_OSAL_GetPipeReadyMessageCount(pProxy->hBufPipe, (TIMM_OSAL_U32 *)&nCount); - if(nCount) - { - TIMM_OSAL_ReadFromPipe(pProxy->hBufPipe, &nBufIndex, - sizeof(OMX_PTR), (TIMM_OSAL_U32 *)&nSize, TIMM_OSAL_NO_SUSPEND); - } - } - - eError = PROXY_FreeBuffer(hComponent, nPortIndex, pBufferHdr); - -EXIT: - return eError; -} - -OMX_ERRORTYPE LOCAL_PROXY_MPEG4E_ComponentDeInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; - TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE; - OMX_U32 i; - - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pCompPrv->pCompProxyPrv; - - if(pProxy->hBufPipe != NULL) - { - eOSALStatus = TIMM_OSAL_DeletePipe(pProxy->hBufPipe); - pProxy->hBufPipe = NULL; - - if(eOSALStatus != TIMM_OSAL_ERR_NONE) - { - DOMX_ERROR("Pipe deletion failed"); - } - } - - if(pProxy->bAndroidOpaqueFormat == OMX_TRUE) - { - /* Cleanup internal buffers in pipe if not freed on FreeBuffer */ - for(i=0; i<OMX_MPEG4E_NUM_INTERNAL_BUF; i++) - { - if(pProxy->gralloc_handle[i]) - { - pProxy->mAllocDev->free(pProxy->mAllocDev, (buffer_handle_t)(pProxy->gralloc_handle[i])); - pProxy->gralloc_handle[i] = NULL; - } - } - - COLORCONVERT_close(pProxy->hCC,pCompPrv); - pProxy->bAndroidOpaqueFormat = OMX_FALSE; - - if(pCompPrv->pCompProxyPrv != NULL) - { - TIMM_OSAL_Free(pCompPrv->pCompProxyPrv); - pCompPrv->pCompProxyPrv = NULL; - } - } - - eError = PROXY_ComponentDeInit(hComponent); -EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -int COLORCONVERT_open(void **hCC, PROXY_COMPONENT_PRIVATE *pCompPrv) -{ - int nErr = -1; - hw_module_t const* module = NULL; - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; - - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pCompPrv->pCompProxyPrv; - nErr = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module); - - if (nErr == 0) - { - *hCC = (void *) ((IMG_gralloc_module_public_t const *)module); - } - else - { - DOMX_ERROR("FATAL: gralloc api hw_get_module() returned error: Can't find \ - %s module err = %x", GRALLOC_HARDWARE_MODULE_ID, nErr); - } - - gralloc_open(module, &(pProxy->mAllocDev)); - - return nErr; -} - -int COLORCONVERT_PlatformOpaqueToNV12(void *hCC, - void *pSrc[COLORCONVERT_MAX_SUB_BUFFERS], - void *pDst[COLORCONVERT_MAX_SUB_BUFFERS], - int nWidth, int nHeight, int nStride, - int nSrcBufType,int nDstBufType) -{ - IMG_gralloc_module_public_t const* module = hCC; - int nErr = -1; - - if((nSrcBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE) && (nDstBufType == COLORCONVERT_BUFTYPE_VIRTUAL)) - { - nErr = module->Blit(module, pSrc[0], pDst, HAL_PIXEL_FORMAT_TI_NV12); - - } - else if((nSrcBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE) && (nDstBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE )) - { - nErr = module->Blit2(module, pSrc[0], pDst[0], nWidth, nHeight, 0, 0); - } - - return nErr; -} - -int COLORCONVERT_close(void *hCC,PROXY_COMPONENT_PRIVATE *pCompPrv) -{ - OMX_PROXY_MPEG4E_PRIVATE *pProxy = NULL; - pProxy = (OMX_PROXY_MPEG4E_PRIVATE *) pCompPrv->pCompProxyPrv; - if(pProxy && pProxy->mAllocDev) - { - gralloc_close(pProxy->mAllocDev); - } - return 0; -} -#endif diff --git a/domx/omx_proxy_component/omx_sample/Makefile b/domx/omx_proxy_component/omx_sample/Makefile deleted file mode 100755 index 499d1a6..0000000 --- a/domx/omx_proxy_component/omx_sample/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -# -# Copyright (C) Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# REF=ORG -# Original version. -# ---------------------------------------------------------------------------- - - - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = -ifeq ($(BUILD),udeb) -CDEFS += DEBUG -endif -CDEFS += - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = libOMX.TI.DUCATI1.MISC.SAMPLE.so - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = SH_LIB - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = lib - -# install directory relative to the root filesystem -ROOTFSRELEASE = lib - -# Folders in which gmake will run before building current target - -SUBMODULES = \ - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ -src/omx_proxy_sample.c \ - - - -# Search path for include files - -INCLUDES = \ - $(PROJROOT)/omx_core/inc \ - $(PROJROOT)/mm_osal/inc \ - $(PROJROOT)/domx \ - $(PROJROOT)/domx/omx_rpc/inc \ - - -# Libraries needed for linking. - -ST_LIBS = -#mm_osal domx -SH_LIBS = domx omx_core mm_osal -#pthread rt utils procmgr ipc rcm notify -#SH_LIBS += sysmgr sysmemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = $(PROJROOT)/mm_osal \ - $(PROJROOT)/domx \ - $(PROJROOT)/omx_core - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk diff --git a/domx/omx_proxy_component/omx_sample/src/omx_proxy_sample.c b/domx/omx_proxy_component/omx_sample/src/omx_proxy_sample.c deleted file mode 100755 index b270186..0000000 --- a/domx/omx_proxy_component/omx_sample/src/omx_proxy_sample.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_proxy_sample.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework Tunnel Proxy component. - ********************************************************************************************* - This is the proxy specific wrapper that passes the component name to the generic proxy init() - The proxy wrapper also does some runtime/static time onfig on per proxy basis - This is a thin wrapper that is called when componentiit() of the proxy is called - static OMX_ERRORTYPE PROXY_Wrapper_init(OMX_HANDLETYPE hComponent, OMX_PTR pAppData); - this layer gets called first whenever a proxy s get handle is called - ************************************************************************************************ - * @path WTSD_DucatiMMSW\omx\omx_il_1_x\omx_proxy_component\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 19-August-2009 B Ravi Kiran ravi.kiran@ti.com: Initial Version - *================================================================*/ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include "omx_proxy_common.h" -#include <timm_osal_interfaces.h> -//change to ducati1 later -#define COMPONENT_NAME "OMX.TI.DUCATI1.MISC.SAMPLE" // needs to be specific for every configuration wrapper - -OMX_ERRORTYPE OMX_ComponentInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pComponentPrivate; - pHandle = (OMX_COMPONENTTYPE *) hComponent; - - DOMX_DEBUG - ("_____________________INSISDE PROXY WRAPPER__________________________\n"); - - pHandle->pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) - TIMM_OSAL_Malloc(sizeof(PROXY_COMPONENT_PRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - - pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - if (pHandle->pComponentPrivate == NULL) - { - DOMX_DEBUG - (" ERROR IN ALLOCATING PROXY COMPONENT PRIVATE STRUCTURE"); - eError = OMX_ErrorInsufficientResources; - goto EXIT; - } - pComponentPrivate->cCompName = - TIMM_OSAL_Malloc(MAX_COMPONENT_NAME_LENGTH * sizeof(OMX_U8), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - // Copying component Name - this will be picked up in the proxy common - assert(strlen(COMPONENT_NAME) + 1 < MAX_COMPONENT_NAME_LENGTH); - TIMM_OSAL_Memcpy(pComponentPrivate->cCompName, COMPONENT_NAME, - strlen(COMPONENT_NAME) + 1); - eError = OMX_ProxyCommonInit(hComponent); // Calling Proxy Common Init() - - if (eError != OMX_ErrorNone) - { - DOMX_DEBUG("\Error in Initializing Proxy"); - TIMM_OSAL_Free(pComponentPrivate->cCompName); - TIMM_OSAL_Free(pComponentPrivate); - } - - - EXIT: - return eError; -} diff --git a/domx/omx_proxy_component/omx_video_dec/Makefile b/domx/omx_proxy_component/omx_video_dec/Makefile deleted file mode 100755 index cbe5c56..0000000 --- a/domx/omx_proxy_component/omx_video_dec/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -# -# Copyright (C) Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# REF=ORG -# Original version. -# ---------------------------------------------------------------------------- - - - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = -ifeq ($(BUILD),udeb) -CDEFS += DEBUG -endif -CDEFS += - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = libOMX.TI.DUCATI1.VIDEO.DECODER.so - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = SH_LIB - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = lib - -# install directory relative to the root filesystem -ROOTFSRELEASE = lib - -# Folders in which gmake will run before building current target - -SUBMODULES = \ - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ -src/omx_proxy_videodec.c \ - - - -# Search path for include files - -INCLUDES = \ - $(PROJROOT)/omx_core/inc \ - $(PROJROOT)/mm_osal/inc \ - $(PROJROOT)/domx \ - $(PROJROOT)/domx/omx_rpc/inc \ - - -# Libraries needed for linking. - -ST_LIBS = -#mm_osal domx -SH_LIBS = domx omx_core mm_osal -#pthread rt utils procmgr ipc rcm notify -#SH_LIBS += sysmgr sysmemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = $(PROJROOT)/mm_osal \ - $(PROJROOT)/domx \ - $(PROJROOT)/omx_core - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk diff --git a/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec.c b/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec.c deleted file mode 100755 index 8ac4c9d..0000000 --- a/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec.c +++ /dev/null @@ -1,797 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file omx_proxy_videodecoder.c - * This file contains methods that provides the functionality for - * the OpenMAX1.1 DOMX Framework Tunnel Proxy component. - ********************************************************************************************* - This is the proxy specific wrapper that passes the component name to the generic proxy init() - The proxy wrapper also does some runtime/static time onfig on per proxy basis - This is a thin wrapper that is called when componentiit() of the proxy is called - static OMX_ERRORTYPE PROXY_Wrapper_init(OMX_HANDLETYPE hComponent, OMX_PTR pAppData); - this layer gets called first whenever a proxy's get handle is called - ************************************************************************************************ - * @path WTSD_DucatiMMSW\omx\omx_il_1_x\omx_proxy_component\src - * - * @rev 1.0 - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 20-August-2010 Sarthak Aggarwal sarthak@ti.com: Initial Version - *================================================================*/ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include "omx_proxy_common.h" -#include <timm_osal_interfaces.h> -#include "OMX_TI_IVCommon.h" -#include "OMX_TI_Video.h" -#include "OMX_TI_Index.h" - -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY -#define LOG_TAG "OMXPROXYVIDEODEC" -#include <fcntl.h> -#include <cutils/properties.h> -#include <utils/Log.h> -#endif - -#define COMPONENT_NAME "OMX.TI.DUCATI1.VIDEO.DECODER" -/* needs to be specific for every configuration wrapper */ - -#ifdef USE_ENHANCED_PORTRECONFIG -//Define port indices in video decoder proxy -#define OMX_VIDEODECODER_INPUT_PORT 0 -#define OMX_VIDEODECODER_OUTPUT_PORT 1 -#endif - -#ifdef SET_STRIDE_PADDING_FROM_PROXY - -#define LINUX_PAGE_SIZE (4 * 1024) -#define TOTAL_DEC_PORTS 2 -#define HAL_NV12_PADDED_PIXEL_FORMAT (OMX_TI_COLOR_FormatYUV420PackedSemiPlanar - OMX_COLOR_FormatVendorStartUnused) - -static OMX_ERRORTYPE RPC_UTIL_SetStrideAndPadding(OMX_COMPONENTTYPE * hRemoteComp, PROXY_COMPONENT_PRIVATE * pCompPrv); - -OMX_ERRORTYPE PROXY_VIDDEC_SendCommand(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_COMMANDTYPE eCmd, - OMX_IN OMX_U32 nParam, OMX_IN OMX_PTR pCmdData); - -OMX_ERRORTYPE PROXY_VIDDEC_EventHandler(OMX_HANDLETYPE hComponent, - OMX_PTR pAppData, OMX_EVENTTYPE eEvent, OMX_U32 nData1, OMX_U32 nData2, - OMX_PTR pEventData); - -#endif //SET_STRIDE_PADDING_FROM_PROXY - -OMX_ERRORTYPE PROXY_VIDDEC_GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE * pIndexType); - -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES - -OMX_ERRORTYPE PROXY_VIDDEC_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct); - -OMX_ERRORTYPE PROXY_VIDDEC_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct); - -#endif - -#ifdef ANDROID_QUIRK_LOCK_BUFFER -#include <hardware/gralloc.h> -#include <hardware/hardware.h> -#include "hal_public.h" - -OMX_ERRORTYPE PROXY_VIDDEC_FillThisBuffer(OMX_HANDLETYPE hComponent, OMX_BUFFERHEADERTYPE * pBufferHdr); -OMX_ERRORTYPE PROXY_VIDDEC_FillBufferDone(OMX_HANDLETYPE hComponent, - OMX_U32 remoteBufHdr, OMX_U32 nfilledLen, OMX_U32 nOffset, OMX_U32 nFlags, - OMX_TICKS nTimeStamp, OMX_HANDLETYPE hMarkTargetComponent, - OMX_PTR pMarkData); - -#endif -extern OMX_ERRORTYPE PrearrageEmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr); - -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY -extern void DumpVideoFrame(DebugFrame_Dump *frameInfo); -#endif - -OMX_ERRORTYPE OMX_ProxyViddecInit(OMX_HANDLETYPE hComponent); - -OMX_ERRORTYPE OMX_ComponentInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pComponentPrivate = NULL; - pHandle = (OMX_COMPONENTTYPE *) hComponent; - - DOMX_ENTER(""); - - DOMX_DEBUG("Component name provided is %s", COMPONENT_NAME); - - pHandle->pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) - TIMM_OSAL_Malloc(sizeof(PROXY_COMPONENT_PRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pHandle->pComponentPrivate != NULL, - OMX_ErrorInsufficientResources, - "ERROR IN ALLOCATING PROXY COMPONENT PRIVATE STRUCTURE"); - - pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - TIMM_OSAL_Memset(pComponentPrivate, 0, - sizeof(PROXY_COMPONENT_PRIVATE)); - - pComponentPrivate->cCompName = - TIMM_OSAL_Malloc(MAX_COMPONENT_NAME_LENGTH * sizeof(OMX_U8), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pComponentPrivate->cCompName != NULL, - OMX_ErrorInsufficientResources, - " Error in Allocating space for proxy component table"); - - eError = OMX_ProxyViddecInit(hComponent); - -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY - if (eError == OMX_ErrorNone) - { - char value[PROPERTY_VALUE_MAX]; - property_get("debug.video.dumpframe", value, "0:0"); - /* -ve value for fromFrame would disable this automatically */ - pComponentPrivate->debugframeInfo.fromFrame = atoi(strtok(value, ":")); - pComponentPrivate->debugframeInfo.toFrame = atoi(strtok(NULL, ":")); - pComponentPrivate->debugframeInfo.runningFrame = pComponentPrivate->debugframeInfo.fromFrame; - } -#endif - EXIT: - if (eError != OMX_ErrorNone) - { - DOMX_DEBUG("Error in Initializing Proxy"); - if (pComponentPrivate->cCompName != NULL) - { - TIMM_OSAL_Free(pComponentPrivate->cCompName); - pComponentPrivate->cCompName = NULL; - } - if (pComponentPrivate != NULL) - { - TIMM_OSAL_Free(pComponentPrivate); - pComponentPrivate = NULL; - } - } - return eError; -} - -OMX_ERRORTYPE OMX_ProxyViddecInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pComponentPrivate = NULL; - pHandle = (OMX_COMPONENTTYPE *) hComponent; - OMX_TI_PARAM_ENHANCEDPORTRECONFIG tParamStruct; - -#ifdef ANDROID_QUIRK_LOCK_BUFFER - OMX_U32 err; - hw_module_t const* module; -#endif - DOMX_ENTER(""); - - DOMX_DEBUG("Component name provided is %s", COMPONENT_NAME); - - pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - // Copying component Name - this will be picked up in the proxy common - PROXY_assert(strlen(COMPONENT_NAME) + 1 < MAX_COMPONENT_NAME_LENGTH, - OMX_ErrorInvalidComponentName, - "Length of component name is longer than the max allowed"); - TIMM_OSAL_Memcpy(pComponentPrivate->cCompName, COMPONENT_NAME, - strlen(COMPONENT_NAME) + 1); - - eError = OMX_ProxyCommonInit(hComponent); // Calling Proxy Common Init() - PROXY_assert(eError == OMX_ErrorNone, eError, "Proxy common init returned error"); -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES - pHandle->SetParameter = PROXY_VIDDEC_SetParameter; - pHandle->GetParameter = PROXY_VIDDEC_GetParameter; -#endif - pHandle->GetExtensionIndex = PROXY_VIDDEC_GetExtensionIndex; - -#ifdef SET_STRIDE_PADDING_FROM_PROXY - pHandle->SendCommand = PROXY_VIDDEC_SendCommand; - pComponentPrivate->proxyEventHandler = PROXY_VIDDEC_EventHandler; - pComponentPrivate->IsLoadedState = OMX_TRUE; -#endif - -#ifdef ANDROID_QUIRK_LOCK_BUFFER - pComponentPrivate->proxyFillBufferDone = PROXY_VIDDEC_FillBufferDone; - pHandle->FillThisBuffer = PROXY_VIDDEC_FillThisBuffer; - - err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module); - if (err == 0) - { - pComponentPrivate->grallocModule = (gralloc_module_t const *)module; - } - else - { - DOMX_ERROR("FATAL: gralloc api hw_get_module() returned error: Can't find \ - %s module err = %x", GRALLOC_HARDWARE_MODULE_ID, err); - eError = OMX_ErrorInsufficientResources; - return eError; - } -#endif - -#ifdef USE_ENHANCED_PORTRECONFIG - /*Initializing Structure */ - tParamStruct.nSize = sizeof(OMX_TI_PARAM_ENHANCEDPORTRECONFIG); - tParamStruct.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - tParamStruct.nVersion.s.nVersionMinor = OMX_VER_MINOR; - tParamStruct.nVersion.s.nRevision = 0x0; - tParamStruct.nVersion.s.nStep = 0x0; - tParamStruct.nPortIndex = OMX_VIDEODECODER_OUTPUT_PORT; - tParamStruct.bUsePortReconfigForCrop = OMX_TRUE; - tParamStruct.bUsePortReconfigForPadding = OMX_TRUE; - - eError = PROXY_SetParameter(hComponent,(OMX_INDEXTYPE)OMX_TI_IndexParamUseEnhancedPortReconfig, - &tParamStruct); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy SetParameter for Enhanced port reconfig usage"); -#endif - /* This is required to handle WMV/VC-1 content */ - pHandle->EmptyThisBuffer = PrearrageEmptyThisBuffer; - - EXIT: - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_VIDDEC_GetExtensionIndex() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_VIDDEC_GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE * pIndexType) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - - PROXY_require((hComp->pComponentPrivate != NULL), OMX_ErrorBadParameter, NULL); - PROXY_require(cParameterName != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(pIndexType != NULL, OMX_ErrorBadParameter, NULL); - - DOMX_ENTER("hComponent = %p, cParameterName = %p", hComponent, cParameterName); - -#ifdef ENABLE_GRALLOC_BUFFERS - // Ensure that String length is not greater than Max allowed length - PROXY_require(strlen(cParameterName) <= 127, OMX_ErrorBadParameter, NULL); - - if (strcmp(cParameterName, "OMX.google.android.index.getAndroidNativeBufferUsage") == 0) - { - *pIndexType = (OMX_INDEXTYPE) OMX_TI_IndexAndroidNativeBufferUsage; - } - else - { - eError = PROXY_GetExtensionIndex(hComponent, cParameterName, pIndexType); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in PROXY_GetExtensionIndex"); - } -#else - eError = PROXY_GetExtensionIndex(hComponent, cParameterName, pIndexType); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in PROXY_GetExtensionIndex"); -#endif - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -#ifdef ANDROID_QUIRK_CHANGE_PORT_VALUES - -/* ===========================================================================*/ -/** - * @name PROXY_GetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_VIDDEC_GetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pParamStruct) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PARAM_PORTDEFINITIONTYPE* pPortDef = NULL; - OMX_VIDEO_PARAM_PORTFORMATTYPE* pPortParam = NULL; - OMX_TI_PARAMNATIVEBUFFERUSAGE *pUsage = NULL; - - PROXY_require((pParamStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_assert((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nParamIndex = %d, pParamStruct = %p", - hComponent, pCompPrv, nParamIndex, pParamStruct); - -#ifdef ENABLE_GRALLOC_BUFFERS - if( nParamIndex == OMX_TI_IndexAndroidNativeBufferUsage) - { - pUsage = (OMX_TI_PARAMNATIVEBUFFERUSAGE*)pParamStruct; - if(pCompPrv->proxyPortBuffers[pUsage->nPortIndex].proxyBufferType == GrallocPointers) - { - PROXY_CHK_VERSION(pParamStruct, OMX_TI_PARAMNATIVEBUFFERUSAGE); - pUsage->nUsage = GRALLOC_USAGE_HW_RENDER; -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY - pUsage->nUsage |= GRALLOC_USAGE_SW_READ_RARELY; -#endif - goto EXIT; - } - } -#endif - eError = PROXY_GetParameter(hComponent,nParamIndex, pParamStruct); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy GetParameter"); - - if( nParamIndex == OMX_IndexParamPortDefinition) - { - PROXY_CHK_VERSION(pParamStruct, OMX_PARAM_PORTDEFINITIONTYPE); - pPortDef = (OMX_PARAM_PORTDEFINITIONTYPE *)pParamStruct; - if(pPortDef->format.video.eColorFormat == OMX_COLOR_FormatYUV420PackedSemiPlanar) - { - if(pCompPrv->proxyPortBuffers[pPortDef->nPortIndex].proxyBufferType == GrallocPointers) - { - pPortDef->format.video.eColorFormat = HAL_NV12_PADDED_PIXEL_FORMAT; - } - else - { - pPortDef->format.video.eColorFormat = OMX_TI_COLOR_FormatYUV420PackedSemiPlanar; - } - } - } - else if ( nParamIndex == OMX_IndexParamVideoPortFormat) - { - PROXY_CHK_VERSION(pParamStruct, OMX_VIDEO_PARAM_PORTFORMATTYPE); - pPortParam = (OMX_VIDEO_PARAM_PORTFORMATTYPE *)pParamStruct; - if(pPortParam->eColorFormat == OMX_COLOR_FormatYUV420PackedSemiPlanar) - { - if(pCompPrv->proxyPortBuffers[pPortParam->nPortIndex].proxyBufferType == GrallocPointers) - { - pPortParam->eColorFormat = HAL_NV12_PADDED_PIXEL_FORMAT; - } - else - { - pPortParam->eColorFormat = OMX_TI_COLOR_FormatYUV420PackedSemiPlanar; - } - } - } - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_SetParameter() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_VIDDEC_SetParameter(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, OMX_IN OMX_PTR pParamStruct) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_PARAM_PORTDEFINITIONTYPE* pPortDef = (OMX_PARAM_PORTDEFINITIONTYPE *)pParamStruct; - OMX_VIDEO_PARAM_PORTFORMATTYPE* pPortParams = (OMX_VIDEO_PARAM_PORTFORMATTYPE *)pParamStruct; - - PROXY_require((pParamStruct != NULL), OMX_ErrorBadParameter, NULL); - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, nParamIndex = %d, pParamStruct = %p", - hComponent, pCompPrv, nParamIndex, pParamStruct); - if(nParamIndex == OMX_IndexParamPortDefinition) - { - if(pPortDef->format.video.eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar - || pPortDef->format.video.eColorFormat == HAL_NV12_PADDED_PIXEL_FORMAT) - { - pPortDef->format.video.eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } - } - else if(nParamIndex == OMX_IndexParamVideoPortFormat) - { - if(pPortParams->eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar - || pPortParams->eColorFormat == HAL_NV12_PADDED_PIXEL_FORMAT) - { - pPortParams->eColorFormat = OMX_COLOR_FormatYUV420PackedSemiPlanar; - } - } - - eError = PROXY_SetParameter(hComponent, nParamIndex, pParamStruct); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy SetParameter"); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -#endif - -#ifdef SET_STRIDE_PADDING_FROM_PROXY -/* ===========================================================================*/ -/** - * @name PROXY_VIDDEC_SendCommand() - * @brief - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_VIDDEC_SendCommand(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_COMMANDTYPE eCmd, - OMX_IN OMX_U32 nParam, OMX_IN OMX_PTR pCmdData) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - DOMX_ENTER - ("hComponent = %p, pCompPrv = %p, eCmd = %d, nParam = %d, pCmdData = %p", - hComponent, pCompPrv, eCmd, nParam, pCmdData); - - if(eCmd == OMX_CommandStateSet) - { - //Set appropriate stride before Loaded to Idle transition. - if((OMX_STATETYPE)nParam == OMX_StateIdle && pCompPrv->IsLoadedState == OMX_TRUE) - { - eError = RPC_UTIL_SetStrideAndPadding(hComponent, pCompPrv); - PROXY_require(eError == OMX_ErrorNone, eError, - "Stride and padding setting from proxy returned"); - pCompPrv->IsLoadedState = OMX_FALSE; - } - } - else if(eCmd == OMX_CommandPortEnable) - { - if(nParam == OMX_ALL || nParam == OMX_VIDEODECODER_OUTPUT_PORT) - { - eError = RPC_UTIL_SetStrideAndPadding(hComponent, pCompPrv); - PROXY_require(eError == OMX_ErrorNone, eError, - "Stride and padding setting from proxy returned"); - } - } - - eError = - PROXY_SendCommand(hComponent, eCmd, nParam, pCmdData); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_EventHandler() - * @brief - * @param void - * @return OMX_ErrorNone = Successful - * @sa TBD - * - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_VIDDEC_EventHandler(OMX_HANDLETYPE hComponent, - OMX_PTR pAppData, OMX_EVENTTYPE eEvent, OMX_U32 nData1, OMX_U32 nData2, - OMX_PTR pEventData) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, - "This is fatal error, processing cant proceed - please debug"); - - DOMX_ENTER - ("hComponent=%p, pCompPrv=%p, eEvent=%p, nData1=%p, nData2=%p, pEventData=%p", - hComponent, pCompPrv, eEvent, nData1, nData2, pEventData); - - if((eEvent == OMX_EventCmdComplete) && ((OMX_COMMANDTYPE)nData1 == OMX_CommandStateSet)) - { - if((OMX_STATETYPE)nData2 == OMX_StateLoaded) - { - pCompPrv->IsLoadedState = OMX_TRUE; - } - } - eError = PROXY_EventHandler(hComponent, pAppData, eEvent, nData1, nData2, pEventData); - - EXIT: - return eError; -} - -/* ===========================================================================*/ -/** - * @name RPC_UTIL_RPC_UTIL_SetStrideAndPadding() - * @brief Gets stride on this port. Used to set stride on OMX to tell whether buffer is 1D or 2D - * @param hRemoteComp [IN] : Remote component handle. - * @return OMX_ErrorNone = Successful - */ -/* ===========================================================================*/ -OMX_ERRORTYPE RPC_UTIL_SetStrideAndPadding(OMX_COMPONENTTYPE * hComponent,PROXY_COMPONENT_PRIVATE * pCompPrv) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_PARAM_PORTDEFINITIONTYPE sPortDef; - OMX_CONFIG_RECTTYPE tParamStruct; - OMX_U32 nPortIndex = 0; - - for(nPortIndex=0; nPortIndex < TOTAL_DEC_PORTS ;nPortIndex++ ) - { - /*Initializing Structure */ - sPortDef.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); - sPortDef.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - sPortDef.nVersion.s.nVersionMinor = OMX_VER_MINOR; - sPortDef.nVersion.s.nRevision = 0x0; - sPortDef.nVersion.s.nStep = 0x0; - sPortDef.nPortIndex = nPortIndex; - - eError = PROXY_GetParameter(hComponent,OMX_IndexParamPortDefinition, - &sPortDef); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy GetParameter for Port Def"); - - if (sPortDef.eDomain == OMX_PortDomainVideo && sPortDef.format.video.eCompressionFormat == OMX_VIDEO_CodingUnused) - { - if(pCompPrv->proxyPortBuffers[nPortIndex].IsBuffer2D == OMX_TRUE) - { - sPortDef.format.video.nStride = LINUX_PAGE_SIZE; - } - else - { - tParamStruct.nSize = sizeof(OMX_CONFIG_RECTTYPE); - tParamStruct.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - tParamStruct.nVersion.s.nVersionMinor = OMX_VER_MINOR; - tParamStruct.nVersion.s.nRevision = 0x0; - tParamStruct.nVersion.s.nStep = 0x0; - tParamStruct.nPortIndex = nPortIndex; - - eError = PROXY_GetParameter(hComponent,(OMX_INDEXTYPE)OMX_TI_IndexParam2DBufferAllocDimension, - &tParamStruct); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy GetParameter for 2D index"); - - sPortDef.format.video.nStride = tParamStruct.nWidth; - } - eError = PROXY_SetParameter(hComponent,OMX_IndexParamPortDefinition, - &sPortDef); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy SetParameter for Port Def"); - } - } - - EXIT: - return eError; -} - -#endif - -#ifdef ANDROID_QUIRK_LOCK_BUFFER -/* ===========================================================================*/ -/** - * @name PROXY_VIDDEC_FillThisBuffer() - * @brief Gets stride on this port. Used to set stride on OMX to tell whether buffer is 1D or 2D - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_VIDDEC_FillThisBuffer(OMX_HANDLETYPE hComponent, OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U32 count = 0; - IMG_native_handle_t* grallocHandle; - OMX_PARAM_PORTDEFINITIONTYPE sPortDef; - - PROXY_require(pBufferHdr != NULL, OMX_ErrorBadParameter, NULL); - PROXY_require(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, - NULL); - PROXY_CHK_VERSION(pBufferHdr, OMX_BUFFERHEADERTYPE); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - if(pCompPrv->proxyPortBuffers[OMX_VIDEODECODER_OUTPUT_PORT].proxyBufferType - == GrallocPointers) - { - /* Lock the Gralloc buffer till it gets rendered completely */ - /* Extract the Gralloc handle from the Header and then call lock on that */ - /* Note# There is no error check for the pBufferHdr here*/ - grallocHandle = (IMG_native_handle_t*)pBufferHdr->pBuffer; - - /*Initializing Structure */ - sPortDef.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); - sPortDef.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - sPortDef.nVersion.s.nVersionMinor = OMX_VER_MINOR; - sPortDef.nVersion.s.nRevision = 0x0; - sPortDef.nVersion.s.nStep = 0x0; - sPortDef.nPortIndex = OMX_VIDEODECODER_INPUT_PORT; - eError = PROXY_GetParameter(hComponent,OMX_IndexParamPortDefinition, - &sPortDef); - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy GetParameter for Port Def"); - -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY - /* Get the Video frame crop window */ - OMX_CONFIG_RECTTYPE rect; - rect.nSize = sizeof(rect); - rect.nVersion.s.nVersionMajor = OMX_VER_MAJOR; - rect.nVersion.s.nVersionMinor = OMX_VER_MINOR; - rect.nVersion.s.nRevision = 0x0; - rect.nVersion.s.nStep = 0x0; - rect.nPortIndex = OMX_VIDEODECODER_OUTPUT_PORT; - - eError = PROXY_GetConfig(hComponent, OMX_IndexConfigCommonOutputCrop, &rect); - - PROXY_assert(eError == OMX_ErrorNone, - eError," Error while getting output crop"); - pCompPrv->debugframeInfo.frame_width = rect.nWidth; - pCompPrv->debugframeInfo.frame_height = rect.nHeight; - pCompPrv->debugframeInfo.frame_xoffset = rect.nLeft; - pCompPrv->debugframeInfo.frame_yoffset = rect.nTop; -#endif - pCompPrv->grallocModule->lock((gralloc_module_t const *) pCompPrv->grallocModule, - (buffer_handle_t)grallocHandle, GRALLOC_USAGE_HW_RENDER, - 0,0,sPortDef.format.video.nFrameWidth, sPortDef.format.video.nFrameHeight,NULL); - } - - eRPCError = PROXY_FillThisBuffer(hComponent, pBufferHdr); - - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in Proxy SetParameter for Port Def"); - - EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -/* ===========================================================================*/ -/** - * @name PROXY_VIDDEC_FillBufferDone() - * @brief Gets stride on this port. Used to set stride on OMX to tell whether buffer is 1D or 2D - */ -/* ===========================================================================*/ -OMX_ERRORTYPE PROXY_VIDDEC_FillBufferDone(OMX_HANDLETYPE hComponent, - OMX_U32 remoteBufHdr, OMX_U32 nfilledLen, OMX_U32 nOffset, OMX_U32 nFlags, - OMX_TICKS nTimeStamp, OMX_HANDLETYPE hMarkTargetComponent, - OMX_PTR pMarkData) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone, eCompReturn = OMX_ErrorNone; - RPC_OMX_ERRORTYPE eRPCError = RPC_OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U32 count = 0; - IMG_native_handle_t* grallocHandle; - - PROXY_require((hComp->pComponentPrivate != NULL), - OMX_ErrorBadParameter, - "This is fatal error, processing cant proceed - please debug"); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - - /* Lock the Gralloc buffer till it gets rendered completely */ - /* Extract the Gralloc handle from the Header and then call lock on that */ - /* Note# There is no error check for the pBufferHdr here*/ - - if(pCompPrv->proxyPortBuffers[OMX_VIDEODECODER_OUTPUT_PORT].proxyBufferType - == GrallocPointers) { - for (count = 0; count < pCompPrv->nTotalBuffers; ++count) - { - if (pCompPrv->tBufList[count].pBufHeaderRemote == remoteBufHdr) - { - grallocHandle = (IMG_native_handle_t*)(pCompPrv->tBufList[count].pBufHeader)->pBuffer; - break; - } - } - - PROXY_assert((count != pCompPrv->nTotalBuffers), - OMX_ErrorBadParameter, - "Received invalid-buffer header from OMX component"); - pCompPrv->grallocModule->unlock((gralloc_module_t const *) pCompPrv->grallocModule, (buffer_handle_t)grallocHandle); - -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY - ALOGV("frm[%u] to[%u] run[%u]", pCompPrv->debugframeInfo.fromFrame, pCompPrv->debugframeInfo.toFrame, pCompPrv->debugframeInfo.runningFrame); - /* Fill buffer Done successed, hence start dumping if requested */ - OMX_BUFFERHEADERTYPE *pBufHdr = pCompPrv->tBufList[count].pBufHeader; - if ((pCompPrv->debugframeInfo.fromFrame == 0) && (pCompPrv->debugframeInfo.runningFrame <= pCompPrv->debugframeInfo.toFrame)) - { - /* Lock the buffer for SW read usage and then access it */ - pCompPrv->grallocModule->lock((gralloc_module_t const*) pCompPrv->grallocModule, - (buffer_handle_t)grallocHandle, - GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_SW_READ_RARELY, - pCompPrv->debugframeInfo.frame_xoffset, - pCompPrv->debugframeInfo.frame_yoffset, - pCompPrv->debugframeInfo.frame_width, - pCompPrv->debugframeInfo.frame_height, - (void*)pCompPrv->debugframeInfo.y_uv); - - DumpVideoFrame(&pCompPrv->debugframeInfo); - - pCompPrv->grallocModule->unlock((gralloc_module_t const *) pCompPrv->grallocModule, - (buffer_handle_t)grallocHandle); - pCompPrv->debugframeInfo.runningFrame++; - } - else if (pCompPrv->debugframeInfo.fromFrame > 0) - { - pCompPrv->debugframeInfo.fromFrame--; - } -#endif - } - - eRPCError = PROXY_FillBufferDone(hComponent,remoteBufHdr, nfilledLen, nOffset, nFlags, - nTimeStamp, hMarkTargetComponent, pMarkData); - - PROXY_assert(eError == OMX_ErrorNone, - eError," Error in PROXY FillBufferDone for Port Def"); - -EXIT: - DOMX_EXIT("eError: %d", eError); - return eError; -} - -#endif - diff --git a/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec_secure.c b/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec_secure.c deleted file mode 100644 index 473a7f0..0000000 --- a/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec_secure.c +++ /dev/null @@ -1,157 +0,0 @@ -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include "omx_proxy_common.h" -#include <timm_osal_interfaces.h> -#include <sys/ioctl.h> -#include <errno.h> -#include <sys/stat.h> -#include <fcntl.h> - -#define COMPONENT_NAME "OMX.TI.DUCATI1.VIDEO.DECODER.secure" - -extern OMX_U32 DUCATI_IN_SECURE_MODE; -extern OMX_U32 SECURE_COMPONENTS_RUNNING; - -extern OMX_ERRORTYPE OMX_ProxyViddecInit(OMX_HANDLETYPE hComponent); -OMX_ERRORTYPE PROXY_VIDDEC_Secure_ComponentDeInit(OMX_HANDLETYPE hComponent); - -OMX_ERRORTYPE OMX_ComponentInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pComponentPrivate = NULL; - const OMX_U8 enable = 1, disable = 0; - OMX_U8 mode; - int ret; - - pHandle = (OMX_COMPONENTTYPE *) hComponent; - - DOMX_ENTER(""); - - DOMX_DEBUG("Component name provided is %s", COMPONENT_NAME); - - pHandle->pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) - TIMM_OSAL_Malloc(sizeof(PROXY_COMPONENT_PRIVATE), TIMM_OSAL_TRUE, - 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pHandle->pComponentPrivate != NULL, - OMX_ErrorInsufficientResources, - "ERROR IN ALLOCATING PROXY COMPONENT PRIVATE STRUCTURE"); - - pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - TIMM_OSAL_Memset(pComponentPrivate, 0, - sizeof(PROXY_COMPONENT_PRIVATE)); - - pComponentPrivate->cCompName = - TIMM_OSAL_Malloc(MAX_COMPONENT_NAME_LENGTH * sizeof(OMX_U8), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - - PROXY_assert(pComponentPrivate->cCompName != NULL, - OMX_ErrorInsufficientResources, - " Error in Allocating space for proxy component table"); - - // Copying component Name - this will be picked up in the proxy common - PROXY_assert(strlen(COMPONENT_NAME) + 1 < MAX_COMPONENT_NAME_LENGTH, - OMX_ErrorInvalidComponentName, - "Length of component name is longer than the max allowed"); - TIMM_OSAL_Memcpy(pComponentPrivate->cCompName, COMPONENT_NAME, - strlen(COMPONENT_NAME) + 1); - - pComponentPrivate->secure_misc_drv_fd = open("/dev/rproc_user", O_SYNC | O_RDWR); - if (pComponentPrivate->secure_misc_drv_fd < 0) - { - DOMX_ERROR("Can't open rproc_user device 0x%x\n", errno); - eError = OMX_ErrorInsufficientResources; - goto EXIT; - } - - ret = write(pComponentPrivate->secure_misc_drv_fd, &enable, sizeof(enable)); - if(ret != 1) - { - DOMX_ERROR("errno from setting secure mode = %x",errno); - ret = write(pComponentPrivate->secure_misc_drv_fd, &disable, sizeof(disable)); - if (ret < 0) - { - DOMX_ERROR("Setting unsecure mode failed"); - } - - ret = close(pComponentPrivate->secure_misc_drv_fd); - if (ret < 0) - { - DOMX_ERROR("Can't close the driver"); - } - eError = OMX_ErrorInsufficientResources; - goto EXIT; - } - - ret = read(pComponentPrivate->secure_misc_drv_fd, &mode, sizeof(mode)); - PROXY_assert(mode == enable, OMX_ErrorUndefined,"ERROR: We are not in secure mode"); - DOMX_DEBUG("secure mode recieved from Misc driver for secure playback = 0x%x\n", mode); - - eError = OMX_ProxyViddecInit(hComponent); - pHandle->ComponentDeInit = PROXY_VIDDEC_Secure_ComponentDeInit; - -#ifdef USE_ION - pComponentPrivate->bUseIon = OMX_TRUE; - pComponentPrivate->bMapIonBuffers = OMX_FALSE; -#endif - EXIT: - if (eError != OMX_ErrorNone) - { - DOMX_DEBUG("Error in Initializing Proxy"); - if (pComponentPrivate->cCompName != NULL) - { - TIMM_OSAL_Free(pComponentPrivate->cCompName); - pComponentPrivate->cCompName = NULL; - } - if (pComponentPrivate != NULL) - { - TIMM_OSAL_Free(pComponentPrivate); - pComponentPrivate = NULL; - } - } - return eError; -} - -OMX_ERRORTYPE PROXY_VIDDEC_Secure_ComponentDeInit(OMX_HANDLETYPE hComponent) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_COMPONENTTYPE *pHandle = NULL; - PROXY_COMPONENT_PRIVATE *pComponentPrivate = NULL; - int ret; - const OMX_U8 disable = 0; - int secure_misc_drv_fd; - - pHandle = (OMX_COMPONENTTYPE *) hComponent; - - pComponentPrivate = - (PROXY_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - - secure_misc_drv_fd = pComponentPrivate->secure_misc_drv_fd; - - eError = PROXY_ComponentDeInit(hComponent); - if(eError != OMX_ErrorNone) - { - DOMX_ERROR("Proxy common deinit returned error = %x",eError); - } - pComponentPrivate = NULL; - - ret = write(secure_misc_drv_fd, &disable, sizeof(disable)); - if (ret < 0) - { - DOMX_ERROR("Setting unsecure mode failed"); - } - - ret = close(secure_misc_drv_fd); - if (ret < 0) - { - DOMX_ERROR("Can't close the driver"); - } - - return eError; -} - diff --git a/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec_utils.c b/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec_utils.c deleted file mode 100755 index 53922fd..0000000 --- a/domx/omx_proxy_component/omx_video_dec/src/omx_proxy_videodec_utils.c +++ /dev/null @@ -1,318 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/*============================================================== - *! Revision History - *! ============================ - *! 21-Oct-2011 Rajesh vandanapu sarthav@ti.com: Initial Version - *================================================================*/ - -/****************************************************************** - * INCLUDE FILES - ******************************************************************/ -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include "omx_proxy_common.h" -#include <timm_osal_interfaces.h> -#include "OMX_TI_IVCommon.h" -#include "OMX_TI_Video.h" -#include "OMX_TI_Index.h" - -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY -#define LOG_TAG "OMXPROXYVIDEODEC" -#include <fcntl.h> -#include <cutils/properties.h> -#include <utils/Log.h> -#include <stdlib.h> -#include <errno.h> -#endif - -#define COMPONENT_NAME "OMX.TI.DUCATI1.VIDEO.DECODER" -/* needs to be specific for every configuration wrapper */ - -/* DEFINITIONS for parsing the config information & sequence header for WMV*/ -#define VIDDEC_GetUnalignedDword( pb, dw ) \ - (dw) = ((OMX_U32) *(pb + 3) << 24) + \ - ((OMX_U32) *(pb + 2) << 16) + \ - ((OMX_U16) *(pb + 1) << 8) + *pb; - -#define VIDDEC_GetUnalignedDwordEx( pb, dw ) VIDDEC_GetUnalignedDword( pb, dw ); (pb) += sizeof(OMX_U32); -#define VIDDEC_LoadDWORD( dw, p ) VIDDEC_GetUnalignedDwordEx( p, dw ) -#define VIDDEC_MAKEFOURCC(ch0, ch1, ch2, ch3) \ - ((OMX_U32)(OMX_U8)(ch0) | ((OMX_U32)(OMX_U8)(ch1) << 8) | \ - ((OMX_U32)(OMX_U8)(ch2) << 16) | ((OMX_U32)(OMX_U8)(ch3) << 24 )) - -#define VIDDEC_FOURCC(ch0, ch1, ch2, ch3) VIDDEC_MAKEFOURCC(ch0, ch1, ch2, ch3) - -#define FOURCC_WMV3 VIDDEC_FOURCC('W','M','V','3') -#define FOURCC_WMV2 VIDDEC_FOURCC('W','M','V','2') -#define FOURCC_WMV1 VIDDEC_FOURCC('W','M','V','1') -#define FOURCC_WVC1 VIDDEC_FOURCC('W','V','C','1') - -#define CSD_POSITION 51 /*Codec Specific Data position on the "stream propierties object"(ASF spec)*/ - -typedef struct VIDDEC_WMV_RCV_struct { - OMX_U32 nNumFrames : 24; - OMX_U32 nFrameType : 8; - OMX_U32 nID : 32; - OMX_U32 nStructData : 32; //STRUCT_C - OMX_U32 nVertSize; //STRUCT_A-1 - OMX_U32 nHorizSize; //STRUCT_A-2 - OMX_U32 nID2 : 32; - OMX_U32 nSequenceHdr : 32; //STRUCT_B -} VIDDEC_WMV_RCV_struct; - -typedef struct VIDDEC_WMV_VC1_struct { - OMX_U32 nNumFrames : 24; - OMX_U32 nFrameType : 8; - OMX_U32 nID : 32; - OMX_U32 nStructData : 32; //STRUCT_C - OMX_U32 nVertSize; //STRUCT_A-1 - OMX_U32 nHorizSize; //STRUCT_A-2 - OMX_U32 nID2 : 32; - OMX_U32 nSequenceHdr : 32; //STRUCT_B -} VIDDEC_WMV_VC1_struct; - - -OMX_ERRORTYPE PrearrageEmptyThisBuffer(OMX_HANDLETYPE hComponent, - OMX_BUFFERHEADERTYPE * pBufferHdr) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - PROXY_COMPONENT_PRIVATE *pCompPrv = NULL; - OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent; - OMX_U8* pBuffer = NULL; - OMX_U8* pData = NULL; - OMX_U32 nValue = 0; - OMX_U32 nWidth = 0; - OMX_U32 nHeight = 0; - OMX_U32 nActualCompression = 0; - OMX_U8* pCSD = NULL; - OMX_U32 nSize_CSD = 0; - DOMX_ENTER(""); - - PROXY_assert(pBufferHdr != NULL, OMX_ErrorBadParameter, NULL); - - if (pBufferHdr->nFlags & OMX_BUFFERFLAG_CODECCONFIG){ - PROXY_assert(hComp->pComponentPrivate != NULL, OMX_ErrorBadParameter, NULL); - - pCompPrv = (PROXY_COMPONENT_PRIVATE *) hComp->pComponentPrivate; - /* Get component role */ - OMX_PARAM_COMPONENTROLETYPE compRole; - compRole.nSize = sizeof(OMX_PARAM_COMPONENTROLETYPE); - compRole.nVersion.s.nVersionMajor = 1; - compRole.nVersion.s.nVersionMinor = 1; //Ducati OMX version - compRole.nVersion.s.nRevision = 0; - compRole.nVersion.s.nStep = 0; - - eError = PROXY_GetParameter(hComp, OMX_IndexParamStandardComponentRole, &compRole); - if(eError != OMX_ErrorNone){ - DOMX_ERROR("Error getting OMX_IndexParamStandardComponentRole"); - } - - if(!strcmp((char *)(compRole.cRole), "video_decoder.wmv")){ - pBuffer = pBufferHdr->pBuffer; - - VIDDEC_WMV_RCV_struct sStructRCV; - - DOMX_DEBUG("nFlags: %x", pBufferHdr->nFlags); - - pData = pBufferHdr->pBuffer + 15; /*Position to Width & Height*/ - VIDDEC_LoadDWORD(nValue, pData); - nWidth = nValue; - VIDDEC_LoadDWORD(nValue, pData); - nHeight = nValue; - - pData += 4; /*Position to compression type*/ - VIDDEC_LoadDWORD(nValue, pData); - nActualCompression = nValue; - - /*Seting pCSD to proper position*/ - pCSD = pBufferHdr->pBuffer; - pCSD += CSD_POSITION; - nSize_CSD = pBufferHdr->nFilledLen - CSD_POSITION; - - if(nActualCompression == FOURCC_WMV3){ - - //From VC-1 spec: Table 265: Sequence Layer Data Structure - sStructRCV.nNumFrames = 0xFFFFFF; /*Infinite frame number*/ - sStructRCV.nFrameType = 0xc5; /*0x85 is the value given by ASF to rcv converter*/ - sStructRCV.nID = 0x04; /*WMV3*/ - sStructRCV.nStructData = 0x018a3106; /*0x06318a01zero fill 0x018a3106*/ - sStructRCV.nVertSize = nHeight; - sStructRCV.nHorizSize = nWidth; - sStructRCV.nID2 = 0x0c; /* Fix value */ - sStructRCV.nSequenceHdr = 0x00002a9f; /* This value is not provided by parser, so giving a value from a video*/ - - DOMX_DEBUG("initial: nStructData: %x", sStructRCV.nStructData); - DOMX_DEBUG("pCSD = %x", (OMX_U32)*pCSD); - - sStructRCV.nStructData = (OMX_U32)pCSD[0] << 0 | - pCSD[1] << 8 | - pCSD[2] << 16 | - pCSD[3] << 24; - - DOMX_DEBUG("FINAL: nStructData: %x", sStructRCV.nStructData); - - //Copy RCV structure to actual buffer - assert(pBufferHdr->nFilledLen < pBufferHdr->nAllocLen); - pBufferHdr->nFilledLen = sizeof(VIDDEC_WMV_RCV_struct); - TIMM_OSAL_Memcpy(pBufferHdr->pBuffer, (OMX_U8*)(&sStructRCV), - pBufferHdr->nFilledLen); - - } - else if (nActualCompression == FOURCC_WVC1){ - DOMX_DEBUG("VC-1 Advance Profile prearrange"); - pBufferHdr->nOffset = pBufferHdr->nOffset+52; - pBufferHdr->nFilledLen= pBufferHdr->nFilledLen-52; - } - } - } - - EXIT: - DOMX_EXIT("eError: %d", eError); - - return PROXY_EmptyThisBuffer(hComponent, pBufferHdr); -} - -#ifdef ENABLE_RAW_BUFFERS_DUMP_UTILITY -/** -* Usage# -* By default this feature is kept disabled to avoid security leaks. -* -* (1) Uncomment the below 2 lines from Android.mk -* #LOCAL_CFLAGS += -DENABLE_RAW_BUFFERS_DUMP_UTILITY -* #LOCAL_SHARED_LIBRARIES += libcutils -* And rebuild the omx proxy common component -* -* (2) Before start playback, make sure that "data" folder has r/w -* permissions. For this, execute the below -* mount -o rw,remount -t ext3 /dev/block/mmcblk0p1 /data/ -* chmod 777 /data/ -* -* (3) Set the property for number of frames to dump -* eg: setprop debug.video.dumpframe 10:20 -* would dump frames from 10 to 20. -* -* (4) Pull the frames to PC over adb -* adb pull /data/frame_10.txt -* -* (5) Analyse on PC tools. -*/ - -/* -* Method to convert NV12 to YUV420p for PC analysis -*/ -static void convertNV12ToYuv420(DebugFrame_Dump *frameInfo, void *dst) -{ - int stride = 4096; /* ARM Page size = 4k */ - uint32_t ybuf_offset = frameInfo->frame_yoffset * stride + frameInfo->frame_xoffset; - uint8_t* p1y = (uint8_t*)frameInfo->y_uv[0] + ybuf_offset; - uint8_t* p2y = (uint8_t*) dst; - int i, j, j1; - int width = frameInfo->frame_width; - int height = frameInfo->frame_height; - - LOGD("Coverting NV-12 to YUV420p Width[%d], Height[%d] and Stride[%d] offset[%d]", - width, height, stride, ybuf_offset); - - /* copy y-buffer, almost bytewise copy, except for stride jumps.*/ - for(i=0;i<height;i++) - { - /* copy whole row of Y pixels. source and desination will point to new row each time.*/ - memcpy(p2y+i*width, p1y+i*stride, width); - } - - /** copy uv buffers - * rearrange from packed planar [uvuvuv] to planar [uuu][vvvv] packages pixel wise - * calculate the offset for UV buffer - */ - uint32_t UV_offset = frameInfo->frame_xoffset + - (frameInfo->frame_yoffset * stride)/2; - - const uint8_t* p1uv = (uint8_t*)frameInfo->y_uv[1] + UV_offset; - - uint8_t* p2u = ((uint8_t*) dst + (width * height)); - uint8_t* p2v = ((uint8_t*) p2u + ((width/2) * (height/2))); - for(i=0;(i < height/2);i++) - { - for(j=0,j1=0;(j< width/2);j++,j1+=2) - { - p2u[j] = p1uv[j1]; - p2v[j] = p1uv[j1+1]; - } - p1uv+=stride; - p2u+=width/2; - p2v+=width/2; - } -} - -void DumpVideoFrame(DebugFrame_Dump *frameInfo) -{ - /* First convert the frame to 420p and then write to SD Card */ - OMX_U32 framesize = (frameInfo->frame_width * - frameInfo->frame_height * 3) / 2; - OMX_U8* localbuffer = malloc(framesize); - if (localbuffer == NULL) - { - LOGE("NO HEAP"); - goto EXIT; - } - convertNV12ToYuv420(frameInfo, localbuffer); - int filedes = -1; - char framenumber[100]; - sprintf(framenumber, "/data/frame_%ld.txt", frameInfo->runningFrame); - LOGD("file path %s",framenumber); - filedes = open(framenumber, O_CREAT | O_WRONLY | O_SYNC | O_TRUNC, 0777); - if(filedes < 0) - { - LOGE("\n!!!!!!!!!Error in file open!!!!!!!! [%d][%s]\n", filedes, strerror(errno)); - goto EXIT; - } - int ret = write (filedes, (void*)localbuffer, framesize); - if (ret < (int)framesize) - { - LOGE("File Write Failed"); - } -EXIT: - if (localbuffer) - { - free(localbuffer); - localbuffer = NULL; - } - if (filedes > 0) - { - close(filedes); - } -} - -#endif diff --git a/domx/test/Makefile b/domx/test/Makefile deleted file mode 100644 index 78c6f31..0000000 --- a/domx/test/Makefile +++ /dev/null @@ -1,95 +0,0 @@ -# -# Copyright (C) Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# REF=ORG -# Original version. -# ---------------------------------------------------------------------------- - - - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = -ifeq ($(BUILD),udeb) -CDEFS += DEBUG -endif -CDEFS += - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = - -# install directory relative to the root filesystem -ROOTFSRELEASE = - -# Folders in which gmake will run before building current target - -SUBMODULES = sample_proxy \ - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ - - - - -# Search path for include files - -INCLUDES = - -# Libraries needed for linking. - -#ST_LIBS = omx_core omx_proxy_component mmplatform mm_osal domx -#SH_LIBS = pthread rt utils procmgr ipc rcm notify -#SH_LIBS += sysmgr sysmemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = $(PROJROOT)/target/lib - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk - diff --git a/domx/test/sample_proxy/Makefile b/domx/test/sample_proxy/Makefile deleted file mode 100644 index 02a3619..0000000 --- a/domx/test/sample_proxy/Makefile +++ /dev/null @@ -1,98 +0,0 @@ -# -# Copyright (C) Texas Instruments - http://www.ti.com/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ---------------------------------------------------------------------------- -# Revision History -# -# -# REF=ORG -# Original version. -# ---------------------------------------------------------------------------- - - - -include $(PROJROOT)/make/start.mk - -# Do not change above "include" line(s) - -# Arguments to tools, will move to make system once finalized. - -CFLAGS = -CDEFS = -ifeq ($(BUILD),udeb) -CDEFS += DEBUG -endif -CDEFS += - -EXEC_ARGS = -ST_LIB_ARGS = -SH_LIB_ARGS = - -# Define this macro if target runs in kernel mode -#__KERNEL__ = 1 - -# Target name and extension -# static library (ST_LIB): filename.a -# shared library soname (SH_LIB): filename.so.maj_ver.min_ver -# executable (EXEC) : filename.out - -TARGETNAME = sampletest - - -# TARGETTYPE must be EXEC, ST_LIB or SH_LIB in upper case. - -TARGETTYPE = EXEC - -# install directory relative to the HOSTTARGET directory -HOSTRELEASE = binaries - -# install directory relative to the root filesystem -ROOTFSRELEASE = binaries - -# Folders in which gmake will run before building current target - -SUBMODULES = \ - -# Filename must not begin with '.', '/' or '\' - -SOURCES = \ -test_sample_proxy.c - - - -# Search path for include files - -INCLUDES = \ - $(PROJROOT)/omx_core/inc \ - $(PROJROOT)/mm_osal/inc \ - $(MEMMGRROOT) - -# Libraries needed for linking. - -ST_LIBS = -#omx_core omx_proxy_component domx mm_osal -SH_LIBS = pthread dl omx_core OMX.TI.DUCATI1.MISC.SAMPLE domx mm_osal timemmgr - - -# Search path for library (and linker command) files. -# Current folder and target folder are included by default. - -LIBINCLUDES = $(PROJROOT)/target/lib - - -# Do not change below "include" line(s) - -include $(PROJROOT)/make/build.mk - diff --git a/domx/test/sample_proxy/test_sample_proxy.c b/domx/test/sample_proxy/test_sample_proxy.c deleted file mode 100755 index 59830a9..0000000 --- a/domx/test/sample_proxy/test_sample_proxy.c +++ /dev/null @@ -1,1222 +0,0 @@ -/* - * Copyright (c) 2010, Texas Instruments Incorporated - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Texas Instruments Incorporated nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#define COMPONENT_NAME "OMX.TI.DUCATI1.MISC.SAMPLE" // needs to be specific for every configuration wrapper -#define OMX_SAMPLE_USEBUF OMX_TRUE - -/**************************************************************** -* INCLUDE FILES -****************************************************************/ -/* ----- system and platform files ----------------------------*/ -#include <stdint.h> -#include <string.h> -#include <stdlib.h> -#include <stdio.h> - - -/*-------program files ----------------------------------------*/ -#include <OMX_Core.h> -#include <OMX_Component.h> -#include "timm_osal_interfaces.h" - - -#define OMX_SAMPLE_TILER_TEST - -#ifdef OMX_SAMPLE_TILER_TEST - -#include "memmgr.h" - -#endif - - -#define OMX_SAMPLE_INPUT_PORT 0 -#define OMX_SAMPLE_OUTPUT_PORT 1 - -#ifdef OMX_SAMPLE_TILER_TEST - - -#define OMX_SAMPLE_IN_2DYHEIGHT 4 -#define OMX_SAMPLE_IN_2DYWIDTH 8 -#define OMX_SAMPLE_IN_2DUVHEIGHT 2 -#define OMX_SAMPLE_IN_2DUVWIDTH 4 -/* - #define STRIDE_8BIT (16 * 1024) - #define STRIDE_16BIT (32 * 1024) -*/ -#define OMX_SAMPLE_IN_HEIGHT 6 -#define OMX_SAMPLE_IN_WIDTH 8 - -#define STRIDE_LINUX (4 * 1024) - -#define OMX_SAMPLE_BUFFER_SIZE 48 - - -void Test_Util_Memcpy_1Dto2D(TIMM_OSAL_PTR pDst2D, TIMM_OSAL_PTR pSrc1D, - TIMM_OSAL_U32 nSize1D, TIMM_OSAL_U32 nHeight2D, TIMM_OSAL_U32 nWidth2D, - TIMM_OSAL_U32 nStride2D) -{ - TIMM_OSAL_U8 *pInBuffer; - TIMM_OSAL_U8 *pOutBuffer; - TIMM_OSAL_U32 nSizeLeft, i; - - nSizeLeft = nSize1D; - pInBuffer = (TIMM_OSAL_U8 *) pSrc1D; - pOutBuffer = (TIMM_OSAL_U8 *) pDst2D; - //The lower limit is copied. If nSize1D < H*W then 1Dsize is copied else H*W is copied - for (i = 0; i < nHeight2D; i++) - { - if (nSizeLeft >= nWidth2D) - { - TIMM_OSAL_Memcpy(pOutBuffer, pInBuffer, nWidth2D); - } else - { - TIMM_OSAL_Memcpy(pOutBuffer, pInBuffer, nSizeLeft); - break; - } - nSizeLeft -= nWidth2D; - pInBuffer = - (TIMM_OSAL_U8 *) ((TIMM_OSAL_U32) pInBuffer + nWidth2D); - pOutBuffer = - (TIMM_OSAL_U8 *) ((TIMM_OSAL_U32) pOutBuffer + nStride2D); - } -} - -#endif - - -/**************************************************************** -* EXTERNAL REFERENCES NOTE : only use if not found in header file -****************************************************************/ -/*--------data declarations -----------------------------------*/ -/*--------function prototypes ---------------------------------*/ - -/**************************************************************** -* PRIVATE DECLARATIONS Defined and used only here -****************************************************************/ -/*--------function declarations -------------------------------*/ - -/*--------data declarations -----------------------------------*/ -#define NUM_DOMAINS 0x4 -#define OMX_NOPORT 0xfffffffe - -//#define INPUT_FILE "../../omx/omx_il_1_x/omx_base/test/patterns/chikita.mp3" -#define INPUT_FILE "sample_input.mp3" -#define NON_TUN_OUTPUT_FILE "nt_output.mp3" - -static int gTest = 1; - -#define TIMM_OSAL_MallocaBuffer(_size, bContigous, nBlockAlignment) \ - TIMM_OSAL_Malloc (_size, TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_EXT) - -#define OMX_TEST_BUFFERS_OF_TRAFFIC 20 - -#define OMX_TEST_BAIL_IF_ERROR(_eError) \ - if(OMX_ErrorNone != (eError = _eError)){ \ - goto OMX_TEST_BAIL; \ - } - -#define OMX_TEST_SET_ERROR_BAIL(_eCode, _desc) \ -{ \ - eError = _eCode; \ - printf(_desc);\ - goto OMX_TEST_BAIL; \ -} - -#define OMX_TEST_INIT_STRUCT(_s_, _name_) \ - memset(&(_s_), 0x0, sizeof(_name_)); \ - (_s_).nSize = sizeof(_name_); \ - (_s_).nVersion.s.nVersionMajor = 0x1; \ - (_s_).nVersion.s.nVersionMinor = 0x1; \ - (_s_).nVersion.s.nRevision = 0x0; \ - (_s_).nVersion.s.nStep = 0x0 - -#define BUFFER_LIST_CLEAR_ENTRY(_pL, _pB)\ - _pB = _pL->pBufHdr; \ - _pL->pBufHdr = NULL; \ - _pL = _pL->pNextBuf; - -#define BUFFER_LIST_SET_ENTRY(_pL, _pB) \ -{ \ - BufferList *_pT = _pL; \ - while(_pT && _pT->pBufHdr){ \ - _pT = _pT->pNextBuf; \ - } \ - if(_pT) \ - _pT->pBufHdr = _pB; \ -} - -#define BUFFERLIST_CLEAR_ENTRY(_pL, _pB)\ - _pB = _pL->pBufHdr; \ - _pL->pBufHdr = NULL; \ - _pL = _pL->pNextBuf; - -typedef struct _BufferList BufferList; - -struct _BufferList -{ - OMX_BUFFERHEADERTYPE *pBufHdr; - OMX_BUFFERHEADERTYPE *pOrigBufHdr; - BufferList *pNextBuf; -}; - -typedef struct SampleCompTestCtxt -{ - OMX_HANDLETYPE hComp; - OMX_STATETYPE eState; - OMX_U32 nPorts; - OMX_HANDLETYPE hStateSetEvent; - OMX_HANDLETYPE hPortDisableEvent; - OMX_HANDLETYPE hPortEnableEvent; - OMX_STRING inFilePath; - OMX_STRING outFilePath; - FILE *pOutputFile; - FILE *pInputfile; - OMX_BOOL bEOS; - BufferList *pInBufferList; - BufferList *pOutBufferList; - OMX_BOOL bClientAllocBuf; - OMX_U32 nBufDoneCalls; - OMX_PORT_PARAM_TYPE sPortParam[NUM_DOMAINS]; -} SampleCompTestCtxt; - -//this test compiles only for ducati SYS -typedef struct TestCtxt -{ - OMX_HANDLETYPE hComp; - OMX_STATETYPE eState; - OMX_U32 nPorts; - OMX_HANDLETYPE hStateSetEvent; - OMX_HANDLETYPE hPortDisableEvent; - OMX_HANDLETYPE hPortEnableEvent; - OMX_STRING inFilePath; - OMX_STRING outFilePath; - FILE *pOutputFile; - FILE *pInputfile; - OMX_BOOL bEOS; - BufferList *pInBufferList; - BufferList *pOutBufferList; - OMX_BOOL bClientAllocBuf; - OMX_U32 nBufDoneCalls; - //OMX_PORT_PARAM_TYPE sPortParam[NUM_DOMAINS]; -} TestCtxt; - - -static OMX_U32 nInBufCount = 0; -static OMX_U32 nOutBufCount = 0; - - -//Semaphore_Handle EBDSem; -//Semaphore_Params EBDsemParams; - -//Semaphore_Handle FBDSem; -//Semaphore_Params FBDsemParams; -/*========================================================*/ -/* @ fn OMX_TEST_ErrorToString :: ERROR to STRING */ -/*========================================================*/ -OMX_STRING OMX_TEST_ErrorToString(OMX_ERRORTYPE eError) -{ - - OMX_STRING errorString; - - switch (eError) - { - - case OMX_ErrorNone: - errorString = "ErrorNone"; - break; - case OMX_ErrorInsufficientResources: - errorString = "ErrorInsufficientResources"; - break; - case OMX_ErrorUndefined: - errorString = "ErrorUndefined"; - break; - case OMX_ErrorInvalidComponentName: - errorString = "ErrorInvalidComponentName"; - break; - case OMX_ErrorComponentNotFound: - errorString = "ErrorComponentNotFound"; - break; - case OMX_ErrorInvalidComponent: - errorString = "ErrorInvalidComponent"; - break; - case OMX_ErrorBadParameter: - errorString = "ErrorBadParameter"; - break; - case OMX_ErrorNotImplemented: - errorString = "ErrorNotImplemented"; - break; - case OMX_ErrorUnderflow: - errorString = "ErrorUnderflow"; - break; - case OMX_ErrorOverflow: - errorString = "ErrorOverflow"; - break; - case OMX_ErrorHardware: - errorString = "ErrorHardware"; - break; - case OMX_ErrorInvalidState: - errorString = "ErrorInvalidState"; - break; - case OMX_ErrorStreamCorrupt: - errorString = "ErrorStreamCorrupt"; - break; - case OMX_ErrorPortsNotCompatible: - errorString = "ErrorPortsNotCompatible"; - break; - case OMX_ErrorResourcesLost: - errorString = "ErrorResourcesLost"; - break; - case OMX_ErrorNoMore: - errorString = "ErrorNoMore"; - break; - case OMX_ErrorVersionMismatch: - errorString = "ErrorVersionMismatch"; - break; - case OMX_ErrorNotReady: - errorString = "ErrorNotReady"; - break; - case OMX_ErrorTimeout: - errorString = "ErrorTimeout"; - break; - case OMX_ErrorSameState: - errorString = "ErrorSameState"; - break; - case OMX_ErrorResourcesPreempted: - errorString = "ErrorResourcesPreempted"; - break; - case OMX_ErrorPortUnresponsiveDuringAllocation: - errorString = "ErrorPortUnresponsiveDuringAllocation"; - break; - case OMX_ErrorPortUnresponsiveDuringDeallocation: - errorString = "ErrorPortUnresponsiveDuringDeallocation"; - break; - case OMX_ErrorPortUnresponsiveDuringStop: - errorString = "ErrorPortUnresponsiveDuringStop"; - break; - case OMX_ErrorIncorrectStateTransition: - errorString = "ErrorIncorrectStateTransition"; - break; - case OMX_ErrorIncorrectStateOperation: - errorString = "ErrorIncorrectStateOperation"; - break; - case OMX_ErrorUnsupportedSetting: - errorString = "ErrorUnsupportedSetting"; - break; - case OMX_ErrorUnsupportedIndex: - errorString = "ErrorUnsupportedIndex"; - break; - case OMX_ErrorBadPortIndex: - errorString = "ErrorBadPortIndex"; - break; - case OMX_ErrorPortUnpopulated: - errorString = "ErrorPortUnpopulated"; - break; - case OMX_ErrorComponentSuspended: - errorString = "ErrorComponentSuspended"; - break; - case OMX_ErrorDynamicResourcesUnavailable: - errorString = "ErrorDynamicResourcesUnavailable"; - break; - case OMX_ErrorMbErrorsInFrame: - errorString = "ErrorMbErrorsInFrame"; - break; - case OMX_ErrorFormatNotDetected: - errorString = "ErrorFormatNotDetected"; - break; - case OMX_ErrorContentPipeOpenFailed: - errorString = "ErrorContentPipeOpenFailed"; - break; - case OMX_ErrorContentPipeCreationFailed: - errorString = "ErrorContentPipeCreationFailed"; - break; - case OMX_ErrorSeperateTablesUsed: - errorString = "ErrorSeperateTablesUsed"; - break; - case OMX_ErrorTunnelingUnsupported: - errorString = "ErrorTunnelingUnsupported"; - break; - default: - errorString = "<unknown>"; - break; - } - return errorString; -} - -/*========================================================*/ -/* @ fn OMX_TEST_StateToString :: STATE to STRING */ -/*========================================================*/ -OMX_STRING OMX_TEST_StateToString(OMX_STATETYPE eState) -{ - OMX_STRING StateString; - - switch (eState) - { - case OMX_StateInvalid: - StateString = "Invalid"; - break; - case OMX_StateLoaded: - StateString = "Loaded"; - break; - case OMX_StateIdle: - StateString = "Idle"; - break; - case OMX_StateExecuting: - StateString = "Executing"; - break; - case OMX_StatePause: - StateString = "Pause"; - break; - case OMX_StateWaitForResources: - StateString = "WaitForResources "; - break; - default: - StateString = "<unknown>"; - break; - } - - return StateString; -} - -/* Application callback Functions */ -/*========================================================*/ -/* @ fn SampleTest_EventHandler :: Application callback */ -/*========================================================*/ -OMX_ERRORTYPE SampleTest_EventHandler(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_PTR pAppData, - OMX_IN OMX_EVENTTYPE eEvent, - OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2, OMX_IN OMX_PTR pEventData) -{ - SampleCompTestCtxt *pContext; - - printf("\n___________ ENTERED CLIENT CALLBACK:%s", __FUNCTION__); - - if (pAppData == NULL) - return OMX_ErrorNone; - - pContext = (SampleCompTestCtxt *) pAppData; - - switch (eEvent) - { - case OMX_EventCmdComplete: - printf("\n OMX_EventCmdComplete case: \n"); - if (OMX_CommandStateSet == nData1) - { - printf(" Component Transitioned to %s state \n", - OMX_TEST_StateToString((OMX_STATETYPE) nData2)); - pContext->eState = (OMX_STATETYPE) nData2; - TIMM_OSAL_SemaphoreRelease(pContext->hStateSetEvent); - } else if (OMX_CommandFlush == nData1) - { - /* Nothing to do over here */ - } else if (OMX_CommandPortDisable == nData1) - { - /* Nothing to do over here */ - TIMM_OSAL_SemaphoreRelease(pContext-> - hPortDisableEvent); - } else if (OMX_CommandPortEnable == nData1) - { - /* Nothing to do over here */ - } else if (OMX_CommandMarkBuffer == nData1) - { - /* Nothing to do over here */ - } - break; - - case OMX_EventError: - printf("\nOMX EVENT ERROR!!!!!! \n"); - break; - - case OMX_EventMark: - break; - - case OMX_EventPortSettingsChanged: - break; - - case OMX_EventBufferFlag: - break; - - case OMX_EventResourcesAcquired: - break; - - case OMX_EventComponentResumed: - break; - - case OMX_EventDynamicResourcesAvailable: - break; - - case OMX_EventPortFormatDetected: - break; - - default: - break; - } - - goto OMX_TEST_BAIL; - OMX_TEST_BAIL: - return OMX_ErrorNone; -} - -/*========================================================*/ -/* @ fn SampleTest_EmptyBufferDone :: Application callback */ -/*========================================================*/ -OMX_ERRORTYPE SampleTest_EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_PTR pAppData, OMX_IN OMX_BUFFERHEADERTYPE * pBuffer) -{ - SampleCompTestCtxt *pContext; - - printf("\n___________ ENTERED CLIENT CALLBACK:%s", __FUNCTION__); - - if (pAppData == NULL) - return OMX_ErrorNone; - - pContext = (SampleCompTestCtxt *) pAppData; - pContext->nBufDoneCalls++; - - BUFFER_LIST_SET_ENTRY(pContext->pInBufferList, pBuffer); - //Semaphore_post(EBDSem); - - goto OMX_TEST_BAIL; - OMX_TEST_BAIL: - printf("\nEBD done\n"); - return OMX_ErrorNone; -} - -/*========================================================*/ -/* @ fn SampleTest_FillBufferDone :: Application callback */ -/*========================================================*/ -OMX_ERRORTYPE SampleTest_FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_PTR pAppData, OMX_IN OMX_BUFFERHEADERTYPE * pBuffHeader) -{ - SampleCompTestCtxt *pContext; - - printf("\n___________ ENTERED CLIENT CALLBACK:%s", __FUNCTION__); - - if (pAppData == NULL) - return OMX_ErrorNone; - - pContext = (SampleCompTestCtxt *) pAppData; - pContext->nBufDoneCalls++; - - if (pContext->pOutputFile && gTest) - { - printf(" writing to output file :: buffer cnt : %d\n", - nOutBufCount); - nOutBufCount++; - fwrite(pBuffHeader->pBuffer, 1, pBuffHeader->nFilledLen, - pContext->pOutputFile); - } - - BUFFER_LIST_SET_ENTRY(pContext->pOutBufferList, pBuffHeader); - //Semaphore_post(FBDSem); - - goto OMX_TEST_BAIL; - OMX_TEST_BAIL: - printf("\nFBD done\n"); - return OMX_ErrorNone; -} - - -static void SampleTest_ReadInputFile(SampleCompTestCtxt * pContext, - OMX_PTR pData, OMX_U32 nBytes, FILE * fp) -{ - OMX_U32 nReadSize = 0; - - printf("\nIn read i/p file\n"); - if (pData == NULL) - printf("\npData is NULL\n"); - else - printf("\npData = %x\n", pData); - printf("\nnBytes = %d\n", nBytes); - if (fp == NULL) - printf("\nfp is NULL\n"); - else - printf("\nfp = %x\n", fp); - nReadSize = fread(pData, 1, nBytes, fp); - if (nReadSize != nBytes) - { - pContext->bEOS = OMX_TRUE; - } - - printf(" Reading from file :: Buffer cont : %d \n", nInBufCount); - nInBufCount++; -} - -/*========================================================*/ -/* @ fn SampleTest_WriteInBuffers :: Reads a buffer from a file and send to Comp */ -/*========================================================*/ -OMX_ERRORTYPE SampleTest_WriteInBuffers(SampleCompTestCtxt * pContext) -{ - - OMX_ERRORTYPE eError = OMX_ErrorNone; - BufferList *pList; - OMX_BUFFERHEADERTYPE *pBufHeader; -#ifdef OMX_SAMPLE_TILER_TEST - OMX_U8 *pTmpBuffer = NULL, *pOrigTmpBuffer = NULL; -#endif - pList = pContext->pInBufferList; - while (pList && pList->pBufHdr) - { - BUFFERLIST_CLEAR_ENTRY(pList, pBufHeader); - printf("\nAbout to read from input file\n"); -#if defined(OMX_SAMPLE_TILER_TEST) - - //OMX_SAMPLE_BUFFER_SIZE is the total amt of data to be sent in the buffer - pTmpBuffer = - TIMM_OSAL_Malloc(OMX_SAMPLE_BUFFER_SIZE, 0, 0, 0); - if (pTmpBuffer == NULL) - OMX_TEST_SET_ERROR_BAIL - (OMX_ErrorInsufficientResources, - "malloc failed \n"); - pOrigTmpBuffer = pTmpBuffer; - - SampleTest_ReadInputFile(pContext, pTmpBuffer, - OMX_SAMPLE_BUFFER_SIZE, pContext->pInputfile); - - Test_Util_Memcpy_1Dto2D(pBufHeader->pBuffer, pTmpBuffer, - OMX_SAMPLE_BUFFER_SIZE, OMX_SAMPLE_IN_HEIGHT, - OMX_SAMPLE_IN_WIDTH, STRIDE_LINUX); - pBufHeader->nFilledLen = OMX_SAMPLE_BUFFER_SIZE; - - printf("\nBefore ETB pBufHeader->nInputPortIndex = %d\n", - pBufHeader->nInputPortIndex); - - TIMM_OSAL_Free(pOrigTmpBuffer); - -#else - SampleTest_ReadInputFile(pContext, pBufHeader->pBuffer, - pBufHeader->nAllocLen, pContext->pInputfile); - pBufHeader->nFilledLen = pBufHeader->nAllocLen; - -#endif - if (pContext->bEOS == OMX_TRUE) - { - pBufHeader->nFlags |= OMX_BUFFERFLAG_EOS; - } - - eError = OMX_EmptyThisBuffer(pContext->hComp, pBufHeader); - - OMX_TEST_BAIL_IF_ERROR(eError); - } - - OMX_TEST_BAIL: - return eError; - -} - -/*========================================================*/ -/* @ fn SampleTest_ReadOutBuffers :: Send out buffers */ -/*========================================================*/ - -OMX_ERRORTYPE SampleTest_ReadOutBuffers(SampleCompTestCtxt * pContext) -{ - - OMX_ERRORTYPE eError = OMX_ErrorNone; - BufferList *pList; - OMX_BUFFERHEADERTYPE *pBufHeader; - - pList = pContext->pOutBufferList; - while (pList && pList->pBufHdr) - { - printf("\nAbout to do FTB\n"); - - BUFFERLIST_CLEAR_ENTRY(pList, pBufHeader); - - eError = OMX_FillThisBuffer(pContext->hComp, pBufHeader); - - OMX_TEST_BAIL_IF_ERROR(eError); - if (pBufHeader->nFlags == OMX_BUFFERFLAG_EOS) - { - pContext->nBufDoneCalls = OMX_TEST_BUFFERS_OF_TRAFFIC; - } - } - - OMX_TEST_BAIL: - return eError; - -} - - - -/*========================================================*/ -/* @ fn SampleTest_AllocateBuffers :: Allocates the Resources on the available ports */ -/*========================================================*/ -OMX_ERRORTYPE SampleTest_AllocateBuffers(SampleCompTestCtxt * pContext, - OMX_PARAM_PORTDEFINITIONTYPE * pPortDef) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_U8 *pBuffer = NULL; - BufferList *pBufferList; - BufferList *pTemp; - OMX_BUFFERHEADERTYPE *pBufferHdr; - OMX_U32 i = 100; - OMX_COMPONENTTYPE *pComp; - -#ifdef OMX_SAMPLE_TILER_TEST - MemAllocBlock *pBlock = NULL; - OMX_U32 nNumBlocks = 1; - -/*For i/p port allocate 2D packed buffer, for o/p port allocate 1D buffer. -Ideally client should get this from GetParams but this is just a sample test so -values are hardcoded*/ - - if (pPortDef->nPortIndex == OMX_SAMPLE_INPUT_PORT) - { - nNumBlocks = 2; - pBlock = - TIMM_OSAL_Malloc(sizeof(MemAllocBlock) * nNumBlocks, 0, 0, - 0); - TIMM_OSAL_Memset(pBlock, 0, sizeof(MemAllocBlock) * nNumBlocks); - pBlock[0].dim.area.width = OMX_SAMPLE_IN_2DYWIDTH; - pBlock[0].dim.area.height = OMX_SAMPLE_IN_2DYHEIGHT; - pBlock[0].pixelFormat = PIXEL_FMT_8BIT; - pBlock[1].dim.area.width = OMX_SAMPLE_IN_2DUVWIDTH; - pBlock[1].dim.area.height = OMX_SAMPLE_IN_2DUVHEIGHT; - pBlock[1].pixelFormat = PIXEL_FMT_16BIT; - } else - { - nNumBlocks = 1; - pBlock = - TIMM_OSAL_Malloc(sizeof(MemAllocBlock) * nNumBlocks, 0, 0, - 0); - TIMM_OSAL_Memset(pBlock, 0, sizeof(MemAllocBlock) * nNumBlocks); - pBlock[0].dim.len = OMX_SAMPLE_BUFFER_SIZE; - pBlock[0].pixelFormat = PIXEL_FMT_PAGE; - } -#endif - - for (i = 0; i < pPortDef->nBufferCountActual; i++) - { - pBufferList = - (BufferList *) TIMM_OSAL_Malloc(sizeof(BufferList), - TIMM_OSAL_TRUE, 0, TIMMOSAL_MEM_SEGMENT_INT); - if (!pBufferList) - { - OMX_TEST_SET_ERROR_BAIL - (OMX_ErrorInsufficientResources, - "malloc failed \n"); - } - - if (pContext->bClientAllocBuf) - { - -#ifdef OMX_SAMPLE_TILER_TEST -/*For i/p port allocate 2D packed buffer, for o/p port allocate 1D buffer. -Ideally client should get this from GetParams but this is just a sample test so -values are hardcoded*/ - pBuffer = MemMgr_Alloc(pBlock, nNumBlocks); - printf("\nMemMgr allocated buffer = 0x%x\n", pBuffer); -#else - pBuffer = - (OMX_U8 *) TIMM_OSAL_MallocaBuffer(pPortDef-> - nBufferSize, pPortDef->bBuffersContiguous, - pPortDef->nBufferAlignment); - -#endif - - if (!pBufferList) - { - OMX_TEST_SET_ERROR_BAIL - (OMX_ErrorInsufficientResources, - "malloc failed \n"); - } - - printf("\nCalling UseBuf on port %d\n", - pPortDef->nPortIndex); - eError = - OMX_UseBuffer(pContext->hComp, &pBufferHdr, - pPortDef->nPortIndex, 0, pPortDef->nBufferSize, - pBuffer); - - OMX_TEST_BAIL_IF_ERROR(eError); - - } else - { - - pComp = (OMX_COMPONENTTYPE *) pContext->hComp; - printf("\nCalling allocate buffer\n"); - eError = - OMX_AllocateBuffer(pContext->hComp, &pBufferHdr, - pPortDef->nPortIndex, 0, pPortDef->nBufferSize); - - OMX_TEST_BAIL_IF_ERROR(eError); - } - printf("\npBufferHdr->nOutputPortIndex = %d\n", - pBufferHdr->nOutputPortIndex); - printf("\npBufferHdr->nInputPortIndex = %d\n", - pBufferHdr->nInputPortIndex); - pBufferList->pNextBuf = NULL; - pBufferList->pBufHdr = pBufferHdr; - pBufferList->pOrigBufHdr = pBufferHdr; - - if (pPortDef->eDir == OMX_DirInput) - { - printf("\npBufferHdr->nOutputPortIndex = %d\n", - pBufferHdr->nOutputPortIndex); - printf("\npBufferHdr->nInputPortIndex = %d\n", - pBufferHdr->nInputPortIndex); - pBufferHdr->nOutputPortIndex = OMX_NOPORT; - if (pContext->pInBufferList == NULL) - { - pContext->pInBufferList = pBufferList; - } else - { - pTemp = pContext->pInBufferList; - while (pTemp->pNextBuf) - pTemp = pTemp->pNextBuf; - pTemp->pNextBuf = pBufferList; - } - } else - { - pBufferHdr->nInputPortIndex = OMX_NOPORT; - printf("\npBufferHdr->nOutputPortIndex = %d\n", - pBufferHdr->nOutputPortIndex); - printf("\npBufferHdr->nInputPortIndex = %d\n", - pBufferHdr->nInputPortIndex); - if (pContext->pOutBufferList == NULL) - { - pContext->pOutBufferList = pBufferList; - } else - { - pTemp = pContext->pOutBufferList; - while (pTemp->pNextBuf) - pTemp = pTemp->pNextBuf; - pTemp->pNextBuf = pBufferList; - } - } - } - - OMX_TEST_BAIL: -#ifdef OMX_SAMPLE_TILER_TEST - if (pBlock != NULL) - TIMM_OSAL_Free(pBlock); -#endif - if (eError != OMX_ErrorNone) - { - if (pBufferList) - { - TIMM_OSAL_Free(pBufferList); - } - } - - return eError; -} - -/*========================================================*/ -/* @ fn SampleTest_DeInitBuffers :: Destroy the resources */ -/*========================================================*/ -OMX_ERRORTYPE SampleTest_DeInitBuffers(SampleCompTestCtxt * pContext) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_U8 *pBuffer; - BufferList *pBufferList; - BufferList *pTemp; - - OMX_U32 nRetVal = 0; - - pTemp = pContext->pInBufferList; - - while (pTemp) - { - pBufferList = (BufferList *) pTemp; - pBuffer = (OMX_U8 *) pTemp->pOrigBufHdr->pBuffer; - - printf("\nCalling Free Buffer on port no. %d\n", - pTemp->pOrigBufHdr->nInputPortIndex); - - eError = - OMX_FreeBuffer(pContext->hComp, - pTemp->pOrigBufHdr->nInputPortIndex, pTemp->pOrigBufHdr); - OMX_TEST_BAIL_IF_ERROR(eError); - - if (pContext->bClientAllocBuf) - { - -#ifdef OMX_SAMPLE_TILER_TEST - nRetVal = MemMgr_Free(pBuffer); - if (nRetVal) - { - printf("\nError in MemMgr free\n"); - } -#else - TIMM_OSAL_Free(pBuffer); -#endif - } - - pTemp = pTemp->pNextBuf; - if (pBufferList) - TIMM_OSAL_Free(pBufferList); - } - - pContext->pInBufferList = NULL; - - pTemp = pContext->pOutBufferList; - while (pTemp) - { - pBufferList = (BufferList *) pTemp; - pBuffer = (OMX_U8 *) pTemp->pOrigBufHdr->pBuffer; - printf("\nCalling Free Buffer on port no. %d\n", - pTemp->pOrigBufHdr->nOutputPortIndex); - - eError = - OMX_FreeBuffer(pContext->hComp, - pTemp->pOrigBufHdr->nOutputPortIndex, pTemp->pOrigBufHdr); - OMX_TEST_BAIL_IF_ERROR(eError); - if (pContext->bClientAllocBuf) - { -#ifdef OMX_SAMPLE_TILER_TEST - nRetVal = MemMgr_Free(pBuffer); - if (nRetVal) - { - printf("\nError in MemMgr free\n"); - } -#else - TIMM_OSAL_Free(pBuffer); -#endif - } - - pTemp = pTemp->pNextBuf; - if (pBufferList) - TIMM_OSAL_Free(pBufferList); - - } - - pContext->pOutBufferList = NULL; - - OMX_TEST_BAIL: - return eError; -} - -/*========================================================*/ -/* @ fn SampleTest_TransitionWait :: Waits for the transition to be completed , - * incase of loaded to idle Allocates the Resources and while idle to loaded - * destroys the resources */ -/*========================================================*/ -OMX_ERRORTYPE SampleTest_TransitionWait(OMX_STATETYPE eToState, - SampleCompTestCtxt * pContext) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_PARAM_PORTDEFINITIONTYPE tPortDef; - OMX_U32 i, j; - - eError = OMX_SendCommand(pContext->hComp, OMX_CommandStateSet, - eToState, NULL); - OMX_TEST_BAIL_IF_ERROR(eError); - - if ((eToState == OMX_StateIdle) && - (pContext->eState == OMX_StateLoaded)) - { - for (i = 0; i < NUM_DOMAINS; i++) - { - for (j = pContext->sPortParam[i].nStartPortNumber; - j < pContext->sPortParam[i].nStartPortNumber - + pContext->sPortParam[i].nPorts; j++) - { - - OMX_TEST_INIT_STRUCT(tPortDef, - OMX_PARAM_PORTDEFINITIONTYPE); - tPortDef.nPortIndex = j; -//printf("\nCalling GetParam before UseBuf on port %d\n",j); - eError = OMX_GetParameter(pContext->hComp, - OMX_IndexParamPortDefinition, - (OMX_PTR) & tPortDef); - OMX_TEST_BAIL_IF_ERROR(eError); - -// if(tPortDef.bEnabled)//AD - eError = - SampleTest_AllocateBuffers(pContext, - &tPortDef); - - OMX_TEST_BAIL_IF_ERROR(eError); - } - } - } else if ((eToState == OMX_StateLoaded) && - (pContext->eState == OMX_StateIdle)) - { - - eError = SampleTest_DeInitBuffers(pContext); - OMX_TEST_BAIL_IF_ERROR(eError); - - } - printf("\nWaiting for state set event\n"); - TIMM_OSAL_SemaphoreObtain(pContext->hStateSetEvent, - TIMM_OSAL_SUSPEND); - printf("\nState set event recd.\n"); - - if (pContext->eState != eToState) - OMX_TEST_SET_ERROR_BAIL(OMX_ErrorUndefined, - " InComplete Transition \n"); - - OMX_TEST_BAIL: - return eError; -} - - -/*========================================================*/ -/* @ fn OMX_Sample_UT0001 :: Initializes, move to Idle and then to executing, process -* buffers and then destroy the component by moving back to idle, loaded, invalid */ -/*========================================================*/ -void main(void) -{ - OMX_ERRORTYPE eError = OMX_ErrorNone; - OMX_HANDLETYPE hComp = NULL; - OMX_CALLBACKTYPE oCallbacks; - SampleCompTestCtxt *pContext; - SampleCompTestCtxt oAppData; - - int ch1, ch2; - int pass; - int while_pass = 0, loc_diff = 0; - - - pContext = &oAppData; - printf(" Entering : %s \n", __FUNCTION__); - memset(pContext, 0x0, sizeof(SampleCompTestCtxt)); - - oCallbacks.EventHandler = SampleTest_EventHandler; - oCallbacks.EmptyBufferDone = SampleTest_EmptyBufferDone; - oCallbacks.FillBufferDone = SampleTest_FillBufferDone; - printf("\nCalling sem create\n"); - /* Initialize Events to Track callbacks */ - TIMM_OSAL_SemaphoreCreate(&pContext->hStateSetEvent, 0); - TIMM_OSAL_SemaphoreCreate(&pContext->hPortDisableEvent, 0); - //TIMM_OSAL_MutexObtain(pContext->hStateSetEvent, TIMM_OSAL_SUSPEND); - printf("\nSem created\n"); - - - pContext->pInputfile = fopen(INPUT_FILE, "rb"); - if (NULL == pContext->pInputfile) - { - eError = OMX_ErrorInsufficientResources; - //goto OMX_TEST_BAIL; - } - printf("\nInput file opened\n"); - pContext->pOutputFile = fopen(NON_TUN_OUTPUT_FILE, "wb"); - if (NULL == pContext->pOutputFile) - { - eError = OMX_ErrorInsufficientResources; - //goto OMX_TEST_BAIL; - } - - - /* Initialize OpenMAX */ - printf("\nInitialize OpenMAX\n"); - eError = OMX_Init(); - OMX_TEST_BAIL_IF_ERROR(eError); - /* Load a component */ - printf("\nLoad a component\n"); - eError = - OMX_GetHandle(&hComp, (OMX_STRING) "OMX.TI.DUCATI1.MISC.SAMPLE", - pContext, &oCallbacks); - OMX_TEST_BAIL_IF_ERROR(eError); - pContext->hComp = hComp; -printf ("\neError = 0x%x\n", eError); -if(hComp) - printf("\nhComp = 0x%x\n", hComp); - /* Verify that the component is in Loaded state */ - printf("\nVerify that the component is in Loaded state\n"); - - eError = OMX_GetState(pContext->hComp, &pContext->eState); - OMX_TEST_BAIL_IF_ERROR(eError); - if (OMX_StateLoaded != pContext->eState) - { - OMX_TEST_SET_ERROR_BAIL(OMX_ErrorUndefined, - "not in loaded state \n"); - } - - /* detect all Audio ports on the component */ - OMX_TEST_INIT_STRUCT(pContext->sPortParam[0], OMX_PORT_PARAM_TYPE); - eError = OMX_GetParameter(hComp, OMX_IndexParamAudioInit, - (OMX_PTR) & pContext->sPortParam[0]); - OMX_TEST_BAIL_IF_ERROR(eError); - - /* detect all video ports on the component */ - OMX_TEST_INIT_STRUCT(pContext->sPortParam[1], OMX_PORT_PARAM_TYPE); - eError = OMX_GetParameter(hComp, OMX_IndexParamVideoInit, - (OMX_PTR) & pContext->sPortParam[1]); - OMX_TEST_BAIL_IF_ERROR(eError); - - /* detect all image ports on the component */ - OMX_TEST_INIT_STRUCT(pContext->sPortParam[2], OMX_PORT_PARAM_TYPE); - eError = OMX_GetParameter(hComp, OMX_IndexParamImageInit, - (OMX_PTR) & pContext->sPortParam[2]); - OMX_TEST_BAIL_IF_ERROR(eError); - - /* detect all other ports on the component */ - OMX_TEST_INIT_STRUCT(pContext->sPortParam[3], OMX_PORT_PARAM_TYPE); - eError = OMX_GetParameter(hComp, OMX_IndexParamOtherInit, - (OMX_PTR) & pContext->sPortParam[3]); - OMX_TEST_BAIL_IF_ERROR(eError); - - pContext->nPorts = pContext->sPortParam[0].nPorts + - pContext->sPortParam[1].nPorts + - pContext->sPortParam[2].nPorts + pContext->sPortParam[3].nPorts; - - - pContext->bClientAllocBuf = OMX_SAMPLE_USEBUF; - if (pContext->bClientAllocBuf == OMX_TRUE) - { - printf(" Client does Allocation of buffers \n"); - } else - { - printf(" Component does Allocation of buffers \n"); - } - - /* Transition to Idle state */ - - eError = SampleTest_TransitionWait(OMX_StateIdle, pContext); - OMX_TEST_BAIL_IF_ERROR(eError); - /* Transition to Executing state */ - eError = SampleTest_TransitionWait(OMX_StateExecuting, pContext); - OMX_TEST_BAIL_IF_ERROR(eError); - printf("\nAbout to start processing buffers\n"); - - - /* process buffers */ - - while (pContext->nBufDoneCalls < OMX_TEST_BUFFERS_OF_TRAFFIC) - { - - eError = SampleTest_WriteInBuffers(pContext); - OMX_TEST_BAIL_IF_ERROR(eError); - - eError = SampleTest_ReadOutBuffers(pContext); - OMX_TEST_BAIL_IF_ERROR(eError); - while_pass++; - //printf("\n WHILE PROCESS LOOP COUNT: BufDoneCount = %d %d", - // while_pass, pContext->nBufDoneCalls); - - //printf("\n Waiting on Sample component to respond"); - - } - - - gTest = 0; - - /* Transition back to Idle state */ - eError = SampleTest_TransitionWait(OMX_StateIdle, pContext); - OMX_TEST_BAIL_IF_ERROR(eError); - - /* Trasnition back to Loaded state */ - eError = SampleTest_TransitionWait(OMX_StateLoaded, pContext); - OMX_TEST_BAIL_IF_ERROR(eError); - - - OMX_TEST_BAIL: - - fclose(pContext->pInputfile); - fclose(pContext->pOutputFile); - - if (eError == OMX_ErrorNone) - { - eError = OMX_FreeHandle(pContext->hComp); - eError = OMX_Deinit(); - } else - { - SampleTest_TransitionWait(OMX_StateInvalid, pContext); - SampleTest_DeInitBuffers(pContext); - - OMX_FreeHandle(pContext->hComp); - OMX_Deinit(); - } - - TIMM_OSAL_SemaphoreDelete(pContext->hStateSetEvent); - TIMM_OSAL_SemaphoreDelete(pContext->hPortDisableEvent); - - /* emit the Test Result */ - if (OMX_ErrorNone != eError) - { - printf(" TestCase Failed and returned an error:: %s \n", - OMX_TEST_ErrorToString(eError)); - } else - { - printf - ("\nTest case has ended, now comparing input and output files\n"); - pContext->pInputfile = fopen(INPUT_FILE, "rb"); - if (NULL == pContext->pInputfile) - { - printf("\n Error in opening INPUT_FILE"); - eError = OMX_ErrorInsufficientResources; - } - - pContext->pOutputFile = fopen(NON_TUN_OUTPUT_FILE, "rb"); - if (NULL == pContext->pOutputFile) - { - printf("\n Error in opening NON_TUN_OUTPUT_FILE"); - eError = OMX_ErrorInsufficientResources; - } - pass = 1; - while (1) - { - if (eError != OMX_ErrorNone) - { - pass = 0; - break; - } - ch1 = fgetc(pContext->pInputfile); - ch2 = fgetc(pContext->pOutputFile); - loc_diff++; - if (ch1 == EOF || ch2 == EOF) - { - break; - } - if (ch1 != ch2) - { - pass = 0; - printf("\n \n"); - printf - ("\n FILE SIZE = 320 KB - NUMBER OF ITERATIONS = 20 (10 for INPUT AND 10 FOR OUTPUT buffers\n"); - printf - ("\n ################### LOCATION OF DIFFERENCE: %d ################### \n", - loc_diff); - break; - } - } - fclose(pContext->pInputfile); - fclose(pContext->pOutputFile); - if (pass == 1) - printf(" Test Case has Passed\n"); - else - { - printf("\nTest case has failed. (EOF not reached)\n"); - eError = OMX_ErrorUndefined; - } - } - - if (eError == OMX_ErrorNone) - { - printf(" Test Case has Passed :) \n"); - } else - { - printf("\nTest case has failed.(OMX Error)\n"); - } -} - |