diff options
author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:44:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 15:44:01 -0700 |
commit | 9f8f2f857b5791b10f5da9b5cc04d3d8f7988c29 (patch) | |
tree | 8adea39c01fd62be721d6680ec0f77d4e2deaae0 /media/libstagefright/codecs/amrwbenc/src | |
parent | 54b0ae0dc7ba9be652285250f4976d8db89c30ee (diff) | |
parent | 4a028164ee8ce74a7872ce4bcce196b70d9eb4e2 (diff) | |
download | frameworks_av-9f8f2f857b5791b10f5da9b5cc04d3d8f7988c29.zip frameworks_av-9f8f2f857b5791b10f5da9b5cc04d3d8f7988c29.tar.gz frameworks_av-9f8f2f857b5791b10f5da9b5cc04d3d8f7988c29.tar.bz2 |
am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '31140598866c668047fc6dede7944e146aa21a0a':
stagefright amrwbenc: Remove a duplicate, unused file
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc/src')
-rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/cmnMemory.c | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/src/cmnMemory.c b/media/libstagefright/codecs/amrwbenc/src/cmnMemory.c deleted file mode 100644 index dd7c26d..0000000 --- a/media/libstagefright/codecs/amrwbenc/src/cmnMemory.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - ** Copyright 2003-2010, VisualOn, Inc. - ** - ** 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: cmnMemory.c - - Content: sample code for memory operator implementation - -*******************************************************************************/ -#include "cmnMemory.h" - -#include <malloc.h> -#if defined LINUX -#include <string.h> -#endif - -//VO_MEM_OPERATOR g_memOP; - -VO_U32 cmnMemAlloc (VO_S32 uID, VO_MEM_INFO * pMemInfo) -{ - if (!pMemInfo) - return VO_ERR_INVALID_ARG; - - pMemInfo->VBuffer = malloc (pMemInfo->Size); - return 0; -} - -VO_U32 cmnMemFree (VO_S32 uID, VO_PTR pMem) -{ - free (pMem); - return 0; -} - -VO_U32 cmnMemSet (VO_S32 uID, VO_PTR pBuff, VO_U8 uValue, VO_U32 uSize) -{ - memset (pBuff, uValue, uSize); - return 0; -} - -VO_U32 cmnMemCopy (VO_S32 uID, VO_PTR pDest, VO_PTR pSource, VO_U32 uSize) -{ - memcpy (pDest, pSource, uSize); - return 0; -} - -VO_U32 cmnMemCheck (VO_S32 uID, VO_PTR pBuffer, VO_U32 uSize) -{ - return 0; -} - -VO_S32 cmnMemCompare (VO_S32 uID, VO_PTR pBuffer1, VO_PTR pBuffer2, VO_U32 uSize) -{ - return memcmp(pBuffer1, pBuffer2, uSize); -} - -VO_U32 cmnMemMove (VO_S32 uID, VO_PTR pDest, VO_PTR pSource, VO_U32 uSize) -{ - memmove (pDest, pSource, uSize); - return 0; -} - |