Message ID | 20220909175402.82657-1-yondon.fu@gmail.com |
---|---|
State | Accepted |
Commit | b11813708dc463b678d7e0a2638e47d217a03ed1 |
Headers | show |
Series | [FFmpeg-devel] avfilter/vf_libvmaf: Update ssim, ms_ssim options description | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Hi, On Fri, Sep 9, 2022 at 10:58 AM Yondon Fu <yondon.fu@gmail.com> wrote: > Update description for ssim and ms_ssim libvmaf options to specify > feature=float_ssim and feature=float_ms_ssim which are used to request > ssim and ms_ssim values in the latest versions of libvmaf. > > Signed-off-by: Yondon Fu <yondon.fu@gmail.com> > --- > libavfilter/vf_libvmaf.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c > index eee1c280ef..e4b439685e 100644 > --- a/libavfilter/vf_libvmaf.c > +++ b/libavfilter/vf_libvmaf.c > @@ -70,8 +70,8 @@ static const AVOption libvmaf_options[] = { > {"enable_transform", "use model='enable_transform=true'.", > OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, > FLAGS|AV_OPT_FLAG_DEPRECATED}, > {"phone_model", "use model='enable_transform=true'.", > OFFSET(phone_model), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, > FLAGS|AV_OPT_FLAG_DEPRECATED}, > {"psnr", "use feature='name=psnr'.", > OFFSET(psnr), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, > FLAGS|AV_OPT_FLAG_DEPRECATED}, > - {"ssim", "use feature='name=ssim'.", > OFFSET(ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, > FLAGS|AV_OPT_FLAG_DEPRECATED}, > - {"ms_ssim", "use feature='name=ms_ssim'.", > OFFSET(ms_ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, > FLAGS|AV_OPT_FLAG_DEPRECATED}, > + {"ssim", "use feature='name=float_ssim'.", > OFFSET(ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, > FLAGS|AV_OPT_FLAG_DEPRECATED}, > + {"ms_ssim", "use feature='name=float_ms_ssim'.", > OFFSET(ms_ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, > FLAGS|AV_OPT_FLAG_DEPRECATED}, > {"pool", "Set the pool method to be used for computing vmaf.", > OFFSET(pool), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, > {"n_threads", "Set number of threads to be used when computing > vmaf.", OFFSET(n_threads), AV_OPT_TYPE_INT, {.i64=0}, 0, > UINT_MAX, FLAGS}, > {"n_subsample", "Set interval for frame subsampling used when > computing vmaf.", OFFSET(n_subsample), AV_OPT_TYPE_INT, {.i64=1}, 1, > UINT_MAX, FLAGS}, > -- > 2.26.2 > Thanks for the fix, I will apply this soon. Kyle
Hi, On Wed, Sep 14, 2022 at 2:27 PM Kyle Swanson <k@ylo.ph> wrote: > Thanks for the fix, I will apply this soon. > Pushed. Thanks, Kyle
diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index eee1c280ef..e4b439685e 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -70,8 +70,8 @@ static const AVOption libvmaf_options[] = { {"enable_transform", "use model='enable_transform=true'.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED}, {"phone_model", "use model='enable_transform=true'.", OFFSET(phone_model), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED}, {"psnr", "use feature='name=psnr'.", OFFSET(psnr), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED}, - {"ssim", "use feature='name=ssim'.", OFFSET(ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED}, - {"ms_ssim", "use feature='name=ms_ssim'.", OFFSET(ms_ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED}, + {"ssim", "use feature='name=float_ssim'.", OFFSET(ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED}, + {"ms_ssim", "use feature='name=float_ms_ssim'.", OFFSET(ms_ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED}, {"pool", "Set the pool method to be used for computing vmaf.", OFFSET(pool), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, {"n_threads", "Set number of threads to be used when computing vmaf.", OFFSET(n_threads), AV_OPT_TYPE_INT, {.i64=0}, 0, UINT_MAX, FLAGS}, {"n_subsample", "Set interval for frame subsampling used when computing vmaf.", OFFSET(n_subsample), AV_OPT_TYPE_INT, {.i64=1}, 1, UINT_MAX, FLAGS},
Update description for ssim and ms_ssim libvmaf options to specify feature=float_ssim and feature=float_ms_ssim which are used to request ssim and ms_ssim values in the latest versions of libvmaf. Signed-off-by: Yondon Fu <yondon.fu@gmail.com> --- libavfilter/vf_libvmaf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)