Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
87cc7e8d
Commit
87cc7e8d
authored
Aug 07, 2018
by
Kyle Swanson
Committed by
Kyle Swanson
Aug 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/vf_libvmaf: update to use libvmaf v1.3.9
Signed-off-by:
Kyle Swanson
<
kswanson@netflix.com
>
parent
1581caa7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
3 deletions
+19
-3
configure
configure
+1
-1
filters.texi
doc/filters.texi
+10
-1
vf_libvmaf.c
libavfilter/vf_libvmaf.c
+8
-1
No files found.
configure
View file @
87cc7e8d
...
...
@@ -6089,7 +6089,7 @@ enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame
die
"ERROR: libtwolame must be installed and version must be >= 0.3.10"
;
}
enabled libv4l2
&&
require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl
enabled libvidstab
&&
require_pkg_config libvidstab
"vidstab >= 0.98"
vid.stab/libvidstab.h vsMotionDetectInit
enabled libvmaf
&&
require_pkg_config libvmaf
"libvmaf >=
0.6.2
"
libvmaf.h compute_vmaf
enabled libvmaf
&&
require_pkg_config libvmaf
"libvmaf >=
1.3.9
"
libvmaf.h compute_vmaf
enabled libvo_amrwbenc
&&
require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init
-lvo-amrwbenc
enabled libvorbis
&&
require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init
&&
require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init
...
...
doc/filters.texi
View file @
87cc7e8d
...
...
@@ -10868,7 +10868,7 @@ The obtained VMAF score is printed through the logging system.
It requires Netflix's vmaf library (libvmaf) as a pre-requisite.
After installing the library it can be enabled using:
@code{./configure --enable-libvmaf}.
@code{./configure --enable-libvmaf
--enable-version3
}.
If no model path is specified it uses the default model: @code{vmaf_v0.6.1.pkl}.
The filter has following options:
...
...
@@ -10902,6 +10902,15 @@ Enables computing ms_ssim along with vmaf.
@item pool
Set the pool method (mean, min or harmonic mean) to be used for computing vmaf.
@item n_threads
Set number of threads to be used when computing vmaf.
@item n_subsample
Set interval for frame subsampling used when computing vmaf.
@item enable_conf_interval
Enables confidence interval.
@end table
This filter also supports the @ref{framesync} options.
...
...
libavfilter/vf_libvmaf.c
View file @
87cc7e8d
...
...
@@ -62,6 +62,9 @@ typedef struct LIBVMAFContext {
int
ssim
;
int
ms_ssim
;
char
*
pool
;
int
n_threads
;
int
n_subsample
;
int
enable_conf_interval
;
int
error
;
}
LIBVMAFContext
;
...
...
@@ -78,6 +81,9 @@ static const AVOption libvmaf_options[] = {
{
"ssim"
,
"Enables computing ssim along with vmaf."
,
OFFSET
(
ssim
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
FLAGS
},
{
"ms_ssim"
,
"Enables computing ms-ssim along with vmaf."
,
OFFSET
(
ms_ssim
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
FLAGS
},
{
"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
},
{
"enable_conf_interval"
,
"Enables confidence interval."
,
OFFSET
(
enable_conf_interval
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
FLAGS
},
{
NULL
}
};
...
...
@@ -166,7 +172,8 @@ static void compute_vmaf_score(LIBVMAFContext *s)
read_frame
,
s
,
s
->
model_path
,
s
->
log_path
,
s
->
log_fmt
,
0
,
0
,
s
->
enable_transform
,
s
->
phone_model
,
s
->
psnr
,
s
->
ssim
,
s
->
ms_ssim
,
s
->
pool
);
s
->
ms_ssim
,
s
->
pool
,
s
->
n_threads
,
s
->
n_subsample
,
s
->
enable_conf_interval
);
}
static
void
*
call_vmaf
(
void
*
ctx
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment