Mercurial > mplayer.hg
view libmpcodecs/vf_fil.c @ 17279:600d0b740940
"Currently mplayer looks for only one MP3 frame sync. The attached
patch makes it to look for two consecutive valid MP3 frame headers,
reducing the probability of false positives, which causes Bug 380.
Funny that the fix is so simple. Seems that someone has forgotten to
initialize MP3_resync correctly.
Also this is the recommended way to sync MP3 frames. See
http://www.dv.co.yu/mpgscript/mpeghdr.htm. "
Original thread:
Date: Dec 31, 2005 10:15 AM
Subject: [MPlayer-dev-eng] [PATCH] Try twice when searching for MP3 frame header, fixes Bug 380
author | gpoirier |
---|---|
date | Sat, 31 Dec 2005 18:56:35 +0000 |
parents | 6ff3379a0862 |
children | 20aca9baf5d8 |
line wrap: on
line source
#include <stdio.h> #include <stdlib.h> #include <string.h> #include "config.h" #include "mp_msg.h" #include "mp_image.h" #include "vf.h" #include "libvo/fastmemcpy.h" struct vf_priv_s { int interleave; int height; int width; int stridefactor; }; //===========================================================================// static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int pixel_stride= (width+15)&~15; //FIXME this is ust a guess ... especially for non planar its somewhat bad one #if 0 if(mpi->flags&MP_IMGFLAG_PLANAR) pixel_stride= mpi->stride[0]; else pixel_stride= 8*mpi->stride[0] / mpi->bpp; #endif if(vf->priv->interleave){ vf->priv->height= 2*height; vf->priv->width= width - (pixel_stride/2); vf->priv->stridefactor=1; }else{ vf->priv->height= height/2; vf->priv->width= width + pixel_stride; vf->priv->stridefactor=4; } //printf("hX %d %d %d\n", vf->priv->width,vf->priv->height,vf->priv->stridefactor); return vf_next_config(vf, vf->priv->width, vf->priv->height, (d_width*vf->priv->stridefactor)>>1, 2*d_height/vf->priv->stridefactor, flags, outfmt); } static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_DIRECT){ // we've used DR, so we're ready... return vf_next_put_image(vf,(mp_image_t*)mpi->priv); } vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, vf->priv->width, vf->priv->height); // set up mpi as a double-stride image of dmpi: vf->dmpi->planes[0]=mpi->planes[0]; vf->dmpi->stride[0]=(mpi->stride[0]*vf->priv->stridefactor)>>1; if(vf->dmpi->flags&MP_IMGFLAG_PLANAR){ vf->dmpi->planes[1]=mpi->planes[1]; vf->dmpi->stride[1]=(mpi->stride[1]*vf->priv->stridefactor)>>1; vf->dmpi->planes[2]=mpi->planes[2]; vf->dmpi->stride[2]=(mpi->stride[2]*vf->priv->stridefactor)>>1; } else vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!! return vf_next_put_image(vf,vf->dmpi); } //===========================================================================// static void uninit(struct vf_instance_s* vf) { free(vf->priv); } static int open(vf_instance_t *vf, char* args){ vf->config=config; vf->put_image=put_image; vf->uninit=uninit; vf->default_reqs=VFCAP_ACCEPT_STRIDE; vf->priv=calloc(1, sizeof(struct vf_priv_s)); vf->priv->interleave= args && (*args == 'i'); return 1; } vf_info_t vf_info_fil = { "fast (de)interleaver", "fil", "Michael Niedermayer", "", open, NULL }; //===========================================================================//