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

vf_divtc, vf_phase: Fix handling of subsampled formats 

These filters incorrectly calculated the amount of bytes per line
in each plane for chroma subsampled formats, causing undefined
behavior.
This commit is contained in:
Martin Herkt 2013-04-10 00:10:59 +02:00
parent 23bbbed06d
commit f8d32b03bf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
video/filter/vf_divtc.c
View File

@ -202,8 +202,9 @@ static int imgop(int(*planeop)(unsigned char *, unsigned char *,
int sum = 0;
for (int p = 0; p < dst->num_planes; p++) {
sum += planeop(dst->planes[p], src ? src->planes[p] : NULL,
dst->w * (dst->fmt.bpp[p] / 8), dst->plane_h[p],
dst->stride[p], src ? src->stride[p] : 0, arg);
(dst->w * dst->fmt.bytes[p]) >> dst->fmt.xs[p],
dst->plane_h[p], dst->stride[p],
src ? src->stride[p] : 0, arg);
}
return sum;
}

2
video/filter/vf_phase.c
View File

@ -205,7 +205,7 @@ static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
int pw[MP_MAX_PLANES] = {0};
for (int p = 0; p < mpi->num_planes; p++)
pw[p] = (mpi->w * mpi->fmt.bpp[p] + 7) / 8;
pw[p] = ((mpi->w * mpi->fmt.bpp[p] + 7) / 8) >> mpi->fmt.xs[p];
mode=vf->priv->mode;