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

Timestamp:

Mar 17, 2011 11:33:34 AM (14 years ago)

Author:

bennylp

Message:

Re #1215 (framework):

• vstream:
  • allow NULL pool parameter which means vstream will create one
  • Updated remote FPS detection to only be performed if decoder returns frame (however the FPS detection is currently disabled as some endpoints changes fps continuously, causing renderer restart continuously too).
• codec:
  • Updated video codec info to have RTP packetization support flag, also update endpoint in generating SDP to only include codecs whose RTP packetization support.
  • Added dynamic payload types for video codecs.
  • (minor) separate video PT into separate enum in pjmedia-codec/types.h
• H264 initial experiment.

generated frames (for libx264 sake).

• Replaced PJ_EUNKNOWN in some places with the appropriate error code.

File:

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

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

@@ -246 +246 @@
 {
     {
-        {PJMEDIA_FORMAT_H263P,  {"H263-1998",9},    PJMEDIA_RTP_PT_H263},
+        {PJMEDIA_FORMAT_H263P,  {"H263-1998",9},    PJMEDIA_RTP_PT_H263P},
         PJMEDIA_FORMAT_H263,    1000000,    2000000,
         &h263_packetize, &h263_unpacketize, &h263_parse_fmtp,
@@ -258 +258 @@
     },
     {
+        {PJMEDIA_FORMAT_H264,   {"H264",4},         PJMEDIA_RTP_PT_H264},
+    },
+    {
         {PJMEDIA_FORMAT_H261,   {"H261",4},         PJMEDIA_RTP_PT_H261},
     },
@@ -264 +267 @@
     },
     {
-        {PJMEDIA_FORMAT_MPEG4,  {"MP4V",4},         PJMEDIA_RTP_PT_MPV},
+        {PJMEDIA_FORMAT_MPEG4,  {"MP4V",4}},
     },
     {
-        {PJMEDIA_FORMAT_XVID,   {"XVID",4},         PJMEDIA_RTP_PT_MPV},
+        {PJMEDIA_FORMAT_XVID,   {"XVID",4}},
         PJMEDIA_FORMAT_MPEG4,
     },
@@ -452 +455 @@
                 PJ_TODO(NOTIFY_APP_ABOUT_THIS_NEW_ENCODING_FORMAT);
             } else {
-                return PJ_EUNKNOWN;
+                return PJMEDIA_EBADFMT;
             }
         }
@@ -532 +535 @@
     avcodec_init();
     avcodec_register_all();
+    av_log_set_level(AV_LOG_ERROR);
 
     /* Enum FFMPEG codecs */
@@ -649 +653 @@
         if (desc->info.clock_rate == 0)
             desc->info.clock_rate = 90000;
+
+        /* Set RTP packetization support flag in the codec info */
+        desc->info.has_rtp_pack = (desc->packetize != NULL) &&
+                                  (desc->unpacketize != NULL);
     }
 
@@ -994 +1002 @@
             if (vfd->avg_bps) {
                 ctx->bit_rate = vfd->avg_bps;
-                if (vfd->max_bps)
+                if (vfd->max_bps > vfd->avg_bps)
                     ctx->bit_rate_tolerance = vfd->max_bps - vfd->avg_bps;
+            }
+
+            /* Libx264 experimental setting (it rejects ffmpeg defaults) */
+            if (ff->param.enc_fmt.id == PJMEDIA_FORMAT_H264) {
+                ctx->me_range = 16;
+                ctx->max_qdiff = 4;
+                ctx->qmin = 10;
+                ctx->qmax = 51;
+                ctx->qcompress = 0.6f;
             }
 
@@ -1027 +1044 @@
         if (err < 0) {
             print_ffmpeg_err(err);
-            return PJ_EUNKNOWN;
+            return PJMEDIA_CODEC_EFAILED;
         }
 
@@ -1219 +1236 @@
 
     avcodec_get_frame_defaults(&avframe);
+    avframe.pts = input->timestamp.u64;
     
     for (i = 0; i < ff->enc_vfi->plane_cnt; ++i) {
@@ -1249 +1267 @@
     if (err < 0) {
         print_ffmpeg_err(err);
-        return PJ_EUNKNOWN;
+        return PJMEDIA_CODEC_EFAILED;
     } else {
         output->size = err;
@@ -1301 +1319 @@
 
     output->bit_info = 0;
+    output->timestamp = input->timestamp;
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52 && LIBAVCODEC_VERSION_MINOR >= 72
@@ -1316 +1335 @@
 #endif
     if (err < 0) {
+        output->type = PJMEDIA_FRAME_TYPE_NONE;
+        output->size = 0;
         print_ffmpeg_err(err);
-        return PJ_EUNKNOWN;
+        return PJMEDIA_CODEC_EFAILED;
     } else if (got_picture) {
         pjmedia_video_apply_fmt_param *vafp = &ff->dec_vafp;
@@ -1347 +1368 @@
             ff->dec_vfi = pjmedia_get_video_format_info(NULL, ff->param.dec_fmt.id);
             if (!ff->dec_vfi)
-                return PJ_EUNKNOWN;
+                return PJ_ENOTSUP;
             pj_bzero(&ff->dec_vafp, sizeof(ff->dec_vafp));
             ff->dec_vafp.size = ff->param.dec_fmt.det.vid.size;
@@ -1385 +1406 @@
         }
 
+        output->type = PJMEDIA_FRAME_TYPE_VIDEO;
         output->size = vafp->framebytes;
     } else {
-        return PJ_EUNKNOWN;
-    }
-
+        output->type = PJMEDIA_FRAME_TYPE_NONE;
+        output->size = 0;
+    }
+    
     return PJ_SUCCESS;
 }