Mercurial > mplayer.hg
diff libmpcodecs/vf_stereo3d.c @ 32538:28f08e7c2a0a
Adjust d_height instead of bad ad-hoc scaling.
Patch by Endre Kollr [taxy443 gmail com]
author | reimar |
---|---|
date | Sun, 14 Nov 2010 15:24:12 +0000 |
parents | 7ec524214684 |
children | 8341f48adbc5 |
line wrap: on
line diff
--- a/libmpcodecs/vf_stereo3d.c Sun Nov 14 09:12:34 2010 +0000 +++ b/libmpcodecs/vf_stereo3d.c Sun Nov 14 15:24:12 2010 +0000 @@ -66,7 +66,6 @@ unsigned int off_left; unsigned int off_right; unsigned int stride; - unsigned int hres; } component; //==global variables==// @@ -137,7 +136,6 @@ vf->priv->height = height; vf->priv->in.width = width; vf->priv->in.height = height; - vf->priv->in.hres = 1; vf->priv->in.off_left = 0; vf->priv->in.off_right = 0; vf->priv->in.stride = vf->priv->width * 3; @@ -154,22 +152,18 @@ vf->priv->in.off_left = vf->priv->width * 3; vf->priv->in.stride = vf->priv->width * 6; break; + case ABOVE_BELOW_2_LR: + d_height *= 2; case ABOVE_BELOW_LR: vf->priv->height = height / 2; vf->priv->in.off_right = vf->priv->width * vf->priv->height * 3; break; + case ABOVE_BELOW_2_RL: + d_height *= 2; case ABOVE_BELOW_RL: vf->priv->height = height / 2; vf->priv->in.off_left = vf->priv->width * vf->priv->height * 3; break; - case ABOVE_BELOW_2_LR: - vf->priv->in.hres = 2; - vf->priv->in.off_right = vf->priv->width * vf->priv->height / 2 * 3; - break; - case ABOVE_BELOW_2_RL: - vf->priv->in.hres = 2; - vf->priv->in.off_left = vf->priv->width * vf->priv->height / 2 * 3; - break; default: mp_msg(MSGT_VFILTER, MSGL_WARN, "[stereo3d] stereo format of input is not supported\n"); @@ -179,7 +173,6 @@ //default output values vf->priv->out.width = vf->priv->width; vf->priv->out.height = vf->priv->height; - vf->priv->out.hres = 1; vf->priv->out.off_left = 0; vf->priv->out.off_right = 0; vf->priv->out.stride = vf->priv->width * 3; @@ -209,22 +202,18 @@ vf->priv->out.off_left = vf->priv->width * 3; vf->priv->out.stride = vf->priv->width * 6; break; + case ABOVE_BELOW_2_LR: + d_height /= 2; case ABOVE_BELOW_LR: vf->priv->out.height = vf->priv->height * 2; vf->priv->out.off_right = vf->priv->width * vf->priv->height * 3; break; + case ABOVE_BELOW_2_RL: + d_height /= 2; case ABOVE_BELOW_RL: vf->priv->out.height = vf->priv->height * 2; vf->priv->out.off_left = vf->priv->width * vf->priv->height * 3; break; - case ABOVE_BELOW_2_LR: - vf->priv->out.hres = 2; - vf->priv->out.off_right = vf->priv->width * vf->priv->height / 2 * 3; - break; - case ABOVE_BELOW_2_RL: - vf->priv->out.hres = 2; - vf->priv->out.off_left = vf->priv->width * vf->priv->height / 2 * 3; - break; case MONO_R: //same as MONO_L only needs switching of input offsets vf->priv->in.off_left = vf->priv->in.off_right; @@ -263,32 +252,27 @@ case ABOVE_BELOW_RL: case ABOVE_BELOW_2_LR: case ABOVE_BELOW_2_RL: - for (int i = 0; i < vf->priv->in.hres; i++) { - memcpy_pic(dmpi->planes[0] + vf->priv->out.off_left + - (i * vf->priv->out.stride), mpi->planes[0] + - vf->priv->in.off_left, 3 * vf->priv->width, - vf->priv->height / (vf->priv->in.hres * - vf->priv->out.hres), vf->priv->out.stride * - vf->priv->in.hres, vf->priv->in.stride * - vf->priv->out.hres); - memcpy_pic(dmpi->planes[0] + vf->priv->out.off_right + - (i * vf->priv->out.stride), mpi->planes[0] + - vf->priv->in.off_right, 3 * vf->priv->width, - vf->priv->height / (vf->priv->in.hres * - vf->priv->out.hres), vf->priv->out.stride * - vf->priv->in.hres, vf->priv->in.stride * - vf->priv->out.hres); - } + memcpy_pic(dmpi->planes[0] + vf->priv->out.off_left, + mpi->planes[0] + vf->priv->in.off_left, + 3 * vf->priv->width, + vf->priv->height, + vf->priv->out.stride, + vf->priv->in.stride); + memcpy_pic(dmpi->planes[0] + vf->priv->out.off_right, + mpi->planes[0] + vf->priv->in.off_right, + 3 * vf->priv->width, + vf->priv->height, + vf->priv->out.stride, + vf->priv->in.stride); break; case MONO_L: case MONO_R: - for (int i = 0; i < vf->priv->in.hres; i++) { - memcpy_pic(dmpi->planes[0] + (i * vf->priv->out.stride), - mpi->planes[0] + vf->priv->in.off_left, 3 * - vf->priv->width, vf->priv->height / - vf->priv->in.hres, vf->priv->out.stride * - vf->priv->in.hres, vf->priv->in.stride); - } + memcpy_pic(dmpi->planes[0], + mpi->planes[0] + vf->priv->in.off_left, + 3 * vf->priv->width, + vf->priv->height, + vf->priv->out.stride, + vf->priv->in.stride); break; case ANAGLYPH_RC_GRAY: case ANAGLYPH_RC_HALF: @@ -311,9 +295,9 @@ for (y = 0; y < vf->priv->out.height; y++) { o = vf->priv->out.stride * y; - il = vf->priv->in.off_left + (y / vf->priv->in.hres) * + il = vf->priv->in.off_left + y * vf->priv->in.stride; - ir = vf->priv->in.off_right + (y / vf->priv->in.hres) * + ir = vf->priv->in.off_right + y * vf->priv->in.stride; for (x = 0; x < out_width; x++) { dest[o ] = ana_convert(