diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 11:49:19 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 11:59:43 -0700 |
| commit | bcd1d7c5905d66aa682c4b5a9dfe59189aeecabd (patch) | |
| tree | 97ad067703481a8201a4920b6995e670be4c597e /media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h | |
| parent | 7592f6cde9d6a228e07377fc822adab0cad0faf7 (diff) | |
| parent | daa85dac2055b22dabbb3b4e537597e6ab73a866 (diff) | |
| download | frameworks_av-bcd1d7c5905d66aa682c4b5a9dfe59189aeecabd.zip frameworks_av-bcd1d7c5905d66aa682c4b5a9dfe59189aeecabd.tar.gz frameworks_av-bcd1d7c5905d66aa682c4b5a9dfe59189aeecabd.tar.bz2 | |
Merge tag 'android-6.0.1_r43' into HEAD
Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)
Change-Id: Ie0ab546349bd8a7eed51c839fba28b809e433fd4
Diffstat (limited to 'media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h b/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h index 8f54ee8..dc64d67 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h +++ b/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h @@ -87,6 +87,7 @@ terms listed above has been obtained from the copyright holder. #include "gsm_amr_typedefs.h" #include "frame_type_3gpp.h" +#include "amrdecode.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -136,19 +137,6 @@ extern "C" Word8 *id); /* - * AMRDecode steps into the part of the library that decodes the raw data - * speech bits for the decoding process. It returns the address offset of - * the next frame to be decoded. - */ - Word16 AMRDecode( - void *state_data, - enum Frame_Type_3GPP frame_type, - UWord8 *speech_bits_ptr, - Word16 *raw_pcm_buffer, - Word16 input_format - ); - - /* * This function resets the state memory used by the GSM AMR decoder. This * function returns zero. It will return negative one if there is an error. */ |