summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshish Pratap Singh <ashk43712@gmail.com>2017-11-06 07:49:19 -0500
committerRonald S. Bultje <rsbultje@gmail.com>2017-11-06 07:50:11 -0500
commit4c38aa79ece4fa0ea7533774197d6408d7d3b9e5 (patch)
tree86289d4067361980051b1431a86a39dbc948086b
parent0a60cc909ed5c2b0fb6f58d9ae0bfc44b00060bf (diff)
downloadffmpeg-streaming-4c38aa79ece4fa0ea7533774197d6408d7d3b9e5.zip
ffmpeg-streaming-4c38aa79ece4fa0ea7533774197d6408d7d3b9e5.tar.gz
avfilter/vf_libvmaf: fix errors while running with psnr=1.
This patch fixes the seg fault which ocuured while running libvmaf filter with option psnr=1. Signed-off-by: ashk43712 <ashk43712@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
-rw-r--r--libavfilter/vf_libvmaf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
index 2c3a9f3..7670c51 100644
--- a/libavfilter/vf_libvmaf.c
+++ b/libavfilter/vf_libvmaf.c
@@ -40,7 +40,6 @@ typedef struct LIBVMAFContext {
const AVClass *class;
FFFrameSync fs;
const AVPixFmtDescriptor *desc;
- char *format;
int width;
int height;
double vmaf_score;
@@ -149,6 +148,7 @@ static void compute_vmaf_score(LIBVMAFContext *s)
{
int (*read_frame)(float *ref_data, float *main_data, float *temp_data,
int stride, void *ctx);
+ char *format;
if (s->desc->comp[0].depth <= 8) {
read_frame = read_frame_8bit;
@@ -156,7 +156,9 @@ static void compute_vmaf_score(LIBVMAFContext *s)
read_frame = read_frame_10bit;
}
- s->vmaf_score = compute_vmaf(s->format, s->width, s->height, read_frame, s,
+ format = (char *) s->desc->name;
+
+ s->vmaf_score = compute_vmaf(format, s->width, s->height, 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);
@@ -258,7 +260,6 @@ static int config_input_ref(AVFilterLink *inlink)
return 0;
}
-
static int config_output(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
OpenPOWER on IntegriCloud