Changeset 3100 for pjproject/trunk

Timestamp:

Feb 17, 2010 5:31:19 PM (15 years ago)

Author:

bennylp

Message:

More ticket #1028: fixed compile error caused by corrupted version of passthrough.c when re-commiting r3074 (in r3078). (note: this changeset was originally done by nanang, recheckedin due to moving svn repository)

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/passthrough.c (modified) (4 diffs)

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

@@ -682 +682 @@
         amr_settings_t *s;
         pj_uint8_t octet_align = 0;
-        const pj_str_t STR_FMTP_OCTET_ALIGN = {"octet-align", 11};
-
-        /* Fetch octet-align setting. It should be fine to fetch only 
-         * the decoder, since encoder & decoder must use the same setting 
-         * (RFC 4867 section 8.3.1).
-         */
+        pj_int8_t enc_mode;
+        
+        enc_mode = pjmedia_codec_amr_get_mode(attr->info.avg_bps);
+        pj_assert(enc_mode >= 0 && enc_mode <= 8);
+
         for (i = 0; i < attr->setting.dec_fmtp.cnt; ++i) {
+            const pj_str_t STR_FMTP_OCTET_ALIGN = {"octet-align", 11};
+            
+            /* Fetch octet-align setting. It should be fine to fetch only 
+             * the decoder, since encoder & decoder must use the same setting 
+             * (RFC 4867 section 8.3.1).
+             */
             if (pj_stricmp(&attr->setting.dec_fmtp.param[i].name, 
                            &STR_FMTP_OCTET_ALIGN) == 0)
@@ -699 +704 @@
 
         for (i = 0; i < attr->setting.enc_fmtp.cnt; ++i) {
+            const pj_str_t STR_FMTP_MODE_SET = {"mode-set", 8};
+
             /* mode-set, encoding mode is chosen based on local default mode 
              * setting:
@@ -707 +714 @@
              *   contains '2,3,5,6', then 5 will be chosen.
              */
-            const pj_str_t STR_FMTP_MODE_SET = {"mode-set", 8};
-            
             if (pj_stricmp(&attr->setting.enc_fmtp.param[i].name, 
                            &STR_FMTP_MODE_SET) == 0)
@@ -763 +768 @@
                                               doesn't do sensitivity bits 
                                               reordering */
+        
+        /* Return back bitrate info to application */
+        attr->info.avg_bps = s->enc_setting.amr_nb?
+                             pjmedia_codec_amrnb_bitrates[s->enc_mode]:
+                             pjmedia_codec_amrwb_bitrates[s->enc_mode];
     }
 #endif