Changeset 3500 for pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Apr 6, 2011 1:55:01 PM (14 years ago)

Author:

nanang

Message:

Re #1186:

• Added custom negotiation callback mechanism in SDP negotiator, mainly for specific formats that require SDP fmtp negotiation.
• Modified video codec ID string to use encoding name+payload type (was encoding name+clock rate), also added encoding description in video codec info, so duplicated codecs (e.g: multiple H264 configurations) can be differentiated.
• Few enhancements for H264 in ffmpeg wrapper (e.g: added proper profile-id & packetization-mode setup).

File:

• pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

@@ -3758 +3758 @@
 
     for (i=0; i<count; ++i) {
+        pj_bzero(&id[i], sizeof(pjsua_codec_info));
+
         pjmedia_codec_info_to_id(&info[i], id[i].buf_, sizeof(id[i].buf_));
         id[i].codec_id = pj_str(id[i].buf_);
@@ -3875 +3877 @@
     for (i=0, j=0; i<count && j<*p_count; ++i) {
         if (info[i].has_rtp_pack) {
+            pj_bzero(&id[j], sizeof(pjsua_codec_info));
+
             pjmedia_vid_codec_info_to_id(&info[i], id[j].buf_, sizeof(id[j].buf_));
             id[j].codec_id = pj_str(id[j].buf_);
             id[j].priority = (pj_uint8_t) prio[i];
+            
+            if (id[j].codec_id.slen < sizeof(id[j].buf_)) {
+                id[j].desc.ptr = id[j].codec_id.ptr + id[j].codec_id.slen + 1;
+                pj_strncpy(&id[j].desc, &info[i].encoding_desc,
+                           sizeof(id[j].buf_) - id[j].codec_id.slen - 1);
+            }
+
             ++j;
         }