Special values are:
0 = original width/height
-1 = keep original aspect
This is in preparation for re-using VPPContext for scale_qsv filter
---
libavfilter/vf_vpp_qsv.c | 47 ++++++++++++++++++++++++++++++++++------
1 file changed, 40 insertions(+), 7 deletions(-)
diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c
index adcfd0484d..7afbb3c983 100644
--- a/libavfilter/vf_vpp_qsv.c
+++ b/libavfilter/vf_vpp_qsv.c
@@ -59,6 +59,11 @@ typedef struct VPPContext{
mfxExtVPPRotation rotation_conf;
mfxExtVPPMirroring mirroring_conf;
+ /**
+ * New dimensions. Special values are:
+ * 0 = original width/height
+ * -1 = keep original aspect
+ */
int out_width;
int out_height;
/**
@@ -122,10 +127,10 @@ static const AVOption options[] = {
{ "cx", "set the x crop area expression", OFFSET(cx),
AV_OPT_TYPE_STRING, { .str = "(in_w-out_w)/2" }, 0, 0, FLAGS },
{ "cy", "set the y crop area expression", OFFSET(cy),
AV_OPT_TYPE_STRING, { .str = "(in_h-out_h)/2" }, 0, 0, FLAGS },
- { "w", "Output video width", OFFSET(ow), AV_OPT_TYPE_STRING, {
.str="cw" }, 0, 255, .flags = FLAGS },
- { "width", "Output video width", OFFSET(ow), AV_OPT_TYPE_STRING, {
.str="cw" }, 0, 255, .flags = FLAGS },
- { "h", "Output video height", OFFSET(oh), AV_OPT_TYPE_STRING, {
.str="w*ch/cw" }, 0, 255, .flags = FLAGS },
- { "height", "Output video height", OFFSET(oh), AV_OPT_TYPE_STRING, {
.str="w*ch/cw" }, 0, 255, .flags = FLAGS },
+ { "w", "Output video width(0=input video width, -1=keep input video
aspect)", OFFSET(ow), AV_OPT_TYPE_STRING, { .str="cw" }, 0, 255, .flags =
FLAGS },
+ { "width", "Output video width(0=input video width, -1=keep input video
aspect)", OFFSET(ow), AV_OPT_TYPE_STRING, { .str="cw" }, 0, 255, .flags =
FLAGS },
+ { "h", "Output video height(0=input video height, -1=keep input video
aspect)", OFFSET(oh), AV_OPT_TYPE_STRING, { .str="w*ch/cw" }, 0, 255, .flags =
FLAGS },
+ { "height", "Output video height(0=input video height, -1=keep input video
aspect)", OFFSET(oh), AV_OPT_TYPE_STRING, { .str="w*ch/cw" }, 0, 255, .flags =
FLAGS },
{ "format", "Output pixel format", OFFSET(output_format_str),
AV_OPT_TYPE_STRING, { .str = "same" }, .flags = FLAGS },
{ "async_depth", "Internal parallelization depth, the higher the value the
higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = 0 },
0, INT_MAX, .flags = FLAGS },
@@ -267,6 +272,7 @@ static int config_input(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->dst;
VPPContext *vpp = ctx->priv;
int ret;
+ int64_t ow, oh;
if (vpp->framerate.den == 0 || vpp->framerate.num == 0)
vpp->framerate = inlink->frame_rate;
@@ -280,11 +286,38 @@ static int config_input(AVFilterLink *inlink)
return ret;
}
- if (vpp->out_height == 0 || vpp->out_width == 0) {
- vpp->out_width = inlink->w;
- vpp->out_height = inlink->h;
+ ow = vpp->out_width;
+ oh = vpp->out_height;
+
+ /* sanity check params */
+ if (ow < -1 || oh < -1) {
+ av_log(ctx, AV_LOG_ERROR, "Size values less than -1 are not
acceptable.\n");
+ return AVERROR(EINVAL);
}
+ if (ow == -1 && oh == -1)
+ vpp->out_width = vpp->out_height = 0;
+
+ if (!(ow = vpp->out_width))
+ ow = inlink->w;
+
+ if (!(oh = vpp->out_height))
+ oh = inlink->h;
+
+ if (ow == -1)
+ ow = av_rescale(oh, inlink->w, inlink->h);
+
+ if (oh == -1)
+ oh = av_rescale(ow, inlink->h, inlink->w);
+
+ if (ow > INT_MAX || oh > INT_MAX ||
+ (oh * inlink->w) > INT_MAX ||
+ (ow * inlink->h) > INT_MAX)
+ av_log(ctx, AV_LOG_ERROR, "Rescaled value for width or height is too
big.\n");
+
+ vpp->out_width = ow;
+ vpp->out_height = oh;
+
if (vpp->use_crop) {
vpp->crop_x = FFMAX(vpp->crop_x, 0);
vpp->crop_y = FFMAX(vpp->crop_y, 0);
--
2.25.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
