Changeset 3972 for pjproject/trunk

Timestamp:

Mar 9, 2012 3:29:05 AM (13 years ago)

Author:

nanang

Message:

Misc (re #1446): Updated ffmpeg video codecs default params:

• decoder fps to be 1.5x faster than encoder's, to encounter accumulated frames in jbuf when decoder clock gets short pauses in video setup (e.g: renderer creation, format change)
• separate size & fps for H.264 and H.263

File:

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

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

@@ -212 +212 @@
                                                      to copy this codec desc
                                                      from its base format   */
+    pjmedia_rect_size            size;
+    pjmedia_ratio                fps;
     pj_uint32_t                  avg_bps;
     pj_uint32_t                  max_bps;
@@ -256 +258 @@
         {PJMEDIA_FORMAT_H264, PJMEDIA_RTP_PT_H264, {"H264",4},
          {"Constrained Baseline (level=30, pack=1)", 39}},
-        0,      256000,    512000,
+        0,
+        {720, 480},     {30, 1},        256000, 512000,
         &h264_packetize, &h264_unpacketize, &h264_preopen, &h264_postopen,
         &pjmedia_vid_codec_h264_match_sdp,
@@ -268 +271 @@
     {
         {PJMEDIA_FORMAT_H263P, PJMEDIA_RTP_PT_H263P, {"H263-1998",9}},
-        PJMEDIA_FORMAT_H263,    256000,    512000,
+        PJMEDIA_FORMAT_H263,
+        {352, 288},     {30000, 1001},  256000, 512000,
         &h263_packetize, &h263_unpacketize, &h263_preopen, NULL, NULL,
         {2, { {{"CIF",3},   {"1",1}}, 
@@ -914 +918 @@
     /* Encoded format */
     pjmedia_format_init_video(&attr->enc_fmt, desc->info.fmt_id,
-                              720, 480, 30000, 1001);
+                              desc->size.w, desc->size.h,
+                              desc->fps.num, desc->fps.denum);
 
     /* Decoded format */
     pjmedia_format_init_video(&attr->dec_fmt, desc->info.dec_fmt_id[0],
-                              //352, 288, 30000, 1001);
-                              720, 576, 30000, 1001);
+                              desc->size.w, desc->size.h,
+                              desc->fps.num*3/2, desc->fps.denum);
 
     /* Decoding fmtp */