Changeset 4081

Timestamp:

Apr 24, 2012 1:06:39 PM (12 years ago)

Author:

bennylp

Message:

Misc (re #1446): support newer libavcodec version (major: 54) which deprecated few APIs

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c (modified) (9 diffs)

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

@@ -53 +53 @@
 #endif
 
+/* Various compatibility */
+#if LIBAVCODEC_VER_AT_LEAST(53,20)
+#  define AV_OPT_SET(obj,name,val,opt)  av_opt_set(obj,name,val,opt)
+#  define AV_OPT_SET_INT(obj,name,val)  av_opt_set_int(obj,name,val,0)
+#  define AVCODEC_OPEN(ctx,c)           avcodec_open2(ctx,c,NULL)
+#else
+#  define AV_OPT_SET(obj,name,val,opt)  av_set_string3(obj,name,val,opt,NULL)
+#  define AV_OPT_SET_INT(obj,name,val)  av_set_int(obj,name,val)
+#  define AVCODEC_OPEN(ctx,c)           avcodec_open(ctx,c)
+#endif
+
 
 /* Prototypes for FFMPEG codecs factory */
@@ -379 +390 @@
         }
         if (profile &&
-            av_set_string3(ctx->priv_data, "profile", profile, 0, NULL))
+            AV_OPT_SET(ctx->priv_data, "profile", profile, 0))
         {
             PJ_LOG(3, (THIS_FILE, "Failed to set H264 profile"));
@@ -396 +407 @@
 
         /* Limit NAL unit size as we prefer single NAL unit packetization */
-        if (!av_set_int(ctx->priv_data, "slice-max-size", ff->param.enc_mtu))
+        if (!AV_OPT_SET_INT(ctx->priv_data, "slice-max-size", ff->param.enc_mtu))
         {
             PJ_LOG(3, (THIS_FILE, "Failed to set H264 max NAL size to %d",
@@ -403 +414 @@
 
         /* Apply intra-refresh */
-        if (!av_set_int(ctx->priv_data, "intra-refresh", 1))
+        if (!AV_OPT_SET_INT(ctx->priv_data, "intra-refresh", 1))
         {
             PJ_LOG(3, (THIS_FILE, "Failed to set x264 intra-refresh"));
@@ -411 +422 @@
          * Let's just use the x264 predefined preset & tune.
          */
-        if (av_set_string3(ctx->priv_data, "preset", "veryfast", 0, NULL))
-        {
+        if (AV_OPT_SET(ctx->priv_data, "preset", "veryfast", 0)) {
             PJ_LOG(3, (THIS_FILE, "Failed to set x264 preset 'veryfast'"));
         }
-        if (av_set_string3(ctx->priv_data, "tune", "animation+zerolatency",
-                           0, NULL))
-        {
+        if (AV_OPT_SET(ctx->priv_data, "tune", "animation+zerolatency", 0)) {
             PJ_LOG(3, (THIS_FILE, "Failed to set x264 tune 'zerolatency'"));
         }
@@ -595 +603 @@
 
     pjmedia_ffmpeg_add_ref();
+#if !LIBAVCODEC_VER_AT_LEAST(53,20)
+    /* avcodec_init() dissappeared between version 53.20 and 54.15, not sure
+     * exactly when 
+     */
     avcodec_init();
+#endif
     avcodec_register_all();
 
@@ -1120 +1133 @@
          * not working (e.g: rate control).
          */
-#if LIBAVCODEC_VER_AT_LEAST(52,113)
+#if LIBAVCODEC_VER_AT_LEAST(52,113) && !LIBAVCODEC_VER_AT_LEAST(53,20)
         ctx->rc_lookahead = 0;
 #endif
@@ -1151 +1164 @@
 
         pj_mutex_lock(ff_mutex);
-        err = avcodec_open(ff->enc_ctx, ff->enc);
+        err = AVCODEC_OPEN(ff->enc_ctx, ff->enc);
         pj_mutex_unlock(ff_mutex);
         if (err < 0) {
@@ -1166 +1179 @@
 
         pj_mutex_lock(ff_mutex);
-        err = avcodec_open(ff->dec_ctx, ff->dec);
+        err = AVCODEC_OPEN(ff->dec_ctx, ff->dec);
         pj_mutex_unlock(ff_mutex);
         if (err < 0) {