Changeset 4089 for pjproject/trunk

Timestamp:

Apr 26, 2012 7:27:06 AM (13 years ago)

Author:

nanang

Message:

Misc (re #1446): Updated ffmpeg compatibility issues, e.g: av_set_int() return code not match to av_opt_set_int(), update libavcodec version to at least 53.61 for av_opt_set*() usage.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c (modified) (4 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
@@ -70 +68 @@
  */
 #  define AVCODEC_HAS_ENCODE(c)         (c->encode || c->encode2)
+#  define AV_OPT_SET(obj,name,val,opt)  (av_opt_set(obj,name,val,opt)==0)
+#  define AV_OPT_SET_INT(obj,name,val)  (av_opt_set_int(obj,name,val,0)==0)
 #else
 #  define AVCODEC_HAS_ENCODE(c)         (c->encode)
+#  define AV_OPT_SET(obj,name,val,opt)  (av_set_string3(obj,name,val,opt,NULL)==0)
+#  define AV_OPT_SET_INT(obj,name,val)  (av_set_int(obj,name,val)!=NULL)
 #endif
 #define AVCODEC_HAS_DECODE(c)           (c->decode)
@@ -400 +402 @@
             break;
         }
-        if (profile &&
-            AV_OPT_SET(ctx->priv_data, "profile", profile, 0))
+        if (profile && !AV_OPT_SET(ctx->priv_data, "profile", profile, 0))
         {
-            PJ_LOG(3, (THIS_FILE, "Failed to set H264 profile"));
+            PJ_LOG(3, (THIS_FILE, "Failed to set H264 profile to '%s'",
+                       profile));
         }
 
@@ -433 +435 @@
          * Let's just use the x264 predefined preset & tune.
          */
-        if (AV_OPT_SET(ctx->priv_data, "preset", "veryfast", 0)) {
+        if (!AV_OPT_SET(ctx->priv_data, "preset", "veryfast", 0)) {
             PJ_LOG(3, (THIS_FILE, "Failed to set x264 preset 'veryfast'"));
         }
-        if (AV_OPT_SET(ctx->priv_data, "tune", "animation+zerolatency", 0)) {
+        if (!AV_OPT_SET(ctx->priv_data, "tune", "animation+zerolatency", 0)) {
             PJ_LOG(3, (THIS_FILE, "Failed to set x264 tune 'zerolatency'"));
         }