pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/30752 )
Change subject: amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN
......................................................................
amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN
Fixes: 678c7fc8fe4fd11e09ccd642ad60c10c365bd19a
Change-Id: I63c8082bec12bf81760330d1fc0b13de23ac6a24
---
M include/osmocom/netif/amr.h
1 file changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/52/30752/1
diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h
index 0eb26e2..1cc4385 100644
--- a/include/osmocom/netif/amr.h
+++ b/include/osmocom/netif/amr.h
@@ -139,20 +139,20 @@
*
* NOTE: These constants refer to the length of one AMR speech frame-block,
* not counting CMR, TOC. */
-#define AMR_FT_0_LEN ((AMR_FT_0_LEN_BITS+7)/8) /* 4.75 */
-#define AMR_FT_1_LEN ((AMR_FT_1_LEN_BITS+7)/8) /* 5.15 */
-#define AMR_FT_2_LEN ((AMR_FT_2_LEN_BITS+7)/8) /* 5.90 */
-#define AMR_FT_3_LEN ((AMR_FT_3_LEN_BITS+7)/8) /* 6.70 */
-#define AMR_FT_4_LEN ((AMR_FT_4_LEN_BITS+7)/8) /* 7.40 */
-#define AMR_FT_5_LEN ((AMR_FT_5_LEN_BITS+7)/8) /* 7.95 */
-#define AMR_FT_6_LEN ((AMR_FT_6_LEN_BITS+7)/8) /* 10.2 */
-#define AMR_FT_7_LEN ((AMR_FT_7_LEN_BITS+7)/8) /* 12.2 */
-#define AMR_FT_SID_LEN ((AMR_FT_SID_LEN_BITS+7)/8) /* SID */
-#define AMR_FT_GSM_EFR_SID_LEN 43 /* GSM-EFR SID */
-#define AMR_FT_TDMA_EFR_SID_LEN 38 /* TDMA-EFR SID */
-#define AMR_FT_PDC_EFR_SID_LEN 37 /* PDC-EFR SID */
+#define AMR_FT_0_LEN ((AMR_FT_0_LEN_BITS+7)/8) /* 4.75
*/
+#define AMR_FT_1_LEN ((AMR_FT_1_LEN_BITS+7)/8) /* 5.15
*/
+#define AMR_FT_2_LEN ((AMR_FT_2_LEN_BITS+7)/8) /* 5.90
*/
+#define AMR_FT_3_LEN ((AMR_FT_3_LEN_BITS+7)/8) /* 6.70
*/
+#define AMR_FT_4_LEN ((AMR_FT_4_LEN_BITS+7)/8) /* 7.40
*/
+#define AMR_FT_5_LEN ((AMR_FT_5_LEN_BITS+7)/8) /* 7.95
*/
+#define AMR_FT_6_LEN ((AMR_FT_6_LEN_BITS+7)/8) /* 10.2
*/
+#define AMR_FT_7_LEN ((AMR_FT_7_LEN_BITS+7)/8) /* 12.2
*/
+#define AMR_FT_SID_LEN ((AMR_FT_SID_LEN_BITS+7)/8) /* SID
*/
+#define AMR_FT_GSM_EFR_SID_LEN ((AMR_FT_GSM_EFR_SID_LEN_BITS+7)/8) /*
GSM-EFR SID */
+#define AMR_FT_TDMA_EFR_SID_LEN ((AMR_FT_TDMA_EFR_SID_LEN_BITS+7)/8)
/* TDMA-EFR SID */
+#define AMR_FT_PDC_EFR_SID_LEN ((AMR_FT_PDC_EFR_SID_LEN_BITS+7)/8) /*
PDC-EFR SID */
/* version 16.0.0 Release 16: 12-14 for future use */
-#define AMR_FT_NO_DATA_LEN 0 /* NO_DATA */
+#define AMR_FT_NO_DATA_LEN ((AMR_FT_NO_DATA_LEN_BITS+7)/8) /*
NO_DATA */
int osmo_amr_ft_valid(uint8_t amr_ft);
size_t osmo_amr_bytes(uint8_t amr_cmr);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30752
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I63c8082bec12bf81760330d1fc0b13de23ac6a24
Gerrit-Change-Number: 30752
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-MessageType: newchange
