Changeset 2506 for pjproject/trunk/pjmedia/include/pjmedia-codec/amr_helper.h

Timestamp:

Mar 12, 2009 6:11:37 PM (14 years ago)

Author:

bennylp

Message:

(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/include/pjmedia-codec/amr_helper.h (modified) (3 diffs)

pjproject/trunk/pjmedia/include/pjmedia-codec/amr_helper.h

@@ -633 +633 @@
  * @return          AMR mode.
  */
-
 PJ_INLINE(pj_int8_t) pjmedia_codec_amr_get_mode(unsigned bitrate)
 {
@@ -679 +678 @@
 
 /**
+ * Get AMR mode based on frame length.
+ *
+ * @param amrnb     Set to PJ_TRUE for AMR-NB domain or PJ_FALSE for AMR-WB.
+ * @param frame_len The frame length.
+ *
+ * @return          AMR mode.
+ */
+
+PJ_INLINE(pj_int8_t) pjmedia_codec_amr_get_mode2(pj_bool_t amrnb,
+                                                 unsigned frame_len)
+{
+    int i;
+
+    if (amrnb) {
+        for (i = 0; i < 9; ++i)
+            if (frame_len == pjmedia_codec_amrnb_framelen[i])
+                return (pj_int8_t)i;
+    } else {
+        for (i = 0; i < 10; ++i) {
+            if (frame_len == pjmedia_codec_amrwb_framelen[i])
+                return (pj_int8_t)i;
+        }
+    }
+    
+    pj_assert(!"Invalid AMR frame length");
+    return -1;
+}
+
+/**
  * Prepare a frame before pass it to decoder. This function will do:
  * - reorder AMR bitstream from descending sensitivity order into 
@@ -795 +823 @@
         out_info->mode = FT_;
         out->size = 5;
-        PJ_ASSERT_RETURN(out->size <= in->size, PJMEDIA_CODEC_EFRMINLEN);
 
         pj_bzero(out->buf, out->size);