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

Timestamp:

Oct 21, 2011 1:36:02 AM (13 years ago)

Author:

nanang

Message:

Re #1390: Fixed ffmpeg codecs to update size & fps in AVCodecContext after applying SDP fmtp to codec param.

File:

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

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

@@ -349 +349 @@
 
     if (ff->param.dir & PJMEDIA_DIR_ENCODING) {
+        pjmedia_video_format_detail *vfd;
         AVCodecContext *ctx = ff->enc_ctx;
         const char *profile = NULL;
+
+        vfd = pjmedia_format_get_video_format_detail(&ff->param.enc_fmt, 
+                                                     PJ_TRUE);
+
+        /* Override generic params after applying SDP fmtp */
+        ctx->width = vfd->size.w;
+        ctx->height = vfd->size.h;
+        ctx->time_base.num = vfd->fps.denum;
+        ctx->time_base.den = vfd->fps.num;
 
         /* Apply profile. */
@@ -474 +484 @@
     if (!ff->param.ignore_fmtp) {
         status = pjmedia_vid_codec_h263_apply_fmtp(&ff->param);
+    }
+
+    /* Override generic params after applying SDP fmtp */
+    if (ff->param.dir & PJMEDIA_DIR_ENCODING) {
+        pjmedia_video_format_detail *vfd;
+        AVCodecContext *ctx = ff->enc_ctx;
+
+        vfd = pjmedia_format_get_video_format_detail(&ff->param.enc_fmt, 
+                                                     PJ_TRUE);
+
+        /* Override generic params after applying SDP fmtp */
+        ctx->width = vfd->size.w;
+        ctx->height = vfd->size.h;
+        ctx->time_base.num = vfd->fps.denum;
+        ctx->time_base.den = vfd->fps.num;
     }
 
@@ -1085 +1110 @@
     }
 
-    /* Init codec override generic params or apply specific params before
-     * the codec opened.
+    /* Override generic params or apply specific params before opening
+     * the codec.
      */
     if (ff->desc->preopen) {