Changeset 2236 for pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

Timestamp:

Aug 25, 2008 1:58:25 PM (16 years ago)

Author:

nanang

Message:

Ticket #599:

• Added "dec_fmtp" and "enc_fmtp" fields to pjmedia_codec_param.setting.
• Codec factory puts its default parameters in "dec_fmtp" field.
• pjmedia_stream_info_from_sdp() puts the "fmtp" attribute in SDP to pjmedia_codec_param.
• Special treatment for fmtp "bitrate" parameter (of G722.1) during SDP negotiation
• Added maxptime field in stream_info.
• Replaced iLBC's fmtp "mode" implementation to use general fmtp mechanism.
• Added some test scripts for G722.1 bitrate negotiation.

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -534 +534 @@
 }
 
+/* Matching G722.1 bitrates between offer and answer.
+ */
+static pj_bool_t match_g7221( const pjmedia_sdp_media *offer,
+                              unsigned o_fmt_idx,
+                              const pjmedia_sdp_media *answer,
+                              unsigned a_fmt_idx)
+{
+    const pjmedia_sdp_attr *a_ans;
+    const pjmedia_sdp_attr *a_off;
+    pjmedia_sdp_fmtp fmtp;
+    unsigned a_bitrate = 0, o_bitrate = 0;
+    const pj_str_t bitrate = {"bitrate=", 8};
+    const char *p;
+
+    a_ans = pjmedia_sdp_media_find_attr2(answer, "fmtp", 
+                                         &answer->desc.fmt[a_fmt_idx]);
+    if (!a_ans)
+        return PJ_FALSE;
+
+    if (pjmedia_sdp_attr_get_fmtp(a_ans, &fmtp) != PJ_SUCCESS)
+        return PJ_FALSE;
+
+    p = pj_stristr(&fmtp.fmt_param, &bitrate);
+    if (p == NULL)
+        return PJ_FALSE;
+
+    a_bitrate = atoi(p + bitrate.slen);
+
+    a_off = pjmedia_sdp_media_find_attr2(offer, "fmtp", 
+                                         &offer->desc.fmt[o_fmt_idx]);
+    if (!a_off)
+        return PJ_FALSE;
+
+    if (pjmedia_sdp_attr_get_fmtp(a_off, &fmtp) != PJ_SUCCESS)
+        return PJ_FALSE;
+
+    p = pj_stristr(&fmtp.fmt_param, &bitrate);
+    if (p == NULL)
+        return PJ_FALSE;
+
+    o_bitrate = atoi(p + bitrate.slen);
+
+    return (a_bitrate == o_bitrate);
+}
+
 /* Update single local media description to after receiving answer
  * from remote.
@@ -658 +703 @@
                              (ar.param.slen==1 && *ar.param.ptr=='1')))
                         {
-                            /* Match! */
-                            break;
+                            /* Further check for G7221, negotiate bitrate. */
+                            if (pj_strcmp2(&or_.enc_name, "G7221") == 0) {
+                                if (match_g7221(offer, i, answer, j))
+                                    break;
+                            } else {
+                                /* Match! */
+                                break;
+                            }
                         }
                     }
@@ -872 +923 @@
                         {
                             /* Match! */
-                            if (is_codec)
+                            if (is_codec) {
+                                /* Further check for G7221, negotiate bitrate. */
+                                if (pj_strcmp2(&or_.enc_name, "G7221")  == 0 &&
+                                    match_g7221(offer, i, preanswer, j) == 0)
+                                {
+                                    continue;
+                                }
                                 found_matching_codec = 1;
-                            else
+                            } else {
                                 found_matching_telephone_event = 1;
+                            }
+
                             pt_answer[pt_answer_count++] = preanswer->desc.fmt[j];
                             break;