Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d2777c authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"

parents dde79acf 448239b9

media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h

+28 −0
Original line number Diff line number Diff line
@@ -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

    ----------------------------------------------------------------------------*/

media/libstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h

+0 −34
Original line number Diff line number Diff line
@@ -24,40 +24,6 @@ 
#ifndef _PVGSMAMR_DECODER_INTERFACE_H

#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

----------------------------------------------------------------------------*/

media/libstagefright/codecs/amrnb/dec/src/amrdecode.h

+0 −1
Original line number Diff line number Diff line
@@ -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

media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h

+0 −1
Original line number Diff line number Diff line
@@ -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"



/*--------------------------------------------------------------------------*/