RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/hue: simplify/fix setting logic in set_options() 

Parse expression only when a new value is explicitly specified.

In particular, avoid double free in case an old expression value is
cached, it is set in the context, it is freed as the old value, and
finally the pointer stored in the context is freed again when the filter
is released.
This commit is contained in:
Stefano Sabatini 2012-09-23 00:26:30 +02:00
parent eb949544ca
commit 7fe1ecefe1
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavfilter/vf_hue.c
View File

@ -107,8 +107,8 @@ static inline void compute_sin_and_cos(HueContext *hue)
hue->hue_cos = rint(cos(hue->hue) * (1 << 16) * hue->saturation);
}
#define PARSE_EXPRESSION(attr, name) \
do { \
#define SET_EXPRESSION(attr, name) do { \
if (hue->attr##_expr) { \
if ((ret = av_expr_parse(&hue->attr##_pexpr, hue->attr##_expr, var_names, \
NULL, NULL, NULL, NULL, 0, ctx)) < 0) { \
av_log(ctx, AV_LOG_ERROR, \
@ -122,7 +122,10 @@ static inline void compute_sin_and_cos(HueContext *hue)
av_expr_free(old_##attr##_pexpr); \
old_##attr##_pexpr = NULL; \
} \
} while (0)
} else { \
hue->attr##_expr = old_##attr##_expr; \
} \
} while (0)
static inline int set_options(AVFilterContext *ctx, const char *args)
{
@ -159,21 +162,9 @@ static inline int set_options(AVFilterContext *ctx, const char *args)
return AVERROR(EINVAL);
}
/*
* if both 'H' and 'h' options have not been specified, restore the
* old values
*/
if (!hue->hue_expr && !hue->hue_deg_expr) {
hue->hue_expr = old_hue_expr;
hue->hue_deg_expr = old_hue_deg_expr;
}
if (hue->hue_deg_expr)
PARSE_EXPRESSION(hue_deg, h);
if (hue->hue_expr)
PARSE_EXPRESSION(hue, H);
if (hue->saturation_expr)
PARSE_EXPRESSION(saturation, s);
SET_EXPRESSION(hue_deg, h);
SET_EXPRESSION(hue, H);
SET_EXPRESSION(saturation, s);
hue->flat_syntax = 0;