Merge "videoeditor osal files check in on honeycomb" into honeycomb (524effb5) · Commits · e / os / android_frameworks_av

libvideoeditor/osal/Android.mk

0 → 100755

+1 −0

Original line number	Original line	Diff line number	Diff line
			include $(call all-subdir-makefiles)

libvideoeditor/osal/inc/LVOSA_FileReader_optim.h

0 → 100755

+86 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2004-2011 NXP Software
			* Copyright (C) 2011 The Android Open Source Project
			*
			* 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.
			*/

			/**
			******************************************************************************
			* @file M4OSA_FileReader_optim.h
			* @brief File reader for Symbian
			* @note This file declares functions and types to read a file.
			******************************************************************************
			*/



			#ifndef M4OSA_FILEREADER_OPTIM_H
			#define M4OSA_FILEREADER_OPTIM_H

			#define M4OSA_READER_OPTIM_USE_OSAL_IF

			/**/
			#ifndef M4OSA_READER_OPTIM_USE_OSAL_IF
			typedef struct
			{
			M4OSA_Void* (pFctPtr_Open)( M4OSA_Void fd,
			M4OSA_UInt32 FileModeAccess,
			M4OSA_UInt16* errno );
			M4OSA_FilePosition (pFctPtr_Read)( M4OSA_Void fd,
			M4OSA_UInt8* data,
			M4OSA_FilePosition size,
			M4OSA_UInt16* errno );
			M4OSA_FilePosition (pFctPtr_Seek)( M4OSA_Void fd,
			M4OSA_FilePosition pos,
			M4OSA_FileSeekAccessMode mode,
			M4OSA_UInt16* errno );
			M4OSA_FilePosition (pFctPtr_Tell)( M4OSA_Void fd,
			M4OSA_UInt16* errno );
			M4OSA_Int32 (pFctPtr_Close)( M4OSA_Void fd,
			M4OSA_UInt16* errno );
			M4OSA_Void (*pFctPtr_AccessType)( M4OSA_UInt32 FileModeAccess_In,
			M4OSA_Void* FileModeAccess_Out );

			} M4OSA_FileSystem_FctPtr;
			#endif
			/**/


			/* Reader API : bufferized functions */
			#ifdef M4OSA_READER_OPTIM_USE_OSAL_IF
			M4OSA_ERR M4OSA_fileReadOpen_optim( M4OSA_Context* context,
			M4OSA_Void* fileDescriptor,
			M4OSA_UInt32 fileModeAccess);
			#else
			M4OSA_ERR M4OSA_fileReadOpen_optim( M4OSA_Context* context,
			M4OSA_Void* fileDescriptor,
			M4OSA_UInt32 fileModeAccess,
			M4OSA_FileSystem_FctPtr *FS);
			#endif

			M4OSA_ERR M4OSA_fileReadData_optim( M4OSA_Context context,
			M4OSA_MemAddr8 buffer,
			M4OSA_UInt32* size );
			M4OSA_ERR M4OSA_fileReadSeek_optim( M4OSA_Context context,
			M4OSA_FileSeekAccessMode seekMode,
			M4OSA_FilePosition* position );
			M4OSA_ERR M4OSA_fileReadClose_optim( M4OSA_Context context );
			M4OSA_ERR M4OSA_fileReadGetOption_optim( M4OSA_Context context,
			M4OSA_FileReadOptionID optionID,
			M4OSA_DataOption *optionValue );
			M4OSA_ERR M4OSA_fileReadSetOption_optim( M4OSA_Context context,
			M4OSA_FileReadOptionID optionID,
			M4OSA_DataOption optionValue );

			#endif /* M4OSA_FILEREADER_OPTIM_H */

libvideoeditor/osal/inc/LV_Macros.h

0 → 100755

