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

Commit 10b15c08 authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android Git Automerger
Browse files

am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h... 

am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread

Merge commit 'd6877fa4' into gingerbread-plus-aosp

* commit 'd6877fa4':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
parents 05e11050 d6877fa4

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

+16 −16
Original line number Diff line number Diff line
@@ -87,22 +87,22 @@ extern "C" 


    enum Frame_Type_3GPP

    {

        AMR_475 = 0,

        AMR_515,

        AMR_59,

        AMR_67,

        AMR_74,

        AMR_795,

        AMR_102,

        AMR_122,

        AMR_SID,

        GSM_EFR_SID,

        TDMA_EFR_SID,

        PDC_EFR_SID,

        FOR_FUTURE_USE1,

        FOR_FUTURE_USE2,

        FOR_FUTURE_USE3,

        AMR_NO_DATA

        AMR_475 = 0,        /* 4.75 kbps    */

        AMR_515,            /* 5.15 kbps    */

        AMR_59,             /* 5.9 kbps     */

        AMR_67,             /* 6.7 kbps     */

        AMR_74,             /* 7.4 kbps     */

        AMR_795,            /* 7.95 kbps    */

        AMR_102,            /* 10.2 kbps    */

        AMR_122,            /* 12.2 kbps    */

        AMR_SID,            /* GSM AMR DTX  */

        GSM_EFR_SID,        /* GSM EFR DTX  */

        TDMA_EFR_SID,       /* TDMA EFR DTX */

        PDC_EFR_SID,        /* PDC EFR DTX  */

        FOR_FUTURE_USE1,    /* Unused 1     */

        FOR_FUTURE_USE2,    /* Unused 2     */

        FOR_FUTURE_USE3,    /* Unused 3     */

        AMR_NO_DATA         /* No data      */

    };



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

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

+2 −19
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ terms listed above has been obtained from the copyright holder. 


#include "gsm_amr_typedefs.h"

#include "pvamrnbdecoder_api.h"

#include "frame_type_3gpp.h"



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

#ifdef __cplusplus

extern "C"
@@ -117,25 +119,6 @@ extern "C" 
    /*----------------------------------------------------------------------------

    ; ENUMERATED TYPEDEF'S

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

    enum Frame_Type_3GPP

    {

        AMR_475 = 0,        /* 4.75 kbps    */

        AMR_515,            /* 5.15 kbps    */

        AMR_59,             /* 5.9 kbps     */

        AMR_67,             /* 6.7 kbps     */

        AMR_74,             /* 7.4 kbps     */

        AMR_795,            /* 7.95 kbps    */

        AMR_102,            /* 10.2 kbps    */

        AMR_122,            /* 12.2 kbps    */

        AMR_SID,            /* GSM AMR DTX  */

        GSM_EFR_SID,        /* GSM EFR DTX  */

        TDMA_EFR_SID,       /* TDMA EFR DTX */

        PDC_EFR_SID,        /* PDC EFR DTX  */

        FOR_FUTURE_USE1,    /* Unused 1     */

        FOR_FUTURE_USE2,    /* Unused 2     */

        FOR_FUTURE_USE3,    /* Unused 3     */

        AMR_NO_DATA

    };      /* No data      */



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

    ; STRUCTURES TYPEDEF'S

media/libstagefright/codecs/amrnb/enc/src/gsmamr_enc.h

+1 −20
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ terms listed above has been obtained from the copyright holder. 
----------------------------------------------------------------------------*/



#include "gsm_amr_typedefs.h"

#include "frame_type_3gpp.h"



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

#ifdef __cplusplus
@@ -137,26 +138,6 @@ extern "C" 
        N_MODES   /* Not Used  */

    };



    enum Frame_Type_3GPP

    {

        AMR_475 = 0,        /* 4.75 kbps    */

        AMR_515,            /* 5.15 kbps    */

        AMR_59,             /* 5.9 kbps     */

        AMR_67,             /* 6.7 kbps     */

        AMR_74,             /* 7.4 kbps     */

        AMR_795,            /* 7.95 kbps    */

        AMR_102,            /* 10.2 kbps    */

        AMR_122,            /* 12.2 kbps    */

        AMR_SID,            /* GSM AMR DTX  */

        GSM_EFR_SID,        /* GSM EFR DTX  */

        TDMA_EFR_SID,       /* TDMA EFR DTX */

        PDC_EFR_SID,        /* PDC EFR DTX  */

        FOR_FUTURE_USE1,    /* Unused 1     */

        FOR_FUTURE_USE2,    /* Unused 2     */

        FOR_FUTURE_USE3,    /* Unused 3     */

        AMR_NO_DATA         /* No data      */

    };



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

    ; STRUCTURES TYPEDEF'S

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