typedef struct {
const AVClass *class;
- AVRational aspect;
+ AVRational dar;
+ AVRational sar;
#if FF_API_OLD_FILTER_OPTS
float aspect_num, aspect_den;
#endif
} AspectContext;
#if FF_API_OLD_FILTER_OPTS
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
{
AspectContext *s = ctx->priv;
if (s->aspect_num > 0 && s->aspect_den > 0) {
av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use "
"dar=<number> or dar=num/den.\n");
- s->aspect = av_d2q(s->aspect_num / s->aspect_den, INT_MAX);
+ s->sar = s->dar = av_d2q(s->aspect_num / s->aspect_den, INT_MAX);
}
return 0;
static int filter_frame(AVFilterLink *link, AVFrame *frame)
{
- AspectContext *aspect = link->dst->priv;
+ AspectContext *s = link->dst->priv;
- frame->sample_aspect_ratio = aspect->aspect;
+ frame->sample_aspect_ratio = s->sar;
return ff_filter_frame(link->dst->outputs[0], frame);
}
/* for setdar filter, convert from frame aspect ratio to pixel aspect ratio */
static int setdar_config_props(AVFilterLink *inlink)
{
- AspectContext *aspect = inlink->dst->priv;
- AVRational dar = aspect->aspect;
-
- if (aspect->aspect.num && aspect->aspect.den) {
- av_reduce(&aspect->aspect.num, &aspect->aspect.den,
- aspect->aspect.num * inlink->h,
- aspect->aspect.den * inlink->w, 100);
- inlink->sample_aspect_ratio = aspect->aspect;
+ AspectContext *s = inlink->dst->priv;
+ AVRational dar;
+
+ if (s->dar.num && s->dar.den) {
+ av_reduce(&s->sar.num, &s->sar.den,
+ s->dar.num * inlink->h,
+ s->dar.den * inlink->w, 100);
+ inlink->sample_aspect_ratio = s->sar;
+ dar = s->dar;
} else {
inlink->sample_aspect_ratio = (AVRational){ 1, 1 };
dar = (AVRational){ inlink->w, inlink->h };
{ "dar_num", NULL, OFFSET(aspect_num), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
{ "dar_den", NULL, OFFSET(aspect_den), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
#endif
- { "dar", "display aspect ratio", OFFSET(aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, INT_MAX, FLAGS },
+ { "dar", "display aspect ratio", OFFSET(dar), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, INT_MAX, FLAGS },
{ NULL },
};
/* for setdar filter, convert from frame aspect ratio to pixel aspect ratio */
static int setsar_config_props(AVFilterLink *inlink)
{
- AspectContext *aspect = inlink->dst->priv;
+ AspectContext *s = inlink->dst->priv;
- inlink->sample_aspect_ratio = aspect->aspect;
+ inlink->sample_aspect_ratio = s->sar;
return 0;
}
{ "sar_num", NULL, OFFSET(aspect_num), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
{ "sar_den", NULL, OFFSET(aspect_den), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
#endif
- { "sar", "sample (pixel) aspect ratio", OFFSET(aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 1 }, 0, INT_MAX, FLAGS },
+ { "sar", "sample (pixel) aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, { .dbl = 1 }, 0, INT_MAX, FLAGS },
{ NULL },
};