highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Synchronize libmpcodecs: Support 16bit yuv in telecine filter.

Browse Source 
Fixes ticket 1782.
This commit is contained in:
Carl Eugen Hoyos 2012-10-28 15:46:35 +01:00
parent 96fac764fa
commit 3f44809415
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavfilter/libmpcodecs/vf_telecine.c
View File

@ -37,6 +37,8 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
{ {
mp_image_t *dmpi; mp_image_t *dmpi;
int ret; int ret;
int w = (IMGFMT_IS_YUVP16(mpi->imgfmt) ? 2 : 1) * mpi->w;
int chroma_width = (IMGFMT_IS_YUVP16(mpi->imgfmt) ? 2 : 1) * mpi->chroma_width;
vf->priv->frame = (vf->priv->frame+1)%4; vf->priv->frame = (vf->priv->frame+1)%4;
@ -49,56 +51,56 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
switch (vf->priv->frame) { switch (vf->priv->frame) {
case 0: case 0:
my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0], my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0],
mpi->planes[0]+mpi->stride[0], mpi->w, mpi->h/2, mpi->planes[0]+mpi->stride[0], w, mpi->h/2,
dmpi->stride[0]*2, mpi->stride[0]*2); dmpi->stride[0]*2, mpi->stride[0]*2);
if (mpi->flags & MP_IMGFLAG_PLANAR) { if (mpi->flags & MP_IMGFLAG_PLANAR) {
my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1], my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1],
mpi->planes[1]+mpi->stride[1], mpi->planes[1]+mpi->stride[1],
mpi->chroma_width, mpi->chroma_height/2, chroma_width, mpi->chroma_height/2,
dmpi->stride[1]*2, mpi->stride[1]*2); dmpi->stride[1]*2, mpi->stride[1]*2);
my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2], my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2],
mpi->planes[2]+mpi->stride[2], mpi->planes[2]+mpi->stride[2],
mpi->chroma_width, mpi->chroma_height/2, chroma_width, mpi->chroma_height/2,
dmpi->stride[2]*2, mpi->stride[2]*2); dmpi->stride[2]*2, mpi->stride[2]*2);
} }
ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
/* Fallthrough */ /* Fallthrough */
case 1: case 1:
case 2: case 2:
memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h, memcpy_pic(dmpi->planes[0], mpi->planes[0], w, mpi->h,
dmpi->stride[0], mpi->stride[0]); dmpi->stride[0], mpi->stride[0]);
if (mpi->flags & MP_IMGFLAG_PLANAR) { if (mpi->flags & MP_IMGFLAG_PLANAR) {
memcpy_pic(dmpi->planes[1], mpi->planes[1], memcpy_pic(dmpi->planes[1], mpi->planes[1],
mpi->chroma_width, mpi->chroma_height, chroma_width, mpi->chroma_height,
dmpi->stride[1], mpi->stride[1]); dmpi->stride[1], mpi->stride[1]);
memcpy_pic(dmpi->planes[2], mpi->planes[2], memcpy_pic(dmpi->planes[2], mpi->planes[2],
mpi->chroma_width, mpi->chroma_height, chroma_width, mpi->chroma_height,
dmpi->stride[2], mpi->stride[2]); dmpi->stride[2], mpi->stride[2]);
} }
return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE) || ret; return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE) || ret;
case 3: case 3:
my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0], my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0],
mpi->planes[0]+mpi->stride[0], mpi->w, mpi->h/2, mpi->planes[0]+mpi->stride[0], w, mpi->h/2,
dmpi->stride[0]*2, mpi->stride[0]*2); dmpi->stride[0]*2, mpi->stride[0]*2);
if (mpi->flags & MP_IMGFLAG_PLANAR) { if (mpi->flags & MP_IMGFLAG_PLANAR) {
my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1], my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1],
mpi->planes[1]+mpi->stride[1], mpi->planes[1]+mpi->stride[1],
mpi->chroma_width, mpi->chroma_height/2, chroma_width, mpi->chroma_height/2,
dmpi->stride[1]*2, mpi->stride[1]*2); dmpi->stride[1]*2, mpi->stride[1]*2);
my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2], my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2],
mpi->planes[2]+mpi->stride[2], mpi->planes[2]+mpi->stride[2],
mpi->chroma_width, mpi->chroma_height/2, chroma_width, mpi->chroma_height/2,
dmpi->stride[2]*2, mpi->stride[2]*2); dmpi->stride[2]*2, mpi->stride[2]*2);
} }
ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
my_memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h/2, my_memcpy_pic(dmpi->planes[0], mpi->planes[0], w, mpi->h/2,
dmpi->stride[0]*2, mpi->stride[0]*2); dmpi->stride[0]*2, mpi->stride[0]*2);
if (mpi->flags & MP_IMGFLAG_PLANAR) { if (mpi->flags & MP_IMGFLAG_PLANAR) {
my_memcpy_pic(dmpi->planes[1], mpi->planes[1], my_memcpy_pic(dmpi->planes[1], mpi->planes[1],
mpi->chroma_width, mpi->chroma_height/2, chroma_width, mpi->chroma_height/2,
dmpi->stride[1]*2, mpi->stride[1]*2); dmpi->stride[1]*2, mpi->stride[1]*2);
my_memcpy_pic(dmpi->planes[2], mpi->planes[2], my_memcpy_pic(dmpi->planes[2], mpi->planes[2],
mpi->chroma_width, mpi->chroma_height/2, chroma_width, mpi->chroma_height/2,
dmpi->stride[2]*2, mpi->stride[2]*2); dmpi->stride[2]*2, mpi->stride[2]*2);
} }
return ret; return ret;