diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2009-07-29 17:23:50 -0700 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2009-07-30 14:38:43 -0700 |
| commit | b44cdb1b44b144d09e8ec950d1e8e4c280064056 (patch) | |
| tree | 74c611897d728c5d73ad2479ef1ab123654721fc /omx/ti_omx_config_parser | |
| parent | 3410a0df3ef3d3f8254eea6430d999f631191e9f (diff) | |
| download | omap3-b44cdb1b44b144d09e8ec950d1e8e4c280064056.tar.gz | |
New version of ti OMX code to support ti mm release 25.9
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Diffstat (limited to 'omx/ti_omx_config_parser')
| -rw-r--r-- | omx/ti_omx_config_parser/Android.mk | 14 | ||||
| -rw-r--r-- | omx/ti_omx_config_parser/inc/ti_m4v_config_parser.h | 42 | ||||
| -rw-r--r-- | omx/ti_omx_config_parser/inc/ti_video_config_parser.h | 2 | ||||
| -rw-r--r-- | omx/ti_omx_config_parser/src/ti_omx_config_parser.cpp | 2 |
4 files changed, 30 insertions, 30 deletions
diff --git a/omx/ti_omx_config_parser/Android.mk b/omx/ti_omx_config_parser/Android.mk index c0e642e..5c8ace8 100644 --- a/omx/ti_omx_config_parser/Android.mk +++ b/omx/ti_omx_config_parser/Android.mk @@ -29,10 +29,10 @@ PV_INCLUDES := \ $(PV_TOP)/android/drm/oma1/src \ $(PV_TOP)/build_config/opencore_dynamic \ $(PV_TOP)/codecs_v2/omx/omx_common/src \ - $(PV_TOP)/codecs_v2/omx/omx_common/include \ - $(PV_TOP)/extern_libs_v2/khronos/openmax/include \ - $(PV_TOP)/pvmi/pvmf/include \ - $(PV_TOP)/oscl/oscl/osclutil/src \ + $(PV_TOP)/codecs_v2/omx/omx_common/include \ + $(PV_TOP)/extern_libs_v2/khronos/openmax/include \ + $(PV_TOP)/pvmi/pvmf/include \ + $(PV_TOP)/oscl/oscl/osclutil/src \ $(TARGET_OUT_HEADERS)/$(PV_COPY_HEADERS_TO) LOCAL_CFLAGS := $(PV_CFLAGS) @@ -40,9 +40,9 @@ LOCAL_CFLAGS := $(PV_CFLAGS) LOCAL_ARM_MODE := arm LOCAL_COPY_HEADERS := \ - inc/ti_video_config_parser.h \ - inc/ti_m4v_config_parser.h \ - inc/ti_omx_config_parser.h + inc/ti_video_config_parser.h \ + inc/ti_m4v_config_parser.h \ + inc/ti_omx_config_parser.h LOCAL_C_INCLUDES := \ $(PV_INCLUDES) diff --git a/omx/ti_omx_config_parser/inc/ti_m4v_config_parser.h b/omx/ti_omx_config_parser/inc/ti_m4v_config_parser.h index ee979e4..2aac976 100644 --- a/omx/ti_omx_config_parser/inc/ti_m4v_config_parser.h +++ b/omx/ti_omx_config_parser/inc/ti_m4v_config_parser.h @@ -80,36 +80,36 @@ int16 ByteAlign( ); OSCL_IMPORT_REF int16 iDecodeVOLHeader( - mp4StreamType *psBits, - int32 *width, - int32 *height, - int32 *, - int32 *, + mp4StreamType *psBits, + int32 *width, + int32 *height, + int32 *, + int32 *, int32 *profilelevel); OSCL_IMPORT_REF int16 iGetM4VConfigInfo( - uint8 *buffer, - int32 length, - int32 *width, - int32 *height, - int32 *, + uint8 *buffer, + int32 length, + int32 *width, + int32 *height, + int32 *, int32 *); int16 DecodeUserData(mp4StreamType *pStream); OSCL_IMPORT_REF int16 iDecodeShortHeader( - mp4StreamType *psBits, - int32 *width, - int32 *height, - int32 *, + mp4StreamType *psBits, + int32 *width, + int32 *height, + int32 *, int32 *); OSCL_IMPORT_REF int16 iGetAVCConfigInfo( - uint8 *buffer, - int32 length, - int32 *width, - int32 *height, - int32 *, - int32 *, - int32 *profile, + uint8 *buffer, + int32 length, + int32 *width, + int32 *height, + int32 *, + int32 *, + int32 *profile, int32 *level); int32 FindNAL(uint8** nal_pnt, uint8* buffer, int32 length); diff --git a/omx/ti_omx_config_parser/inc/ti_video_config_parser.h b/omx/ti_omx_config_parser/inc/ti_video_config_parser.h index 5b226e4..d9455f4 100644 --- a/omx/ti_omx_config_parser/inc/ti_video_config_parser.h +++ b/omx/ti_omx_config_parser/inc/ti_video_config_parser.h @@ -38,7 +38,7 @@ typedef struct _tiVideoConfigParserOutputs } tiVideoConfigParserOutputs; OSCL_IMPORT_REF int16 ti_video_config_parser( - tiVideoConfigParserInputs *aInputs, + tiVideoConfigParserInputs *aInputs, tiVideoConfigParserOutputs *aOutputs); #endif //TI_VIDEO_CONFIG_PARSER_H_INCLUDED diff --git a/omx/ti_omx_config_parser/src/ti_omx_config_parser.cpp b/omx/ti_omx_config_parser/src/ti_omx_config_parser.cpp index 1b4a6a3..5dd5717 100644 --- a/omx/ti_omx_config_parser/src/ti_omx_config_parser.cpp +++ b/omx/ti_omx_config_parser/src/ti_omx_config_parser.cpp @@ -149,7 +149,7 @@ OSCL_EXPORT_REF OMX_BOOL TIOMXConfigParser( { return OMX_FALSE; } - + if (0 == oscl_strcmp(pInputs->cComponentRole, (OMX_STRING)"video_decoder.mpeg4")) { Status = ti_video_config_parser((tiVideoConfigParserInputs *)&aInputs, (tiVideoConfigParserOutputs *)aOutputParameters); |