RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vf_vavpp: minor fixes 

Fully initialize two structs (not doing so may or may not have been a
bug).

Actually destroy the VABufferID we create (moderate memory leak).
This commit is contained in:
wm4 2017-02-28 00:48:48 +01:00
parent 4fe199c6a0
commit d015aab428
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/filter/vf_vavpp.c
View File

@ -157,6 +157,7 @@ static struct mp_image *render(struct vf_instance *vf)
struct mp_image *img = NULL;
bool need_end_picture = false;
bool success = false;
VABufferID buffer = VA_INVALID_ID;
VASurfaceID in_id = va_surface_id(in);
if (!p->pipe.filters || in_id == VA_INVALID_ID)
@ -189,7 +190,6 @@ static struct mp_image *render(struct vf_instance *vf)
need_end_picture = true;
VABufferID buffer = VA_INVALID_ID;
VAProcPipelineParameterBuffer *param = NULL;
status = vaCreateBuffer(p->display, p->context,
VAProcPipelineParameterBufferType,
@ -212,6 +212,7 @@ static struct mp_image *render(struct vf_instance *vf)
if (!check_error(vf, status, "vaMapBuffer()"))
goto cleanup;
*param = (VAProcPipelineParameterBuffer){0};
param->surface = in_id;
param->surface_region = &(VARectangle){0, 0, in->w, in->h};
param->output_region = &(VARectangle){0, 0, img->w, img->h};
@ -239,6 +240,7 @@ static struct mp_image *render(struct vf_instance *vf)
cleanup:
if (need_end_picture)
vaEndPicture(p->display, p->context);
vaDestroyBuffer(p->display, buffer);
if (success)
return img;
talloc_free(img);
@ -427,7 +429,7 @@ static bool initialize(struct vf_instance *vf)
for (int n=0; n < num; n++) { // find the algorithm
if (caps[n].type != algorithm)
continue;
VAProcFilterParameterBufferDeinterlacing param;
VAProcFilterParameterBufferDeinterlacing param = {0};
param.type = VAProcFilterDeinterlacing;
param.algorithm = algorithm;
buffers[VAProcFilterDeinterlacing] =