Changeset 3995

Timestamp:

Mar 29, 2012 10:54:01 AM (13 years ago)

Author:

nanang

Message:

Fix #1473: Fixed H263 encoder setting negotiation in pjmedia_vid_codec_h263_apply_fmtp() to be based on pjmedia_vid_codec_param.enc_fmt.det.vid.fps (it was based on local H263 SDP fmtp).

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_codec_util.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_codec_util.c

@@ -150 +150 @@
 
 
+static unsigned fps_to_mpi(const pjmedia_ratio *fps) 
+{
+    unsigned mpi;
+
+    /* Original formula = (fps->denum * 30000) / (fps->num * 1001) */
+    mpi = (fps->denum*30000 + fps->num*1001/2) / (fps->num*1001);
+    
+    /* Normalize, should be in the range of 1-32 */
+    if (mpi > 32) mpi = 32;
+    if (mpi < 1) mpi = 1;
+
+    return mpi;
+};
+
 PJ_DEF(pj_status_t) pjmedia_vid_codec_h263_apply_fmtp(
                                 pjmedia_vid_codec_param *param)
@@ -160 +174 @@
         pj_status_t status;
 
+        vfd = pjmedia_format_get_video_format_detail(&param->enc_fmt,
+                                                     PJ_TRUE);
+
         /* Get local param */
-        status = pjmedia_vid_codec_parse_h263_fmtp(&param->dec_fmtp,
-                                                   &fmtp_loc);
-        if (status != PJ_SUCCESS)
-            return status;
+        // Local param should be fetched from "param->enc_fmt" instead of
+        // "param->dec_fmtp".
+        //status = pjmedia_vid_codec_parse_h263_fmtp(&param->dec_fmtp,
+        //                                         &fmtp_loc);
+        //if (status != PJ_SUCCESS)
+        //    return status;
+        fmtp_loc.mpi_cnt = 1;
+        fmtp_loc.mpi[0].size = vfd->size;
+        fmtp_loc.mpi[0].val  = fps_to_mpi(&vfd->fps);
 
         /* Get remote param */
@@ -178 +200 @@
             size.h = 144;
             mpi    = 1;
-        } else if (fmtp_loc.mpi_cnt == 0) {
-            /* Local MPI setting not set, just use remote preference. */
-            size = fmtp_rem.mpi[0].size;
-            mpi  = fmtp_rem.mpi[0].val;
+        //} else if (fmtp_loc.mpi_cnt == 0) {
+        //    /* Local MPI setting not set, just use remote preference. */
+        //    size = fmtp_rem.mpi[0].size;
+        //    mpi  = fmtp_rem.mpi[0].val;
         } else {
             /* Both have preferences, let's try to match them */
@@ -220 +242 @@
 
         /* Apply the negotiation result */
-        vfd = pjmedia_format_get_video_format_detail(&param->enc_fmt,
-                                                     PJ_TRUE);
         vfd->size = size;
         vfd->fps.num = 30000;