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

Timestamp:

Mar 2, 2011 8:37:31 AM (13 years ago)

Author:

nanang

Message:

Re #1182:

• Added remote frame-rate detection in to video stream.
• Fixed bitrate settings in ffmpeg codec.
• Fixed SDL dev to update internal SDL info when format changed.
• Minor fixes/updates, e.g:
  • added cleanup steps, fixed logs, etc, in sample app simpleua.c and vid_streamutil.c
  • fixed/added docs of the new APIs in the jitter buffer.

File:

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

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

@@ -182 +182 @@
                                                 /**< expected output format of 
                                                      ffmpeg decoder         */
-    struct SwsContext               *sws_ctx;   /**< the format converter for 
-                                                     post decoding          */
-
 } ffmpeg_private;
 
@@ -207 +204 @@
     pjmedia_vid_codec_info       info;
     pjmedia_format_id            base_fmt_id;
+    pj_uint32_t                  avg_bps;
+    pj_uint32_t                  max_bps;
     func_packetize               packetize;
     func_unpacketize             unpacketize;
@@ -248 +247 @@
     {
         {PJMEDIA_FORMAT_H263P,  {"H263-1998",9},    PJMEDIA_RTP_PT_H263},
-        PJMEDIA_FORMAT_H263,
+        PJMEDIA_FORMAT_H263,    1000000,    2000000,
         &h263_packetize, &h263_unpacketize, &h263_parse_fmtp,
         {2, { {{"CIF",3}, {"2",1}}, {{"QCIF",4}, {"1",1}}, } },
@@ -254 +253 @@
     {
         {PJMEDIA_FORMAT_H263,   {"H263",4},         PJMEDIA_RTP_PT_H263},
-        0,
+        0,                      1000000,    2000000,
         &h263_packetize, &h263_unpacketize, &h263_parse_fmtp,
         {2, { {{"CIF",3}, {"2",1}}, {{"QCIF",4}, {"1",1}}, } },
@@ -802 +801 @@
     attr->dec_fmtp = desc->dec_fmtp;
 
+    /* Bitrate */
+    attr->enc_fmt.det.vid.avg_bps = desc->avg_bps;
+    attr->enc_fmt.det.vid.max_bps = desc->max_bps;
+
     return PJ_SUCCESS;
 }
@@ -989 +992 @@
             ctx->time_base.num = vfd->fps.denum;
             ctx->time_base.den = vfd->fps.num;
-            if (vfd->avg_bps)
+            if (vfd->avg_bps) {
                 ctx->bit_rate = vfd->avg_bps;
-            if (vfd->max_bps)
-                ctx->rc_max_rate = vfd->max_bps;
+                if (vfd->max_bps)
+                    ctx->bit_rate_tolerance = vfd->max_bps - vfd->avg_bps;
+            }
 
             /* For encoder, should be better to be strict to the standards */
@@ -1124 +1128 @@
         av_free(ff->dec_ctx);
     }
-    if (ff->sws_ctx) {
-        sws_freeContext(ff->sws_ctx);
-    }
     ff->enc_ctx = NULL;
     ff->dec_ctx = NULL;
-    ff->sws_ctx = NULL;
     pj_mutex_unlock(ff_mutex);
 
@@ -1409 +1409 @@
 #ifdef _MSC_VER
 #   pragma comment( lib, "avcodec.lib")
-#   pragma comment( lib, "swscale.lib")
 #endif