diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-16 16:40:19 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-16 16:40:20 -0700 |
| commit | c1d2777c8004a9491e1381cca33a6768faed50c3 (patch) | |
| tree | 81de2d89d5baabb11cf9f90a3fa5d8ec8ad1151f /media/libstagefright/codecs/amrnb | |
| parent | dde79acfb97083d690e3cceabff78931b10d1539 (diff) | |
| parent | 448239b929de32621e26504b86482ab4d436a5e3 (diff) | |
| download | frameworks_av-c1d2777c8004a9491e1381cca33a6768faed50c3.zip frameworks_av-c1d2777c8004a9491e1381cca33a6768faed50c3.tar.gz frameworks_av-c1d2777c8004a9491e1381cca33a6768faed50c3.tar.bz2 | |
Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
Diffstat (limited to 'media/libstagefright/codecs/amrnb')
4 files changed, 28 insertions, 36 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h b/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h index 3ebd929..3d482be 100644 --- a/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h +++ b/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h @@ -105,6 +105,34 @@ extern "C" AMR_NO_DATA /* No data */ }; +typedef enum +{ + /* + * One word (2-byte) to indicate type of frame type. + * One word (2-byte) to indicate frame type. + * One word (2-byte) to indicate mode. + * N words (2-byte) containing N bits (bit 0 = 0xff81, bit 1 = 0x007f). + */ + ETS = 0, /* Both AMR-Narrowband and AMR-Wideband */ + + /* + * One word (2-byte) for sync word (good frames: 0x6b21, bad frames: 0x6b20) + * One word (2-byte) for frame length N. + * N words (2-byte) containing N bits (bit 0 = 0x007f, bit 1 = 0x0081). + */ + ITU, /* AMR-Wideband */ + + /* + * AMR-WB MIME/storage format, see RFC 3267 (sections 5.1 and 5.3) for details + */ + MIME_IETF, + + WMF, /* AMR-Narrowband */ + + IF2 /* AMR-Narrowband */ + +} bitstream_format; + /*---------------------------------------------------------------------------- ; STRUCTURES TYPEDEF'S ----------------------------------------------------------------------------*/ diff --git a/media/libstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h b/media/libstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h index ccbed44..2e961f9 100644 --- a/media/libstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h +++ b/media/libstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h @@ -25,40 +25,6 @@ #define _PVGSMAMR_DECODER_INTERFACE_H /*---------------------------------------------------------------------------- -; ENUMERATED TYPEDEF'S -----------------------------------------------------------------------------*/ - -typedef enum -{ - /* - * One word (2-byte) to indicate type of frame type. - * One word (2-byte) to indicate frame type. - * One word (2-byte) to indicate mode. - * N words (2-byte) containing N bits (bit 0 = 0xff81, bit 1 = 0x007f). - */ - ETS = 0, /* Both AMR-Narrowband and AMR-Wideband */ - - /* - * One word (2-byte) for sync word (good frames: 0x6b21, bad frames: 0x6b20) - * One word (2-byte) for frame length N. - * N words (2-byte) containing N bits (bit 0 = 0x007f, bit 1 = 0x0081). - */ - ITU, /* AMR-Wideband */ - - /* - * AMR-WB MIME/storage format, see RFC 3267 (sections 5.1 and 5.3) for details - */ - MIME_IETF, - - WMF, /* AMR-Narrowband */ - - IF2 /* AMR-Narrowband */ - -} bitstream_format; - - - -/*---------------------------------------------------------------------------- ; STRUCTURES TYPEDEF'S ----------------------------------------------------------------------------*/ typedef struct diff --git a/media/libstagefright/codecs/amrnb/dec/src/amrdecode.h b/media/libstagefright/codecs/amrnb/dec/src/amrdecode.h index db951b9..0988e17 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/amrdecode.h +++ b/media/libstagefright/codecs/amrnb/dec/src/amrdecode.h @@ -106,7 +106,6 @@ terms listed above has been obtained from the copyright holder. #include "typedef.h" #include "mode.h" #include "frame_type_3gpp.h" -#include "pvamrnbdecoder_api.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus diff --git a/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h b/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h index a9fdb1c..8f54ee8 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h +++ b/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h @@ -86,7 +86,6 @@ terms listed above has been obtained from the copyright holder. ----------------------------------------------------------------------------*/ #include "gsm_amr_typedefs.h" -#include "pvamrnbdecoder_api.h" #include "frame_type_3gpp.h" /*--------------------------------------------------------------------------*/ |