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

lavfi/vf_libplacebo: add corner_rounding option

Browse Source 
For what use it may be.
This commit is contained in:
Niklas Haas 2023-05-24 15:47:44 +02:00
parent 098b338369
commit c4cdd79435
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/filters.texi
View File

@ -16164,6 +16164,12 @@ example as a result of @option{normalize_sar}. For the general syntax of this
option, check the @ref{color syntax,,"Color" section in the ffmpeg-utils option, check the @ref{color syntax,,"Color" section in the ffmpeg-utils
manual,ffmpeg-utils}. Defaults to @code{black}. manual,ffmpeg-utils}. Defaults to @code{black}.
@item corner_rounding
Render frames with rounded corners. The value, given as a float ranging from
@code{0.0} to @code{1.0}, indicates the relative degree of rounding, from fully
square to fully circular. In other words, it gives the radius divided by half
the smaller side length. Defaults to @code{0.0}.
@item colorspace @item colorspace
@item color_primaries @item color_primaries
@item color_trc @item color_trc

5
libavfilter/vf_libplacebo.c
View File

@ -148,6 +148,7 @@ typedef struct LibplaceboContext {
AVExpr *pos_x_pexpr, *pos_y_pexpr, *pos_w_pexpr, *pos_h_pexpr; AVExpr *pos_x_pexpr, *pos_y_pexpr, *pos_w_pexpr, *pos_h_pexpr;
AVRational target_sar; AVRational target_sar;
float pad_crop_ratio; float pad_crop_ratio;
float corner_rounding;
int force_original_aspect_ratio; int force_original_aspect_ratio;
int force_divisible_by; int force_divisible_by;
int normalize_sar; int normalize_sar;
@ -440,6 +441,9 @@ static int update_settings(AVFilterContext *ctx)
(float) color_rgba[1] / UINT8_MAX, (float) color_rgba[1] / UINT8_MAX,
(float) color_rgba[2] / UINT8_MAX, (float) color_rgba[2] / UINT8_MAX,
}, },
#if PL_API_VER >= 277
.corner_rounding = s->corner_rounding,
#endif
.deband_params = s->deband ? &s->deband_params : NULL, .deband_params = s->deband ? &s->deband_params : NULL,
.sigmoid_params = s->sigmoid ? &pl_sigmoid_default_params : NULL, .sigmoid_params = s->sigmoid ? &pl_sigmoid_default_params : NULL,
@ -1154,6 +1158,7 @@ static const AVOption libplacebo_options[] = {
{ "normalize_sar", "force SAR normalization to 1:1 by adjusting pos_x/y/w/h", OFFSET(normalize_sar), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, STATIC }, { "normalize_sar", "force SAR normalization to 1:1 by adjusting pos_x/y/w/h", OFFSET(normalize_sar), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, STATIC },
{ "pad_crop_ratio", "ratio between padding and cropping when normalizing SAR (0=pad, 1=crop)", OFFSET(pad_crop_ratio), AV_OPT_TYPE_FLOAT, {.dbl=0.0}, 0.0, 1.0, DYNAMIC }, { "pad_crop_ratio", "ratio between padding and cropping when normalizing SAR (0=pad, 1=crop)", OFFSET(pad_crop_ratio), AV_OPT_TYPE_FLOAT, {.dbl=0.0}, 0.0, 1.0, DYNAMIC },
{ "fillcolor", "Background fill color", OFFSET(fillcolor), AV_OPT_TYPE_STRING, {.str = "black"}, .flags = DYNAMIC }, { "fillcolor", "Background fill color", OFFSET(fillcolor), AV_OPT_TYPE_STRING, {.str = "black"}, .flags = DYNAMIC },
{ "corner_rounding", "Corner rounding radius", OFFSET(corner_rounding), AV_OPT_TYPE_FLOAT, {.dbl = 0.0}, 0.0, 1.0, .flags = DYNAMIC },
{"colorspace", "select colorspace", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64=-1}, -1, AVCOL_SPC_NB-1, DYNAMIC, "colorspace"}, {"colorspace", "select colorspace", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64=-1}, -1, AVCOL_SPC_NB-1, DYNAMIC, "colorspace"},
{"auto", "keep the same colorspace", 0, AV_OPT_TYPE_CONST, {.i64=-1}, INT_MIN, INT_MAX, STATIC, "colorspace"}, {"auto", "keep the same colorspace", 0, AV_OPT_TYPE_CONST, {.i64=-1}, INT_MIN, INT_MAX, STATIC, "colorspace"},