From 0a389ab70db304fb840e33f33781ecc0503eae3c Mon Sep 17 00:00:00 2001 From: hongteng Date: Fri, 22 Apr 2011 13:48:46 -0700 Subject: Fix for issue 3385135 "source code cleanup" engine part - Removed below unused functions a. M4PTO3GPP_RegisterExternalVideoEncoder b. M4VSS3GPP_editRegisterExternalVideoDecoder c. M4VSS3GPP_editRegisterExternalVideoEncoder d. M4VSS3GPP_extractPictureRegisterExternalVideoDecoder e. M4VSS3GPP_editRegisterExternalCodec f. M4VSS3GPP_editSubscribeExternalCodecs g. M4VSS3GPP_intSubscribeExternalCodecs h. M4VSS3GPP_intClipRegisterExternalVideoDecoder i. M4xVSS_RegisterExternalVideoDecoder j. M4xVSS_RegisterExternalVideoEncoder k. M4MCS_registerExternalVideoDecoder l. M4MCS_registerExternalVideoEncoder m. M4MCS_registerExternalAudioDecoder n. M4MCS_registerExternalAudioEncoder o. M4DECODER_EXTERNAL_getInterface - Also remove small code associated with these functions and Remove below unsused src + header files a. M4CLOCK.h b. M4MDP_API.h c. M4VD_EXTERNAL_Internal.h d. M4VD_HW_API.h e. M4VE_API.h f. M4_Logo.h g. M4VD_EXTERNAL_Interface.c h. LV_Types.h i. M4OSA_FileAccess.h j. M4OSA_FileCache.h k. M4OSA_FileExtra.h l. M4OSA_FileReaderRam.h m. M4OSA_FileWriterRam.h n. M4OSA_String.h o. M4OSA_String_priv.h p. M4OSA_FileCache.c q. M4OSA_FileExtra.c r. M4OSA_FileReader_RAM.c s. M4OSA_FileWriter_RAM.c t. M4OSA_String.c u. M4OSA_String_priv.c Change-Id: I7271cbe92168e665a8e5b7afe7c7fe1c331eaa1e --- libvideoeditor/vss/src/M4VSS3GPP_Clip.c | 81 --------------------------------- 1 file changed, 81 deletions(-) (limited to 'libvideoeditor/vss/src/M4VSS3GPP_Clip.c') diff --git a/libvideoeditor/vss/src/M4VSS3GPP_Clip.c b/libvideoeditor/vss/src/M4VSS3GPP_Clip.c index 6311cd6..d9b6eb5 100755 --- a/libvideoeditor/vss/src/M4VSS3GPP_Clip.c +++ b/libvideoeditor/vss/src/M4VSS3GPP_Clip.c @@ -1817,87 +1817,6 @@ M4OSA_ERR M4VSS3GPP_intClipCleanUp( M4VSS3GPP_ClipContext *pClipCtxt ) return err; } -#ifdef M4VSS_ENABLE_EXTERNAL_DECODERS - -M4OSA_ERR -M4VSS3GPP_intClipRegisterExternalVideoDecoder( M4VSS3GPP_ClipContext *pClipCtxt, - M4VD_VideoType decoderType, - M4VD_Interface *pDecoderInterface, - M4OSA_Void *pUserData ) -{ - M4OSA_ERR err = M4NO_ERROR; - M4DECODER_VideoInterface *shellInterface; - M4DECODER_VideoType nativeType; - M4DECODER_EXTERNAL_UserDataType shellUserData; - - switch( decoderType ) - { - case M4VD_kMpeg4VideoDec: - case M4VD_kH263VideoDec: - nativeType = M4DECODER_kVideoTypeMPEG4; - break; - - case M4VD_kH264VideoDec: - nativeType = M4DECODER_kVideoTypeAVC; - break; - - default: - M4OSA_TRACE1_1( - "M4VSS3GPP_intClipRegisterExternalVideoDecoder: unknown decoderType %d", - decoderType); - return M4ERR_PARAMETER; - break; - } - - shellUserData = - (M4DECODER_EXTERNAL_UserDataType)M4OSA_32bitAlignedMalloc(sizeof(*shellUserData), - M4VSS3GPP, (M4OSA_Char *)"userData structure for the external shell decoder"); - - if( M4OSA_NULL == shellUserData ) - { - M4OSA_TRACE1_0( - "M4VSS3GPP_intClipRegisterExternalVideoDecoder:\ - failed to allocate userData structure for the external shell decoder"); - return M4ERR_ALLOC; - } - - shellUserData->externalFuncs = pDecoderInterface; - shellUserData->externalUserData = pUserData; - - err = M4DECODER_EXTERNAL_getInterface(&shellInterface); - - if( M4NO_ERROR != err ) - { - M4OSA_TRACE1_1( - "M4VSS3GPP_intClipRegisterExternalVideoDecoder:\ - M4DECODER_EXTERNAL_getInterface failed with error 0x%08X", - err); - free(shellUserData); - return err; - } - - err = M4VSS3GPP_registerVideoDecoder(&(pClipCtxt->ShellAPI), nativeType, - shellInterface); - - if( M4NO_ERROR != err ) - { - M4OSA_TRACE1_1( - "M4VSS3GPP_intClipRegisterExternalVideoDecoder:\ - M4VSS3GPP_registerVideoDecoder failed with error 0x%08X", - err); - free(shellInterface); - free(shellUserData); - return err; - } - - pClipCtxt->ShellAPI.m_pVideoDecoderUserDataTable[nativeType] = - shellUserData; - - return M4NO_ERROR; -} - -#endif /* M4VSS_ENABLE_EXTERNAL_DECODERS */ - /** ****************************************************************************** * M4OSA_UInt32 M4VSS3GPP_intGetFrameSize_AMRNB() -- cgit v1.1