AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same
file without conflict definition.
Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
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 0620367..3ebd929 100644
--- a/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
+++ b/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
@@ -87,22 +87,22 @@
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 */
};
/*----------------------------------------------------------------------------
diff --git a/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h b/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
index 673a94a..a9fdb1c 100644
--- a/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
+++ b/media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
@@ -87,6 +87,8 @@
#include "gsm_amr_typedefs.h"
#include "pvamrnbdecoder_api.h"
+#include "frame_type_3gpp.h"
+
/*--------------------------------------------------------------------------*/
#ifdef __cplusplus
extern "C"
@@ -117,25 +119,6 @@
/*----------------------------------------------------------------------------
; 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
diff --git a/media/libstagefright/codecs/amrnb/enc/src/gsmamr_enc.h b/media/libstagefright/codecs/amrnb/enc/src/gsmamr_enc.h
index 390a44d..67c7aa3 100644
--- a/media/libstagefright/codecs/amrnb/enc/src/gsmamr_enc.h
+++ b/media/libstagefright/codecs/amrnb/enc/src/gsmamr_enc.h
@@ -86,6 +86,7 @@
----------------------------------------------------------------------------*/
#include "gsm_amr_typedefs.h"
+#include "frame_type_3gpp.h"
/*--------------------------------------------------------------------------*/
#ifdef __cplusplus
@@ -137,26 +138,6 @@
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
----------------------------------------------------------------------------*/
