highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter: Update scale to dictionary based options

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-04-12 02:34:40 +02:00
parent 710b0aa801
commit 9ab796127a
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavfilter/avfilter.c
View File

@ -690,7 +690,6 @@ static const char *const filters_left_to_update[] = {
"atempo", "atempo",
"buffer", "buffer",
"pan", "pan",
"scale",
}; };
static int filter_use_deprecated_init(const char *name) static int filter_use_deprecated_init(const char *name)

27
libavfilter/vf_scale.c
View File

@ -95,21 +95,7 @@ typedef struct {
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx, const char *args)
{ {
ScaleContext *scale = ctx->priv; ScaleContext *scale = ctx->priv;
#if 1
static const char *shorthand[] = { "w", "h", NULL };
int ret; int ret;
const char *args0 = args;
if (args && (scale->size_str = av_get_token(&args, ":"))) {
if (av_parse_video_size(&scale->w, &scale->h, scale->size_str) < 0) {
av_freep(&scale->size_str);
args = args0;
} else if (*args)
args++;
}
if ((ret = av_opt_set_from_string(scale, args, shorthand, "=", ":")) < 0)
return ret;
if (scale->size_str && (scale->w_expr || scale->h_expr)) { if (scale->size_str && (scale->w_expr || scale->h_expr)) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
@ -117,6 +103,9 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (scale->w_expr && !scale->h_expr)
FFSWAP(char *, scale->w_expr, scale->size_str);
if (scale->size_str) { if (scale->size_str) {
char buf[32]; char buf[32];
if ((ret = av_parse_video_size(&scale->w, &scale->h, scale->size_str)) < 0) { if ((ret = av_parse_video_size(&scale->w, &scale->h, scale->size_str)) < 0) {
@ -138,7 +127,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
scale->w_expr, scale->h_expr, (char *)av_x_if_null(scale->flags_str, ""), scale->interlaced); scale->w_expr, scale->h_expr, (char *)av_x_if_null(scale->flags_str, ""), scale->interlaced);
scale->flags = SWS_BILINEAR; scale->flags = SWS_BILINEAR;
#endif
if (scale->flags_str) { if (scale->flags_str) {
const AVClass *class = sws_get_class(); const AVClass *class = sws_get_class();
const AVOption *o = av_opt_find(&class, "sws_flags", NULL, 0, const AVOption *o = av_opt_find(&class, "sws_flags", NULL, 0,
@ -399,10 +388,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
static const AVOption scale_options[] = { static const AVOption scale_options[] = {
{ "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS }, { "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, .flags = FLAGS },
{ "width", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS }, { "width", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, .flags = FLAGS },
{ "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS }, { "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, .flags = FLAGS },
{ "height","Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS }, { "height","Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, .flags = FLAGS },
{ "flags", "Flags to pass to libswscale", OFFSET(flags_str), AV_OPT_TYPE_STRING, { .str = "bilinear" }, .flags = FLAGS }, { "flags", "Flags to pass to libswscale", OFFSET(flags_str), AV_OPT_TYPE_STRING, { .str = "bilinear" }, .flags = FLAGS },
{ "interl", "set interlacing", OFFSET(interlaced), AV_OPT_TYPE_INT, {.i64 = 0 }, -1, 1, FLAGS }, { "interl", "set interlacing", OFFSET(interlaced), AV_OPT_TYPE_INT, {.i64 = 0 }, -1, 1, FLAGS },
{ "size", "set video size", OFFSET(size_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, FLAGS }, { "size", "set video size", OFFSET(size_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, FLAGS },