Changeset 5058 for pjproject/trunk

Timestamp:

Apr 9, 2015 8:15:48 AM (10 years ago)

Author:

nanang

Message:

Re #1794:

• Updated G7221, the bitrate can also be set via param.info.avg_bps, this is applicable only when param.setting.dec_fmtp doesn't contain bitrate info.
• Fixed failing codec vector test in pjmedia-test due to wrong G7221 bitrate setting.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia-codec/g7221.h (modified) (1 diff)
• src/pjmedia-codec/g7221.c (modified) (1 diff)
• src/test/codec_vectors.c (modified) (2 diffs)

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

@@ -76 +76 @@
  * - for 14kHz audio bandwidth (32kHz sampling rate): 24000 to 48000 bps,
  *   multiplication of 400
+ *
+ * The bitrate is set via <tt>param.setting.dec_fmtp</tt>, if it does not
+ * contain bitrate info, the codec will check <tt>param.info.avg_bps</tt>.
  *
  * \note

pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c

@@ -679 +679 @@
     }
 
-    /* Validation mode first! */
+    if (fmtp_bitrate == 0)
+        fmtp_bitrate = attr->info.avg_bps;
+
+    /* Validate bitrate */
     if (!fmtp_bitrate || !validate_mode(attr->info.clock_rate, fmtp_bitrate))
         return PJMEDIA_CODEC_EINMODE;

pjproject/trunk/pjmedia/src/test/codec_vectors.c

@@ -74 +74 @@
     codec_param.info.avg_bps = bitrate;
     codec_param.setting.vad = 0;
+
+    /* For G7221, the bitrate is set via param.setting.dec_fmtp, if it has
+     * no info about bitrate, the codec will check info.avg_bps. So, let's
+     * just clear the SDP fmtp.
+     */
+    if (pj_ansi_strstr(codec_name, "G7221/")) {
+        codec_param.setting.dec_fmtp.cnt = 0;
+    }
 
     status = pjmedia_codec_init(codec, pool);
@@ -325 +333 @@
     codec_param.info.avg_bps = bitrate;
     codec_param.setting.vad = 0;
+
+    /* For G7221, the bitrate is set via param.setting.dec_fmtp, if it has
+     * no info about bitrate, the codec will check info.avg_bps. So, let's
+     * just clear the SDP fmtp.
+     */
+    if (pj_ansi_strstr(codec_name, "G7221/")) {
+        codec_param.setting.dec_fmtp.cnt = 0;
+    }
 
     status = pjmedia_codec_init(codec, pool);