Commit 46b29397 authored by Stefano Sabatini's avatar Stefano Sabatini Committed by Anton Khirnov
Browse files

vf_scale: add a "sar" variable



Also create a "dar" alias for the "a" variable, for avoiding possible
confusion between dar/sar.
Signed-off-by: default avatarAnton Khirnov <anton@khirnov.net>
parent 0ec56d11
...@@ -1013,9 +1013,12 @@ the output (cropped) width and heigth ...@@ -1013,9 +1013,12 @@ the output (cropped) width and heigth
@item ow, oh @item ow, oh
same as @var{out_w} and @var{out_h} same as @var{out_w} and @var{out_h}
@item a @item dar, a
input display aspect ratio, same as @var{iw} / @var{ih} input display aspect ratio, same as @var{iw} / @var{ih}
@item sar
input sample aspect ratio
@item hsub, vsub @item hsub, vsub
horizontal and vertical chroma subsample values. For example for the horizontal and vertical chroma subsample values. For example for the
pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1. pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1.
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MAJOR 2
#define LIBAVFILTER_VERSION_MINOR 7 #define LIBAVFILTER_VERSION_MINOR 7
#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_MICRO 2
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \
......
...@@ -38,7 +38,8 @@ static const char *var_names[] = { ...@@ -38,7 +38,8 @@ static const char *var_names[] = {
"in_h", "ih", "in_h", "ih",
"out_w", "ow", "out_w", "ow",
"out_h", "oh", "out_h", "oh",
"a", "a", "dar",
"sar",
"hsub", "hsub",
"vsub", "vsub",
NULL NULL
...@@ -52,7 +53,8 @@ enum var_name { ...@@ -52,7 +53,8 @@ enum var_name {
VAR_IN_H, VAR_IH, VAR_IN_H, VAR_IH,
VAR_OUT_W, VAR_OW, VAR_OUT_W, VAR_OW,
VAR_OUT_H, VAR_OH, VAR_OUT_H, VAR_OH,
VAR_A, VAR_A, VAR_DAR,
VAR_SAR,
VAR_HSUB, VAR_HSUB,
VAR_VSUB, VAR_VSUB,
VARS_NB VARS_NB
...@@ -149,7 +151,9 @@ static int config_props(AVFilterLink *outlink) ...@@ -149,7 +151,9 @@ static int config_props(AVFilterLink *outlink)
var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h;
var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN;
var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN; var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN;
var_values[VAR_A] = (float) inlink->w / inlink->h; var_values[VAR_DAR] = var_values[VAR_A] = (float) inlink->w / inlink->h;
var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ?
(float) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1;
var_values[VAR_HSUB] = 1<<av_pix_fmt_descriptors[inlink->format].log2_chroma_w; var_values[VAR_HSUB] = 1<<av_pix_fmt_descriptors[inlink->format].log2_chroma_w;
var_values[VAR_VSUB] = 1<<av_pix_fmt_descriptors[inlink->format].log2_chroma_h; var_values[VAR_VSUB] = 1<<av_pix_fmt_descriptors[inlink->format].log2_chroma_h;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment