Commit 7fe1ecef authored by Stefano Sabatini's avatar Stefano Sabatini

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