Changeset 3075 for pjproject/trunk/pjmedia/src/pjmedia-codec/passthrough.c

Timestamp:

Jan 26, 2010 6:54:28 PM (14 years ago)

Author:

bennylp

Message:

Undo r3074 for ticket #1028 as it is missing updated codec.h hence causing build errors (thanks Michael Bradley Jr for the report)

File:

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

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

@@ -25 +25 @@
 #include <pj/assert.h>
 #include <pj/log.h>
-#include <pj/math.h>
 #include <pj/pool.h>
 #include <pj/string.h>
@@ -682 +681 @@
         amr_settings_t *s;
         pj_uint8_t octet_align = 0;
-        pj_int8_t enc_mode;
-
-        enc_mode = pjmedia_codec_amr_get_mode(attr->info.avg_bps);
-        pj_assert(enc_mode >= 0 && enc_mode <= 8);
+        const pj_str_t STR_FMTP_OCTET_ALIGN = {"octet-align", 11};
 
         /* Fetch octet-align setting. It should be fine to fetch only 
@@ -692 +688 @@
          */
         for (i = 0; i < attr->setting.dec_fmtp.cnt; ++i) {
-            const pj_str_t STR_FMTP_OCTET_ALIGN = {"octet-align", 11};
-
             if (pj_stricmp(&attr->setting.dec_fmtp.param[i].name, 
                            &STR_FMTP_OCTET_ALIGN) == 0)
@@ -703 +697 @@
         }
 
-        for (i = 0; i < attr->setting.enc_fmtp.cnt; ++i) {
-            /* mode-set, encoding mode is chosen based on local default mode 
-             * setting:
-             * - if local default mode is included in the mode-set, use it
-             * - otherwise, find the closest mode to local default mode;
-             *   if there are two closest modes, prefer to use the higher
-             *   one, e.g: local default mode is 4, the mode-set param
-             *   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)
-            {
-                const char *p;
-                pj_size_t l;
-                pj_int8_t diff = 99;
-                
-                p = pj_strbuf(&attr->setting.enc_fmtp.param[i].val);
-                l = pj_strlen(&attr->setting.enc_fmtp.param[i].val);
-
-                while (l--) {
-                    if ((desc->pt==PJMEDIA_RTP_PT_AMR && *p>='0' && *p<='7') ||
-                        (desc->pt==PJMEDIA_RTP_PT_AMRWB && *p>='0' && *p<='8'))
-                    {
-                        pj_int8_t tmp = (pj_int8_t)(*p - '0' - enc_mode);
-
-                        if (PJ_ABS(diff) > PJ_ABS(tmp) || 
-                            (PJ_ABS(diff) == PJ_ABS(tmp) && tmp > diff))
-                        {
-                            diff = tmp;
-                            if (diff == 0) break;
-                        }
-                    }
-                    ++p;
-                }
-
-                if (diff == 99)
-                    return PJMEDIA_CODEC_EFAILED;
-
-                enc_mode = (pj_int8_t)(enc_mode + diff);
-
-                break;
-            }
-        }
-
         s = PJ_POOL_ZALLOC_T(pool, amr_settings_t);
         codec_data->codec_setting = s;
 
-        s->enc_mode = enc_mode;
+        s->enc_mode = pjmedia_codec_amr_get_mode(desc->def_bitrate);
         if (s->enc_mode < 0)
             return PJMEDIA_CODEC_EINMODE;
@@ -768 +716 @@
                                               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