Changeset 3500 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_codec.c

Timestamp:

Apr 6, 2011 1:55:01 PM (13 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/pjmedia/src/pjmedia/vid_codec.c (modified) (4 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_codec.c

@@ -307 +307 @@
 
 /*
- * Get codec info for static payload type.
+ * Get codec info for the specified payload type.
  */
 PJ_DEF(pj_status_t) pjmedia_vid_codec_mgr_get_codec_info(
@@ -316 +316 @@
     unsigned i;
 
-    PJ_ASSERT_RETURN(p_info && pt>=0 && pt < 96, PJ_EINVAL);
+    PJ_ASSERT_RETURN(p_info, PJ_EINVAL);
 
     if (!mgr) mgr = def_vid_codec_mgr;
@@ -369 +369 @@
 /*
  * Convert codec info struct into a unique codec identifier.
- * A codec identifier looks something like "L16/44100/2".
+ * A codec identifier looks something like "H263/34".
  */
 PJ_DEF(char*) pjmedia_vid_codec_info_to_id(
@@ -382 +382 @@
                            (int)info->encoding_name.slen,
                            info->encoding_name.ptr,
-                           info->clock_rate);
+                           info->pt);
 
     if (len < 1 || len >= (int)max_len) {