vaapi: allow build against older VA-API 0.31.

[ffmpeg] / libavfilter / vf_aspect.c

diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index bb7690b7d2093d0c649ace23194a7a2e1822644e..95900d15a9acde8db965e103f6fda1fd5cd28e1e 100644 (file)
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -34,21 +34,23 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
     AspectContext *aspect = ctx->priv;
     double  ratio;
     int64_t gcd;
+    char c = 0;
 
     if (args) {
-        if (sscanf(args, "%d:%d", &aspect->aspect.num, &aspect->aspect.den) < 2) {
-            if (sscanf(args, "%lf", &ratio) < 1) {
-                av_log(ctx, AV_LOG_ERROR,
-                       "Invalid string '%s' for aspect ratio.\n", args);
-                return AVERROR(EINVAL);
-            }
-            aspect->aspect = av_d2q(ratio, 100);
-        } else {
-            gcd = av_gcd(FFABS(aspect->aspect.num), FFABS(aspect->aspect.den));
-            if (gcd) {
-                aspect->aspect.num /= gcd;
-                aspect->aspect.den /= gcd;
-            }
+        if (sscanf(args, "%d:%d%c", &aspect->aspect.num, &aspect->aspect.den, &c) != 2)
+            if (sscanf(args, "%lf%c", &ratio, &c) == 1)
+                aspect->aspect = av_d2q(ratio, 100);
+
+        if (c || aspect->aspect.num <= 0 || aspect->aspect.den <= 0) {
+            av_log(ctx, AV_LOG_ERROR,
+                   "Invalid string '%s' for aspect ratio.\n", args);
+            return AVERROR(EINVAL);
+        }
+
+        gcd = av_gcd(FFABS(aspect->aspect.num), FFABS(aspect->aspect.den));
+        if (gcd) {
+            aspect->aspect.num /= gcd;
+            aspect->aspect.den /= gcd;
         }
     }
 
@@ -78,8 +80,11 @@ static int setdar_config_props(AVFilterLink *inlink)
                aspect->aspect.num * inlink->h,
                aspect->aspect.den * inlink->w, 100);
 
-    av_log(inlink->dst, AV_LOG_INFO, "w:%d h:%d -> dar:%d/%d par:%d/%d\n",
-           inlink->h, inlink->w, dar.num, dar.den, aspect->aspect.num, aspect->aspect.den);
+    av_log(inlink->dst, AV_LOG_INFO, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n",
+           inlink->w, inlink->h, dar.num, dar.den, aspect->aspect.num, aspect->aspect.den);
+
+    inlink->sample_aspect_ratio = aspect->aspect;
+
     return 0;
 }
 
@@ -106,6 +111,16 @@ AVFilter avfilter_vf_setdar = {
 #endif /* CONFIG_SETDAR_FILTER */
 
 #if CONFIG_SETSAR_FILTER
+/* for setdar filter, convert from frame aspect ratio to pixel aspect ratio */
+static int setsar_config_props(AVFilterLink *inlink)
+{
+    AspectContext *aspect = inlink->dst->priv;
+
+    inlink->sample_aspect_ratio = aspect->aspect;
+
+    return 0;
+}
+
 AVFilter avfilter_vf_setsar = {
     .name      = "setsar",
     .description = NULL_IF_CONFIG_SMALL("Set the pixel sample aspect ratio."),
@@ -116,6 +131,7 @@ AVFilter avfilter_vf_setsar = {
 
     .inputs    = (AVFilterPad[]) {{ .name             = "default",
                                     .type             = AVMEDIA_TYPE_VIDEO,
+                                    .config_props     = setsar_config_props,
                                     .get_video_buffer = avfilter_null_get_video_buffer,
                                     .start_frame      = start_frame,
                                     .end_frame        = avfilter_null_end_frame },