Changeset 3522 for pjproject/branches/projects/2.0-dev

Timestamp:

Apr 11, 2011 8:04:27 PM (14 years ago)

Author:

nanang

Message:

Re #1219:

• Applied max RTP payload size ffmpeg setting (for customized ffmpeg patch only).
• Updated some ffmpeg setting (qmin, qmax) for bitrate control.
• Updated ffmpeg codec default size for decoding direction.
• Removed own timestamp management in ffmpeg encoder.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c (modified) (4 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

@@ -261 +261 @@
               {{"QCIF",4},  {"1",1}}, } },
     },
+/*
+    {
+        {PJMEDIA_FORMAT_H263, PJMEDIA_RTP_PT_H263, {"H263",4}},
+        PJMEDIA_FORMAT_H263,    1000000,    2000000,
+        &h263_packetize, &h263_unpacketize, &h263_preopen, NULL, NULL,
+        {2, { {{"CIF",3},   {"1",1}}, 
+              {{"QCIF",4},  {"1",1}}, } },
+    },
+*/
     {
         {PJMEDIA_FORMAT_H263,   PJMEDIA_RTP_PT_H263,    {"H263",4}},
@@ -351 +360 @@
         ctx->me_range = 16;
         ctx->max_qdiff = 4;
-        ctx->qmin = 10;
-        ctx->qmax = 51;
+        ctx->qmin = 20;
+        ctx->qmax = 32;
         ctx->qcompress = 0.6f;
+
+        ctx->rtp_payload_size = ff->param.enc_mtu;
     }
 
@@ -789 +800 @@
     /* Decoded format */
     pjmedia_format_init_video(&attr->dec_fmt, desc->info.dec_fmt_id[0],
-                              352, 288, 30000, 1001);
+                              //352, 288, 30000, 1001);
+                              720, 576, 30000, 1001);
 
     /* Decoding fmtp */
@@ -1249 +1261 @@
 
     avcodec_get_frame_defaults(&avframe);
+
+    // Let ffmpeg manage the timestamps
+    /*
     src_timebase.num = 1;
     src_timebase.den = ff->desc->info.clock_rate;
     avframe.pts = av_rescale_q(input->timestamp.u64, src_timebase,
                                ff->enc_ctx->time_base);
+    */
     
     for (i[0] = 0; i[0] < ff->enc_vfi->plane_cnt; ++i[0]) {