Mercurial > mplayer.hg
view libmpcodecs/vf_halfpack.c @ 34797:079b53acda6d
Workaround bug in mpg123. In rare cases, after seeking mplayer stops audio playback and would repeat "No stream opened. (code 24)" until next seek.
This is caused by bug in mpg123_getformat() that triggers needless reading of next frame, possibly hitting bogus MPG123_NEED_MORE. The function is fixed in mpg123 1.14.0+.
This commit however allows older mpg123 versions to work properly in mplayer.
Patch by Thomas Orgis, thomas-forum orgis org
author | iive |
---|---|
date | Wed, 02 May 2012 21:15:07 +0000 |
parents | 53073a44a899 |
children |
line wrap: on
line source
/* * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> #include "config.h" #include "mp_msg.h" #include "cpudetect.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" #include "vf_scale.h" #include "libswscale/swscale.h" #include "fmt-conversion.h" struct vf_priv_s { int field; struct SwsContext *ctx; }; #if HAVE_MMX static void halfpack_MMX(unsigned char *dst, unsigned char *src[3], int dststride, int srcstride[3], int w, int h) { int j; unsigned char *y1, *y2, *u, *v; int dstinc, yinc, uinc, vinc; y1 = src[0]; y2 = src[0] + srcstride[0]; u = src[1]; v = src[2]; dstinc = dststride - 2*w; yinc = 2*srcstride[0] - w; uinc = srcstride[1] - w/2; vinc = srcstride[2] - w/2; for (h/=2; h; h--) { __asm__ ( "pxor %%mm0, %%mm0 \n\t" ASMALIGN(4) "1: \n\t" "movq (%0), %%mm1 \n\t" "movq (%0), %%mm2 \n\t" "movq (%1), %%mm3 \n\t" "movq (%1), %%mm4 \n\t" "punpcklbw %%mm0, %%mm1 \n\t" "punpckhbw %%mm0, %%mm2 \n\t" "punpcklbw %%mm0, %%mm3 \n\t" "punpckhbw %%mm0, %%mm4 \n\t" "paddw %%mm3, %%mm1 \n\t" "paddw %%mm4, %%mm2 \n\t" "psrlw $1, %%mm1 \n\t" "psrlw $1, %%mm2 \n\t" "movq (%2), %%mm3 \n\t" "movq (%3), %%mm5 \n\t" "punpcklbw %%mm0, %%mm3 \n\t" "punpcklbw %%mm0, %%mm5 \n\t" "movq %%mm3, %%mm4 \n\t" "movq %%mm5, %%mm6 \n\t" "punpcklwd %%mm0, %%mm3 \n\t" "punpckhwd %%mm0, %%mm4 \n\t" "punpcklwd %%mm0, %%mm5 \n\t" "punpckhwd %%mm0, %%mm6 \n\t" "pslld $8, %%mm3 \n\t" "pslld $8, %%mm4 \n\t" "pslld $24, %%mm5 \n\t" "pslld $24, %%mm6 \n\t" "por %%mm3, %%mm1 \n\t" "por %%mm4, %%mm2 \n\t" "por %%mm5, %%mm1 \n\t" "por %%mm6, %%mm2 \n\t" "add $8, %0 \n\t" "add $8, %1 \n\t" "add $4, %2 \n\t" "add $4, %3 \n\t" "movq %%mm1, (%8) \n\t" "movq %%mm2, 8(%8) \n\t" "add $16, %8 \n\t" "decl %9 \n\t" "jnz 1b \n\t" : "=r" (y1), "=r" (y2), "=r" (u), "=r" (v) : "0" (y1), "1" (y2), "2" (u), "3" (v), "r" (dst), "r" (w/8) : "memory" ); for (j = (w&7)/2; j; j--) { *dst++ = (*y1++ + *y2++)/2; *dst++ = *u++; *dst++ = (*y1++ + *y2++)/2; *dst++ = *v++; } y1 += yinc; y2 += yinc; u += uinc; v += vinc; dst += dstinc; } __asm__ volatile ( "emms \n\t" ::: "memory" ); } #endif static void halfpack_C(unsigned char *dst, unsigned char *src[3], int dststride, int srcstride[3], int w, int h) { int i, j; unsigned char *y1, *y2, *u, *v; int dstinc, yinc, uinc, vinc; y1 = src[0]; y2 = src[0] + srcstride[0]; u = src[1]; v = src[2]; dstinc = dststride - 2*w; yinc = 2*srcstride[0] - w; uinc = srcstride[1] - w/2; vinc = srcstride[2] - w/2; for (i = h/2; i; i--) { for (j = w/2; j; j--) { *dst++ = (*y1++ + *y2++)>>1; *dst++ = *u++; *dst++ = (*y1++ + *y2++)>>1; *dst++ = *v++; } y1 += yinc; y2 += yinc; u += uinc; v += vinc; dst += dstinc; } } static void (*halfpack)(unsigned char *dst, unsigned char *src[3], int dststride, int srcstride[3], int w, int h); static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { const uint8_t *src[MP_MAX_PLANES] = { mpi->planes[0] + mpi->stride[0]*vf->priv->field, mpi->planes[1], mpi->planes[2], NULL}; int src_stride[MP_MAX_PLANES] = {mpi->stride[0]*2, mpi->stride[1], mpi->stride[2], 0}; mp_image_t *dmpi; // hope we'll get DR buffer: dmpi=vf_get_image(vf->next, IMGFMT_YUY2, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h/2); switch(vf->priv->field) { case 0: case 1: sws_scale(vf->priv->ctx, src, src_stride, 0, mpi->h/2, dmpi->planes, dmpi->stride); break; default: halfpack(dmpi->planes[0], mpi->planes, dmpi->stride[0], mpi->stride, mpi->w, mpi->h); } return vf_next_put_image(vf,dmpi, pts); } static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { if (vf->priv->field < 2) { sws_freeContext(vf->priv->ctx); // get unscaled 422p -> yuy2 conversion vf->priv->ctx = sws_getContext(width, height / 2, PIX_FMT_YUV422P, width, height / 2, PIX_FMT_YUYV422, SWS_POINT | SWS_PRINT_INFO, NULL, NULL, NULL); } /* FIXME - also support UYVY output? */ return vf_next_config(vf, width, height/2, d_width, d_height, flags, IMGFMT_YUY2); } static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - really any YUV 4:2:0 input format should work */ switch (fmt) { case IMGFMT_YV12: case IMGFMT_IYUV: case IMGFMT_I420: return vf_next_query_format(vf,IMGFMT_YUY2); } return 0; } static void uninit(struct vf_instance *vf) { sws_freeContext(vf->priv->ctx); free(vf->priv); } static int vf_open(vf_instance_t *vf, char *args) { vf->config=config; vf->query_format=query_format; vf->put_image=put_image; vf->uninit=uninit; vf->priv = calloc(1, sizeof (struct vf_priv_s)); vf->priv->field = 2; if (args) sscanf(args, "%d", &vf->priv->field); halfpack = halfpack_C; #if HAVE_MMX if(gCpuCaps.hasMMX) halfpack = halfpack_MMX; #endif return 1; } const vf_info_t vf_info_halfpack = { "yuv planar 4:2:0 -> packed 4:2:2, half height", "halfpack", "Richard Felker", "", vf_open, NULL };