+108 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2004-2011 NXP Software
			* Copyright (C) 2011 The Android Open Source Project
			*
			* 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.
			*/

			/*******************************************************************************
			* @file LV_Macros.h
			* @par NXP Software
			* @brief Macros definition for Smartphone team
			*******************************************************************************/

			#ifndef LV_MACROS_H
			#define LV_MACROS_H

			/------------/
			/* INCLUDES */
			/------------/
			#include "M4OSA_Memory.h"
			#include "M4OSA_Debug.h"

			/******************************************************************************
			*
			* CHECK_PTR(fct, p, err, errValue)
			* @note This macro checks the value p. If it is NULL, it sets the variable err
			* to errValue and jumps to the label <fct>_cleanUp. A trace is displayed
			* signalling the error, the function name and the line number.
			*
			******************************************************************************/
			#define CHECK_PTR(fct, p, err, errValue) \
			{ \
			if(M4OSA_NULL == (p)) \
			{ \
			(err) = (errValue) ; \
			M4OSA_TRACE1_1((M4OSA_Char*)"" #fct "(L%d): " #p " is NULL, returning " #errValue "",__LINE__) ; \
			goto fct##_cleanUp; \
			} \
			}

			/******************************************************************************
			*
			* CHECK_ERR(fct, err)
			* @note This macro checks the value err. If it is not NULL, a trace is displayed
			* signalling the error, the function name and the line number. The macro
			* jumps to the label <fct>_cleanUp.
			*
			******************************************************************************/
			#define CHECK_ERR(fct, err) \
			{ \
			if(M4NO_ERROR != (err)) \
			{ \
			M4OSA_TRACE1_2((M4OSA_Char*)"!!! " #fct "(L%d): ERROR 0x%.8x returned",\
			__LINE__,err) ; \
			goto fct##_cleanUp; \
			} \
			}


			/******************************************************************************
			*
			* CHECK_ERR(fct, err)
			* @note This macro compares a current state with a state value. If they are different,
			* err is set to M4ERR_STATE.
			* A trace is displayed signalling the error, the function name and the line number.
			* The macro jumps to the label <fct>_cleanUp.
			*
			******************************************************************************/
			#define CHECK_STATE(fct, stateValue, state) \
			{ \
			if((stateValue) != (state)) \
			{ \
			M4OSA_TRACE1_1("" #fct " called in bad state %d", state) ; \
			(err) = M4ERR_STATE ; \
			goto fct##_cleanUp; \
			} \
			}

			/******************************************************************************
			*
			* SAFE_FREE(p)
			* @note This macro checks the value of p is not NULL. If it is NULL, it does
			* nothing. Else, p is de allocated and set to NULL.
			*
			******************************************************************************/
			#define SAFE_FREE(p) \
			{ \
			if(M4OSA_NULL != (p)) \
			{ \
			M4OSA_free((M4OSA_MemAddr32)(p)) ; \
			(p) = M4OSA_NULL ; \
			} \
			}



			#endif /--- LV_MACROS_H ---/

libvideoeditor/osal/inc/LV_Types.h

0 → 100755

+78 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2004-2011 NXP Software
			* Copyright (C) 2011 The Android Open Source Project
			*
			* 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.
			*/

			/*******************************************************************************
			* @file LV_Types.h
			* @brief Types definition for Smartphone team
			*******************************************************************************/

			#ifndef LV_TYPES_H
			#define LV_TYPES_H

			/------------/
			/* INCLUDES */
			/------------/
			#include "M4OSA_Error.h"

			#ifdef __cplusplus
			extern "C"
			{
			#endif

			/--------------------------------------/
			/* CHARACTER ENCODING CONVERSION FCTS */
			/--------------------------------------/
			/******************************************************************************
			*
			* M4OSA_UInt32 (LV_fromUTF8ToNative_Fct)(const M4OSA_Char pStart,
			* M4OSA_Void** pOut);
			* @note This function converts a string from UTF8 format which is the default
			* encoding in the engines and application logics to the character encoding
			* supported by the OS or platform. The memory will be allocated within this
			* function and then, caller will have to free *targetStart thanks to M4OSA_free.
			* Both strings must be NULL-terminateed.
			* @param pStart (IN): String to convert.
			* @param pOut (OUT): This pointer will be filled by this function. It contains the
			* string converted to the native format.
			* @return Success: Size in bytes allocated including the NULL character. Failure: 0
			*
			******************************************************************************/
			typedef M4OSA_UInt32 (LV_fromUTF8ToNative_Fct)(const M4OSA_Char pStart,
			M4OSA_Void** pOut);

			/******************************************************************************
			*
			* M4OSA_UInt32 (LV_fromNativeToUTF8_Fct)(const M4OSA_Char pStart,
			* M4OSA_Void** targetStart);
			* @note This function converts a string in the character encoding supported by the
			* OS or platform to from UTF8 format which is the default encoding in the
			* engines and application logics. The memory will be allocated within this
			* function and then, caller will have to free *targetStart thanks to M4OSA_free.
			* Both strings must be NULL-terminateed.
			* @param pStart (IN): String to convert.
			* @param pOut (OUT): This pointer will be filled by this function. It contains the
			* string converted to UTF8 format.
			* @return Success: Size in bytes allocated including the NULL character. Failure: 0
			*
			******************************************************************************/
			typedef M4OSA_UInt32 (LV_fromNativeToUTF8_Fct)(const M4OSA_Void* pStart,
			M4OSA_Char** pOut);
			#ifdef __cplusplus
			}
			#endif

			#endif /--- LV_TYPES_H ---/

libvideoeditor/osal/inc/M4OSA_CharStar.h

0 → 100755

+147 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2004-2011 NXP Software
			* Copyright (C) 2011 The Android Open Source Project
			*
			* 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.
			*/
			/**
			************************************************************************
			* @file M4OSA_CharStar.h
			* @ingroup
			* @brief external API of the Char Star set of functions.
			************************************************************************
			*/

			#ifndef M4OSA_CHARSTAR_H
			#define M4OSA_CHARSTAR_H

			/* general OSAL types and prototypes inclusion */
			#include "M4OSA_Types.h"
			#include "M4OSA_Error.h"
			#include "M4OSA_Time.h"
			#include "M4OSA_FileCommon.h"

			/* types definition */
			typedef enum
			{
			M4OSA_kchrDec = 0x01,
			M4OSA_kchrHexa = 0x02,
			M4OSA_kchrOct = 0x03
			} M4OSA_chrNumBase;

			/* error and warning codes */
			#define M4ERR_CHR_STR_OVERFLOW M4OSA_ERR_CREATE(M4_ERR,M4OSA_CHARSTAR,0x000001)
			#define M4ERR_CHR_CONV_FAILED M4OSA_ERR_CREATE(M4_ERR,M4OSA_CHARSTAR,0x000002)
			#define M4WAR_CHR_NOT_FOUND M4OSA_ERR_CREATE(M4_WAR,M4OSA_CHARSTAR,0x000001)
			#define M4WAR_CHR_NUM_RANGE M4OSA_ERR_CREATE(M4_WAR,M4OSA_CHARSTAR,0x000002)
			#define M4WAR_CHR_NEGATIVE M4OSA_ERR_CREATE(M4_WAR,M4OSA_CHARSTAR,0x000003)

			/* prototypes of the Char Star functions */
			#ifdef __cplusplus
			extern "C"
			{
			#endif

			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrNCopy (M4OSA_Char *strOut,
			M4OSA_Char *strIn,
			M4OSA_UInt32 len2Copy);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrNCat (M4OSA_Char *strOut,
			M4OSA_Char *strIn,
			M4OSA_UInt32 len2Append);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrCompare (M4OSA_Char *strIn1,
			M4OSA_Char *strIn2,
			M4OSA_Int32 *cmpResult);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrNCompare (M4OSA_Char *strIn1,
			M4OSA_Char *strIn2,
			M4OSA_UInt32 len2Comp,
			M4OSA_Int32 *cmpResult);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrAreIdentical (M4OSA_Char *strIn1,
			M4OSA_Char *strIn2,
			M4OSA_Bool *result);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrFindChar (M4OSA_Char *strIn,
			M4OSA_Char c,
			M4OSA_Char **pointerInStr);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrReverseFindChar(M4OSA_Char *strIn,
			M4OSA_Char c,
			M4OSA_Char **pointerInStr);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrSpan (M4OSA_Char *strIn,
			M4OSA_Char *delimiters,
			M4OSA_UInt32 *posInStr);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrSpanComplement (M4OSA_Char *strIn,
			M4OSA_Char *delimiters,
			M4OSA_UInt32 *posInStr);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrPbrk (M4OSA_Char *strIn,
			M4OSA_Char *delimiters,
			M4OSA_Char **pointerInStr);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrFindPattern (M4OSA_Char *strIn1,
			M4OSA_Char *strIn2,
			M4OSA_Char **pointerInStr1);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_UInt32 M4OSA_chrLength (M4OSA_Char *strIn);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_Char M4OSA_chrToLower (M4OSA_Char cIn);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_Char M4OSA_chrToUpper (M4OSA_Char cIn);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetWord (M4OSA_Char *strIn,
			M4OSA_Char *beginDelimiters,
			M4OSA_Char *endDelimiters,
			M4OSA_Char *strOut,
			M4OSA_UInt32 *strOutMaxLen,
			M4OSA_Char **outputPointer);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetUInt32 (M4OSA_Char *strIn,
			M4OSA_UInt32 *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetUInt16 (M4OSA_Char *strIn,
			M4OSA_UInt16 *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetUInt8 (M4OSA_Char *strIn,
			M4OSA_UInt8 *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetInt64 (M4OSA_Char *strIn,
			M4OSA_Int64 *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetInt32 (M4OSA_Char *strIn,
			M4OSA_Int32 *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetInt16 (M4OSA_Char *strIn,
			M4OSA_Int16 *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetInt8 (M4OSA_Char *strIn,
			M4OSA_Int8 *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetDouble (M4OSA_Char *strIn,
			M4OSA_Double *val,
			M4OSA_Char **strOut);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetTime (M4OSA_Char *strIn,
			M4OSA_Time *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrGetFilePosition(M4OSA_Char *strIn,
			M4OSA_FilePosition *val,
			M4OSA_Char **strOut,
			M4OSA_chrNumBase base);
			M4OSAL_CHARSTAR_EXPORT_TYPE M4OSA_ERR M4OSA_chrSPrintf (M4OSA_Char *strOut,
			M4OSA_UInt32 strOutMaxLen,
			M4OSA_Char *format,
			...);

			#ifdef __cplusplus
			}
			#endif

			#endif