# HG changeset patch # User arpi # Date 1018707537 0 # Node ID dc8ebd9736f461a58985d04fcd036ac3e8ce907d # Parent cd819650484df5a55df7aa711b7f5895138518ec rgb2bgr converter diff -r cd819650484d -r dc8ebd9736f4 libmpcodecs/Makefile --- a/libmpcodecs/Makefile Sat Apr 13 13:44:23 2002 +0000 +++ b/libmpcodecs/Makefile Sat Apr 13 14:18:57 2002 +0000 @@ -6,7 +6,7 @@ AUDIO_SRCS=dec_audio.c ad.c ad_a52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dk4adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_vorbis.c ad_libmad.c VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_zlib.c vd_mpegpes.c -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_fame.c vf_format.c vf_yuy2.c vf_flip.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_fame.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ifeq ($(PNG),yes) diff -r cd819650484d -r dc8ebd9736f4 libmpcodecs/vf.c --- a/libmpcodecs/vf.c Sat Apr 13 13:44:23 2002 +0000 +++ b/libmpcodecs/vf.c Sat Apr 13 14:18:57 2002 +0000 @@ -18,6 +18,7 @@ extern vf_info_t vf_info_format; extern vf_info_t vf_info_yuy2; extern vf_info_t vf_info_flip; +extern vf_info_t vf_info_rgb2bgr; char** vo_plugin_args=(char**) NULL; @@ -33,6 +34,7 @@ &vf_info_format, &vf_info_yuy2, &vf_info_flip, + &vf_info_rgb2bgr, NULL }; diff -r cd819650484d -r dc8ebd9736f4 libmpcodecs/vf_rgb2bgr.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpcodecs/vf_rgb2bgr.c Sat Apr 13 14:18:57 2002 +0000 @@ -0,0 +1,101 @@ +#include +#include +#include +#include + +#include "../config.h" +#include "../mp_msg.h" + +#include "../libvo/img_format.h" +#include "../mp_image.h" +#include "vf.h" + +#include "../libvo/fastmemcpy.h" +#include "../postproc/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_s* 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 void put_image(struct vf_instance_s* vf, mp_image_t *mpi){ + 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]){ + int y; + unsigned char* src=mpi->planes[0]; + unsigned char* dst=dmpi->planes[0]; + int srcsize=mpi->w*mpi->bpp/8; + for(y=0;yh;y++){ + if(mpi->bpp==32) + rgb32tobgr32(src,dst,srcsize); + else + rgb24tobgr24(src,dst,srcsize); + } + } 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); + } + + vf_next_put_image(vf,dmpi); +} + +//===========================================================================// + +static int query_format(struct vf_instance_s* 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 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; +} + +vf_info_t vf_info_rgb2bgr = { + "fast 24/32bpp RGB<->BGR conversion", + "rgb2bgr", + "A'rpi", + "", + open +}; + +//===========================================================================//