virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vf_bilateral: stop using sigmaS as percent of width/height

Browse Source
This commit is contained in:
Paul B Mahol 2020-07-17 13:45:16 +02:00
parent d11cc743c8
commit 241cdded0f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/filters.texi
View File

@ -6581,7 +6581,7 @@ The filter accepts the following options:
@table @option @table @option
@item sigmaS @item sigmaS
Set sigma of gaussian function to calculate spatial weight. Set sigma of gaussian function to calculate spatial weight.
Allowed range is 0 to 10. Default is 0.1. Allowed range is 0 to 512. Default is 0.1.
@item sigmaR @item sigmaR
Set sigma of gaussian function to calculate range weight. Set sigma of gaussian function to calculate range weight.

6
libavfilter/vf_bilateral.c
View File

@ -57,7 +57,7 @@ typedef struct BilateralContext {
#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 bilateral_options[] = { static const AVOption bilateral_options[] = {
{ "sigmaS", "set spatial sigma", OFFSET(sigmaS), AV_OPT_TYPE_FLOAT, {.dbl=0.1}, 0.0, 10, FLAGS }, { "sigmaS", "set spatial sigma", OFFSET(sigmaS), AV_OPT_TYPE_FLOAT, {.dbl=0.1}, 0.0, 512, FLAGS },
{ "sigmaR", "set range sigma", OFFSET(sigmaR), AV_OPT_TYPE_FLOAT, {.dbl=0.1}, 0.0, 1, FLAGS }, { "sigmaR", "set range sigma", OFFSET(sigmaR), AV_OPT_TYPE_FLOAT, {.dbl=0.1}, 0.0, 1, FLAGS },
{ "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=1}, 0, 0xF, FLAGS }, { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=1}, 0, 0xF, FLAGS },
{ NULL } { NULL }
@ -145,7 +145,7 @@ static void bilateral_##name(BilateralContext *s, const uint8_t *ssrc, uint8_t *
float *slice_factor_a = s->slice_factor_a, *slice_factor_b = s->slice_factor_b; \ float *slice_factor_a = s->slice_factor_a, *slice_factor_b = s->slice_factor_b; \
float *line_factor_a = s->line_factor_a, *line_factor_b = s->line_factor_b; \ float *line_factor_a = s->line_factor_a, *line_factor_b = s->line_factor_b; \
float *range_table = s->range_table; \ float *range_table = s->range_table; \
float alpha = expf(-sqrtf(2.f) / (sigma_spatial * width)); \ float alpha = expf(-sqrtf(2.f) / sigma_spatial); \
float ypr, ycr, *ycy, *ypy, *xcy, fp, fc; \ float ypr, ycr, *ycy, *ypy, *xcy, fp, fc; \
float inv_alpha_ = 1 - alpha; \ float inv_alpha_ = 1 - alpha; \
float *ycf, *ypf, *xcf, *in_factor; \ float *ycf, *ypf, *xcf, *in_factor; \
@ -206,7 +206,7 @@ static void bilateral_##name(BilateralContext *s, const uint8_t *ssrc, uint8_t *
} \ } \
memcpy(img_out_f, img_temp, sizeof(float) * width); \ memcpy(img_out_f, img_temp, sizeof(float) * width); \
\ \
alpha = expf(-sqrtf(2.f) / (sigma_spatial * height)); \ alpha = expf(-sqrtf(2.f) / sigma_spatial); \
inv_alpha_ = 1 - alpha; \ inv_alpha_ = 1 - alpha; \
in_factor = map_factor_a; \ in_factor = map_factor_a; \
memcpy(map_factor_b, in_factor, sizeof(float) * width); \ memcpy(map_factor_b, in_factor, sizeof(float) * width); \