diff options
author | Martin Storsjo <martin@martin.st> | 2011-06-23 17:56:25 +0300 |
---|---|---|
committer | Martin Storsjo <martin@martin.st> | 2012-07-10 13:45:30 +0300 |
commit | 223933e8e7419d0d4431d01e8980592fcafd2404 (patch) | |
tree | efa083ffe2371c4dbec630e56ba455dd99c228eb /media/libstagefright/codecs/amrnb/dec | |
parent | 448239b929de32621e26504b86482ab4d436a5e3 (diff) | |
download | frameworks_av-223933e8e7419d0d4431d01e8980592fcafd2404.zip frameworks_av-223933e8e7419d0d4431d01e8980592fcafd2404.tar.gz frameworks_av-223933e8e7419d0d4431d01e8980592fcafd2404.tar.bz2 |
stagefright amrnb: Remove unused leftover source files
This allows getting rid of adding the plain common directory
(not common/include) to the include paths in projects that use
this code, too.
Change-Id: Ifb1fe4fc1f5c6f1264cb2b64f7b78e42b1e7833a
Diffstat (limited to 'media/libstagefright/codecs/amrnb/dec')
3 files changed, 1 insertions, 202 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/Android.mk b/media/libstagefright/codecs/amrnb/dec/Android.mk index 5dc5560..b48a459 100644 --- a/media/libstagefright/codecs/amrnb/dec/Android.mk +++ b/media/libstagefright/codecs/amrnb/dec/Android.mk @@ -42,8 +42,7 @@ LOCAL_C_INCLUDES := \ frameworks/av/media/libstagefright/include \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../common/include \ - $(LOCAL_PATH)/../common + $(LOCAL_PATH)/../common/include LOCAL_CFLAGS := \ -DOSCL_UNUSED_ARG= -DOSCL_IMPORT_REF= @@ -66,7 +65,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../common/include \ - $(LOCAL_PATH)/../common LOCAL_CFLAGS := -DOSCL_IMPORT_REF= diff --git a/media/libstagefright/codecs/amrnb/dec/include/pvamrnbdecoder_api.h b/media/libstagefright/codecs/amrnb/dec/include/pvamrnbdecoder_api.h deleted file mode 100644 index 7b94320..0000000 --- a/media/libstagefright/codecs/amrnb/dec/include/pvamrnbdecoder_api.h +++ /dev/null @@ -1,122 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * 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. - * ------------------------------------------------------------------- - */ -/**************************************************************************************** -Portions of this file are derived from the following 3GPP standard: - - 3GPP TS 26.073 - ANSI-C code for the Adaptive Multi-Rate (AMR) speech codec - Available from http://www.3gpp.org - -(C) 2004, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC) -Permission to distribute, modify and use this file under the standard license -terms listed above has been obtained from the copyright holder. -****************************************************************************************/ -/* - Name: pvamrnbdecoder_api.h - ------------------------------------------------------------------------------- - REVISION HISTORY - - - Who: Date: - Description: - ------------------------------------------------------------------------------- - INCLUDE DESCRIPTION - - Main header file for the Packet Video AMR Narrow Band decoder library. The - constants, structures, and functions defined within this file, along with - a basic data types header file, is all that is needed to use and communicate - with the library. The internal data structures within the library are - purposely hidden. - ------------------------------------------------------------------------------- - REFERENCES - ------------------------------------------------------------------------------- -*/ - -/*---------------------------------------------------------------------------- -; CONTINUE ONLY IF NOT ALREADY DEFINED -----------------------------------------------------------------------------*/ -#ifndef _PVAMRNBDECODER_API_H -#define _PVAMRNBDECODER_API_H - -#include "pvgsmamrdecoderinterface.h" - - -/*---------------------------------------------------------------------------- -; INCLUDES -----------------------------------------------------------------------------*/ -#ifdef __cplusplus -extern "C" -{ -#endif - - /*---------------------------------------------------------------------------- - ; MACROS - ; Define module specific macros here - ----------------------------------------------------------------------------*/ - - /*---------------------------------------------------------------------------- - ; DEFINES - ; Include all pre-processor statements here. - ----------------------------------------------------------------------------*/ -#define MAX_NUM_FRAMES_PER_PACKET 20 /* Max number of frames per packet */ - -#define MAX_NUM_PACKED_INPUT_BYTES 32 /* Max number of packed input bytes */ - -#define L_FRAME 160 - - /*---------------------------------------------------------------------------- - ; EXTERNAL VARIABLES REFERENCES - ; Declare variables used in this module but defined elsewhere - ----------------------------------------------------------------------------*/ - - /*---------------------------------------------------------------------------- - ; SIMPLE TYPEDEF'S - ----------------------------------------------------------------------------*/ - - /*---------------------------------------------------------------------------- - ; ENUMERATED TYPEDEF'S - ----------------------------------------------------------------------------*/ - - /*---------------------------------------------------------------------------- - ; STRUCTURES TYPEDEF'S - ----------------------------------------------------------------------------*/ - - - /*---------------------------------------------------------------------------- - ; GLOBAL FUNCTION DEFINITIONS - ; Function Prototype declaration - ----------------------------------------------------------------------------*/ - - - - /*---------------------------------------------------------------------------- - ; END - ----------------------------------------------------------------------------*/ - -#ifdef __cplusplus -} -#endif - - -#endif /* PVMP4AUDIODECODER_API_H */ - - diff --git a/media/libstagefright/codecs/amrnb/dec/src/pvgsmamrdecoder.cpp b/media/libstagefright/codecs/amrnb/dec/src/pvgsmamrdecoder.cpp deleted file mode 100644 index 95b0b47..0000000 --- a/media/libstagefright/codecs/amrnb/dec/src/pvgsmamrdecoder.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * 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. - * ------------------------------------------------------------------- - */ -/**************************************************************************************** -Portions of this file are derived from the following 3GPP standard: - - 3GPP TS 26.073 - ANSI-C code for the Adaptive Multi-Rate (AMR) speech codec - Available from http://www.3gpp.org - -(C) 2004, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC) -Permission to distribute, modify and use this file under the standard license -terms listed above has been obtained from the copyright holder. -****************************************************************************************/ - -#include "PVGSMAMRDecoder.h" - - -///////////////////////////////////////////////////////////////////////////// -OSCL_EXPORT_REF CPVGSMAMRDecoder::CPVGSMAMRDecoder() -{ -} - - -///////////////////////////////////////////////////////////////////////////// -OSCL_EXPORT_REF CPVGSMAMRDecoder::~CPVGSMAMRDecoder() -{ - delete iDecState; - iDecState = NULL; -} - - -///////////////////////////////////////////////////////////////////////////// -OSCL_EXPORT_REF int32 CPVGSMAMRDecoder::InitDecoder(void) -{ - return GSMInitDecode(&iDecState, (int8*)"Decoder"); -} - - -///////////////////////////////////////////////////////////////////////////// -OSCL_EXPORT_REF int32 CPVGSMAMRDecoder::DecodeFrame(Frame_Type_3GPP aType, - uint8* aCompressedBlock, - uint8* aAudioBuffer, - int32 aFormat) -{ - return AMRDecode(iDecState, aType, aCompressedBlock, (Word16*)aAudioBuffer, (Word16) aFormat); -} - - -///////////////////////////////////////////////////////////////////////////// -OSCL_EXPORT_REF int32 CPVGSMAMRDecoder::ResetDecoder(void) -{ - return Speech_Decode_Frame_reset(iDecState); -} - - -///////////////////////////////////////////////////////////////////////////// -OSCL_EXPORT_REF void CPVGSMAMRDecoder::TerminateDecoder(void) -{ - GSMDecodeFrameExit(&iDecState); - iDecState = NULL; -} - |