Changeset 5058 for pjproject/trunk/pjmedia/src/test/codec_vectors.c

Timestamp:

Apr 9, 2015 8:15:48 AM (9 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.

File:

• pjproject/trunk/pjmedia/src/test/codec_vectors.c (modified) (2 diffs)

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);