diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-09-29 11:41:14 +0800 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2010-09-29 12:00:18 +0800 |
| commit | 88cfb59fde78a07ac8797008cf79b22193e983d9 (patch) | |
| tree | 7dab8f17fe3cb83e5124a85eed0ab792dc4cc56f /media/libstagefright/codecs/amrnb/common/include | |
| parent | 4a73f3da3501db6e95473a4a653d6319c6d618e2 (diff) | |
| download | frameworks_av-88cfb59fde78a07ac8797008cf79b22193e983d9.zip frameworks_av-88cfb59fde78a07ac8797008cf79b22193e983d9.tar.gz frameworks_av-88cfb59fde78a07ac8797008cf79b22193e983d9.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/include')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h | 32 |
1 files changed, 16 insertions, 16 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 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 @@ 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 */ }; /*---------------------------------------------------------------------------- |