rgb2bgr converter

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5595 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 104 insertions, 1 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 2fda547f08..f90d12c257 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -6,7 +6,7 @@ LIBNAME2 = libmpencoders.a
 
 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 --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index c2ff5a2689..5e65033582 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -18,6 +18,7 @@ extern vf_info_t vf_info_fame;
 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 @@ static vf_info_t* filter_list[]={
     &vf_info_format,
     &vf_info_yuy2,
     &vf_info_flip,
+    &vf_info_rgb2bgr,
     NULL
 };
 
diff --git a/libmpcodecs/vf_rgb2bgr.c b/libmpcodecs/vf_rgb2bgr.c
new file mode 100644
index 0000000000..3af2bfa2e6
--- /dev/null
+++ b/libmpcodecs/vf_rgb2bgr.c
@@ -0,0 +1,101 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+#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;y<mpi->h;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
+};
+
+//===========================================================================//