diff options
| author | Shyam Pallapothu <shyamp@google.com> | 2011-04-21 09:48:41 -0700 |
|---|---|---|
| committer | Shyam Pallapothu <shyamp@google.com> | 2011-04-21 09:48:41 -0700 |
| commit | 694816d7291f17364502ac5d3319684a0b180860 (patch) | |
| tree | 21a35b57a0eb154a49999407f466b5fa148d224b /libvideoeditor/osal/inc | |
| parent | 32ed3f4dad00f8a65f7e6b38402c70d5341c57eb (diff) | |
| download | frameworks_av-694816d7291f17364502ac5d3319684a0b180860.zip frameworks_av-694816d7291f17364502ac5d3319684a0b180860.tar.gz frameworks_av-694816d7291f17364502ac5d3319684a0b180860.tar.bz2 | |
Fix for issue 4133431 "Remove OSAL layer" in engine part
Change-Id: I98f98691048a5afc6f691b0cc3cec92e458e8f44
Diffstat (limited to 'libvideoeditor/osal/inc')
| -rwxr-xr-x | libvideoeditor/osal/inc/LV_Macros.h | 2 | ||||
| -rwxr-xr-x | libvideoeditor/osal/inc/LV_Types.h | 4 | ||||
| -rwxr-xr-x | libvideoeditor/osal/inc/M4OSA_Memory.h | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libvideoeditor/osal/inc/LV_Macros.h b/libvideoeditor/osal/inc/LV_Macros.h index d6312cc..fa927b7 100755 --- a/libvideoeditor/osal/inc/LV_Macros.h +++ b/libvideoeditor/osal/inc/LV_Macros.h @@ -97,7 +97,7 @@ { \ if(M4OSA_NULL != (p)) \ { \ - M4OSA_free((M4OSA_MemAddr32)(p)) ; \ + free((p)) ; \ (p) = M4OSA_NULL ; \ } \ } diff --git a/libvideoeditor/osal/inc/LV_Types.h b/libvideoeditor/osal/inc/LV_Types.h index 534ea3a..5a45182 100755 --- a/libvideoeditor/osal/inc/LV_Types.h +++ b/libvideoeditor/osal/inc/LV_Types.h @@ -43,7 +43,7 @@ extern "C" * @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. +* function and then, caller will have to free *targetStart thanks to 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 @@ -61,7 +61,7 @@ typedef M4OSA_UInt32 (*LV_fromUTF8ToNative_Fct)(const M4OSA_Char* pStart, * @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. +* function and then, caller will have to free *targetStart thanks to 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 diff --git a/libvideoeditor/osal/inc/M4OSA_Memory.h b/libvideoeditor/osal/inc/M4OSA_Memory.h index d060602..7cb3d91 100755 --- a/libvideoeditor/osal/inc/M4OSA_Memory.h +++ b/libvideoeditor/osal/inc/M4OSA_Memory.h @@ -39,13 +39,16 @@ extern "C" { #endif +M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_MemAddr32 M4OSA_32bitAlignedMalloc (M4OSA_UInt32 size, + M4OSA_CoreID coreID, + M4OSA_Char* string); + M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_MemAddr32 M4OSA_malloc (M4OSA_UInt32 size, M4OSA_CoreID coreID, M4OSA_Char* string); M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_Void M4OSA_free (M4OSA_MemAddr32 address); - M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_ERR M4OSA_randInit(void); |