commit af8f4fa618fa1920fbe66f9d075266102702c522
author Nanang Izzuddin <nanang@teluu.com> Thu Apr 26 07:27:06 2012 +0000
committer Nanang Izzuddin <nanang@teluu.com> Thu Apr 26 07:27:06 2012 +0000
tree d0c5a0a30ea8f3d6eeb65ae483f686fa05e8c393
parent 972a42c24ff86d483a8cce5e1f4d6b16e7a9e5ad

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.



git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4089 74dad513-b988-da41-8d7b-12977e46ad98

pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
index fcb7ed5..04dc1f3 100644
--- a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
@@ -52,14 +52,12 @@
 # include <libavutil/opt.h>
 #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
 
@@ -69,8 +67,12 @@
  * (e.g: H263, H264).
  */
 #  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)
 
@@ -399,10 +401,10 @@
 	default:
 	    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));
 	}
 
 	/* Apply profile constraint bits. */
@@ -432,10 +434,10 @@
 	/* Misc x264 settings (performance, quality, latency, etc).
 	 * 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'"));
 	}
     }