Changeset 3795 for pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

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.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c (modified) (2 diffs)

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;