[FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: update deprecated option name

[FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: update deprecated option name

[Niklas Haas]

From: Niklas Haas <git@haasn.dev>

This was renamed upstream quite a while ago (v3.112.0). Keep the old
option name in libavfilter for backwards compatibility.

Signed-off-by: Niklas Haas <git@haasn.dev>
---
 libavfilter/vf_libplacebo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index 7ece9d829e..515fd44d24 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -357,7 +357,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
         .polar_cutoff = s->polar_cutoff,
         .disable_linear_scaling = s->disable_linear,
         .disable_builtin_scalers = s->disable_builtin,
-        .force_3dlut = s->force_3dlut,
+        .force_icc_lut = s->force_3dlut,
         .force_dither = s->force_dither,
         .disable_fbos = s->disable_fbos,
     };
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: update deprecated option name

[Lynne]

15 Dec 2021, 21:47 by ffmpeg@haasn.xyz:

> From: Niklas Haas <git@haasn.dev>
>
> This was renamed upstream quite a while ago (v3.112.0). Keep the old
> option name in libavfilter for backwards compatibility.
>
> Signed-off-by: Niklas Haas <git@haasn.dev>
> ---
>  libavfilter/vf_libplacebo.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
> index 7ece9d829e..515fd44d24 100644
> --- a/libavfilter/vf_libplacebo.c
> +++ b/libavfilter/vf_libplacebo.c
> @@ -357,7 +357,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
>  .polar_cutoff = s->polar_cutoff,
>  .disable_linear_scaling = s->disable_linear,
>  .disable_builtin_scalers = s->disable_builtin,
> -        .force_3dlut = s->force_3dlut,
> +        .force_icc_lut = s->force_3dlut,
>  .force_dither = s->force_dither,
>  .disable_fbos = s->disable_fbos,
>  };
>

Since the filter was merged quite recently, and we haven't made
a release yet, I think it's fine to break CLI compatibility. Could you
rename the option as well?
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH v2] lavfi/vf_libplacebo: update deprecated option name

[Niklas Haas]

From: Niklas Haas <git@haasn.dev>

This was renamed upstream quite a while ago (v3.112.0). Rename the
option name as well for consistency (and expand the description just
slightly).

Signed-off-by: Niklas Haas <git@haasn.dev>
---
 libavfilter/vf_libplacebo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index 7ece9d829e..5b1e7b5285 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -62,7 +62,7 @@ typedef struct LibplaceboContext {
     float polar_cutoff;
     int disable_linear;
     int disable_builtin;
-    int force_3dlut;
+    int force_icc_lut;
     int force_dither;
     int disable_fbos;
 
@@ -357,7 +357,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
         .polar_cutoff = s->polar_cutoff,
         .disable_linear_scaling = s->disable_linear,
         .disable_builtin_scalers = s->disable_builtin,
-        .force_3dlut = s->force_3dlut,
+        .force_icc_lut = s->force_icc_lut,
         .force_dither = s->force_dither,
         .disable_fbos = s->disable_fbos,
     };
@@ -623,7 +623,7 @@ static const AVOption libplacebo_options[] = {
     { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.i64 = 0}, 0.0, 1.0, DYNAMIC },
     { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
     { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-    { "force_3dlut", "Force the use of a full 3DLUT", OFFSET(force_3dlut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+    { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
     { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
     { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
     { NULL },
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v2] lavfi/vf_libplacebo: update deprecated option name

[Lynne]

15 Dec 2021, 22:32 by ffmpeg@haasn.xyz:

> From: Niklas Haas <git@haasn.dev>
>
> This was renamed upstream quite a while ago (v3.112.0). Rename the
> option name as well for consistency (and expand the description just
> slightly).
>
> Signed-off-by: Niklas Haas <git@haasn.dev>
> ---
>  libavfilter/vf_libplacebo.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
> index 7ece9d829e..5b1e7b5285 100644
> --- a/libavfilter/vf_libplacebo.c
> +++ b/libavfilter/vf_libplacebo.c
> @@ -62,7 +62,7 @@ typedef struct LibplaceboContext {
>  float polar_cutoff;
>  int disable_linear;
>  int disable_builtin;
> -    int force_3dlut;
> +    int force_icc_lut;
>  int force_dither;
>  int disable_fbos;
>  
> @@ -357,7 +357,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
>  .polar_cutoff = s->polar_cutoff,
>  .disable_linear_scaling = s->disable_linear,
>  .disable_builtin_scalers = s->disable_builtin,
> -        .force_3dlut = s->force_3dlut,
> +        .force_icc_lut = s->force_icc_lut,
>  .force_dither = s->force_dither,
>  .disable_fbos = s->disable_fbos,
>  };
> @@ -623,7 +623,7 @@ static const AVOption libplacebo_options[] = {
>  { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.i64 = 0}, 0.0, 1.0, DYNAMIC },
>  { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
>  { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
> -    { "force_3dlut", "Force the use of a full 3DLUT", OFFSET(force_3dlut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
> +    { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
>  { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
>  { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
>  { NULL },
>

Thanks, pushed both this patch and your helpers patch.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".