Mercurial > mplayer.hg
view libmpcodecs/vf_rgb2bgr.c @ 31246:cc6ee3017097
Limit buffered PTS only when we actually got a frame from the decoder.
This avoids some issues with H.264 PAFF due to dropping PTS values too
early because only every second packet actually produced output.
Just keeping up to one additional pts value would have avoided this
particular issue as well, but this is more generic.
author | reimar |
---|---|
date | Thu, 03 Jun 2010 20:59:40 +0000 |
parents | a972c1a4a012 |
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 "img_format.h" #include "mp_image.h" #include "vf.h" #include "libswscale/rgb2rgb.h" //===========================================================================// struct vf_priv_s { unsigned int fmt; int forced; }; static unsigned int getfmt(unsigned int outfmt,int forced){ if(forced) switch(outfmt){ case IMGFMT_RGB24: case IMGFMT_RGB32: case IMGFMT_BGR24: case IMGFMT_BGR32: return outfmt; } switch(outfmt){ case IMGFMT_RGB24: return IMGFMT_BGR24; case IMGFMT_RGB32: return IMGFMT_BGR32; case IMGFMT_BGR24: return IMGFMT_RGB24; case IMGFMT_BGR32: return IMGFMT_RGB32; } return 0; } static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ vf->priv->fmt=getfmt(outfmt,vf->priv->forced); return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: dmpi=vf_get_image(vf->next,vf->priv->fmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); if(mpi->stride[0]!=dmpi->stride[0] || mpi->stride[0]!=mpi->w*(mpi->bpp/8)){ int y; unsigned char* src=mpi->planes[0]; unsigned char* dst=dmpi->planes[0]; int srcsize=mpi->w*mpi->bpp/8; for(y=0;y<mpi->h;y++){ if(mpi->bpp==32) rgb32tobgr32(src,dst,srcsize); else rgb24tobgr24(src,dst,srcsize); src+=mpi->stride[0]; dst+=dmpi->stride[0]; } } else { if(mpi->bpp==32) rgb32tobgr32(mpi->planes[0],dmpi->planes[0],mpi->w*mpi->h*4); else rgb24tobgr24(mpi->planes[0],dmpi->planes[0],mpi->w*mpi->h*3); } return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// static int query_format(struct vf_instance *vf, unsigned int outfmt){ unsigned int fmt=getfmt(outfmt,vf->priv->forced); if(!fmt) return 0; return vf_next_query_format(vf,fmt) & (~VFCAP_CSP_SUPPORTED_BY_HW); } static int vf_open(vf_instance_t *vf, char *args){ vf->config=config; vf->put_image=put_image; vf->query_format=query_format; vf->priv=malloc(sizeof(struct vf_priv_s)); vf->priv->forced=args && !strcasecmp(args,"swap"); return 1; } const vf_info_t vf_info_rgb2bgr = { "fast 24/32bpp RGB<->BGR conversion", "rgb2bgr", "A'rpi", "", vf_open, NULL }; //===========================================================================//