mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 21:36:48 +00:00
avfilter/vf_libvmaf: fix pre convert to framesync2 bugs
Hi, it fixes the errors while converting to framesync2. libvmaf was changed recently, double *score variable is removed in the new version since it's not used anywhere. This patch fixes all the warnings and segmentation faults. Signed-off-by: Ashish Singh <ashk43712@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
parent
2b9fd15734
commit
2a4a26fa4f
@ -24,7 +24,6 @@
|
|||||||
* Calculate the VMAF between two input videos.
|
* Calculate the VMAF between two input videos.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <inttypes.h>
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <libvmaf.h>
|
#include <libvmaf.h>
|
||||||
#include "libavutil/avstring.h"
|
#include "libavutil/avstring.h"
|
||||||
@ -85,8 +84,7 @@ FRAMESYNC_DEFINE_CLASS(libvmaf, LIBVMAFContext, fs);
|
|||||||
|
|
||||||
#define read_frame_fn(type, bits) \
|
#define read_frame_fn(type, bits) \
|
||||||
static int read_frame_##bits##bit(float *ref_data, float *main_data, \
|
static int read_frame_##bits##bit(float *ref_data, float *main_data, \
|
||||||
float *temp_data, int stride, \
|
float *temp_data, int stride, void *ctx) \
|
||||||
double *score, void *ctx) \
|
|
||||||
{ \
|
{ \
|
||||||
LIBVMAFContext *s = (LIBVMAFContext *) ctx; \
|
LIBVMAFContext *s = (LIBVMAFContext *) ctx; \
|
||||||
int ret; \
|
int ret; \
|
||||||
@ -150,7 +148,7 @@ read_frame_fn(uint16_t, 10);
|
|||||||
static void compute_vmaf_score(LIBVMAFContext *s)
|
static void compute_vmaf_score(LIBVMAFContext *s)
|
||||||
{
|
{
|
||||||
int (*read_frame)(float *ref_data, float *main_data, float *temp_data,
|
int (*read_frame)(float *ref_data, float *main_data, float *temp_data,
|
||||||
int stride, double *score, void *ctx);
|
int stride, void *ctx);
|
||||||
|
|
||||||
if (s->desc->comp[0].depth <= 8) {
|
if (s->desc->comp[0].depth <= 8) {
|
||||||
read_frame = read_frame_8bit;
|
read_frame = read_frame_8bit;
|
||||||
|
Loading…
Reference in New Issue
Block a user