Changeset 3795

Timestamp:

Oct 6, 2011 6:37:46 AM (13 years ago)

Author:

nanang

Message:

Close #1381:

• Added 'ignore_fmtp' field in pjmedia_vid_codec_param to allow application to omit SDP fmtp in codec param without risking video size and frame rate param being overridden with default values.
• Updated sample app vid_streamutil.c to use that field, which currently not supplying SDP fmtp to video codec.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/vid_codec.h (modified) (1 diff)
• pjmedia/src/pjmedia-codec/ffmpeg_codecs.c (modified) (2 diffs)
• pjsip-apps/src/samples/vid_streamutil.c (modified) (4 diffs)

pjproject/trunk/pjmedia/include/pjmedia/vid_codec.h

@@ -127 +127 @@
     pjmedia_codec_fmtp  dec_fmtp;       /**< Decoder fmtp params            */
 
+    pj_bool_t           ignore_fmtp;    /**< Ignore fmtp params. If set to
+                                             PJ_TRUE, the codec will apply
+                                             format settings specified in
+                                             enc_fmt and dec_fmt only.      */
+
 } pjmedia_vid_codec_param;
 

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

@@ -342 +342 @@
 
     /* Apply SDP fmtp to format in codec param */
-    status = pjmedia_vid_codec_h264_apply_fmtp(&ff->param);
-    if (status != PJ_SUCCESS)
-        return status;
+    if (!ff->param.ignore_fmtp) {
+        status = pjmedia_vid_codec_h264_apply_fmtp(&ff->param);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
 
     if (ff->param.dir & PJMEDIA_DIR_ENCODING) {
@@ -449 +451 @@
 
     /* Apply fmtp settings to codec param */
-    status = pjmedia_vid_codec_h263_apply_fmtp(&ff->param);
+    if (!ff->param.ignore_fmtp) {
+        status = pjmedia_vid_codec_h263_apply_fmtp(&ff->param);
+    }
 
     return status;

pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c

@@ -709 +709 @@
             status = pjmedia_vid_dev_default_param(
                                         pool,
-                                        0,//PJMEDIA_VID_DEFAULT_CAPTURE_DEV,
+                                        PJMEDIA_VID_DEFAULT_CAPTURE_DEV,
                                         &vpp.vidparam);
             if (status != PJ_SUCCESS)
@@ -727 +727 @@
             status = pjmedia_vid_dev_default_param(
                                         pool,
-                                        1,//PJMEDIA_VID_DEFAULT_RENDER_DEV,
+                                        PJMEDIA_VID_DEFAULT_RENDER_DEV,
                                         &vpp.vidparam);
             if (status != PJ_SUCCESS)
@@ -741 +741 @@
         }
     }
+
+    /* Set to ignore fmtp */
+    codec_param.ignore_fmtp = PJ_TRUE;
 
     /* Create stream based on program arguments */
@@ -796 +799 @@
         status = pjmedia_vid_dev_default_param(
                                 pool,
-                                1,//PJMEDIA_VID_DEFAULT_RENDER_DEV,
+                                PJMEDIA_VID_DEFAULT_RENDER_DEV,
                                 &vpp.vidparam);
         if (status != PJ_SUCCESS)