changeset 31284:c02ae498fb2e

remove libmpcodecs/vf_rgb2bgr.c Its functionality has been superseeded by sws by quite some time, and the "swap" functionality is now provided by vf_format. see http://comments.gmane.org/gmane.comp.video.mplayer.devel/55804 for a full discussion.

--- a/Changelog	Tue Jun 08 20:11:01 2010 +0000
+++ b/Changelog	Wed Jun 09 07:26:54 2010 +0000
@@ -30,6 +30,7 @@
 
     Filters:
     * remove vf_yuy2, functionality is replaced by -vf format=yuv2
+    * remove vf_rgb2bgr, functionality is replaced by sws and vf_format
 
     Drivers:
     * -vo yuv4mpeg:interlaced no longer does its own interlaced RGB->YUV

--- a/DOCS/man/en/mplayer.1	Tue Jun 08 20:11:01 2010 +0000
+++ b/DOCS/man/en/mplayer.1	Wed Jun 09 07:26:54 2010 +0000
@@ -6092,16 +6092,6 @@
 Clamps YUV color values to the CCIR 601 range without doing real conversion.
 .
 .TP
-.B rgb2bgr[=swap]
-RGB 24/32 <\-> BGR 24/32 colorspace conversion.
-.PD 0
-.RSs
-.IPs "swap\ "
-Also perform  R <\-> B swapping.
-.RE
-.PD 1
-.
-.TP
 .B palette
 RGB/BGR 8 \-> 15/16/24/32bpp colorspace conversion using palette.
 .

--- a/DOCS/tech/libmpcodecs.txt	Tue Jun 08 20:11:01 2010 +0000
+++ b/DOCS/tech/libmpcodecs.txt	Wed Jun 09 07:26:54 2010 +0000
@@ -229,7 +229,7 @@
 }
 
 For the more complex case, when you have an N -> M colorspace mapping matrix,
-see vf_scale or vf_rgb2bgr for examples.
+see vf_scale or vf_format for examples.
 
 
     int (*config)(struct vf_instance *vf,

--- a/Makefile	Tue Jun 08 20:11:01 2010 +0000
+++ b/Makefile	Wed Jun 09 07:26:54 2010 +0000
@@ -445,7 +445,6 @@
               libmpcodecs/vf_pullup.c \
               libmpcodecs/vf_rectangle.c \
               libmpcodecs/vf_remove_logo.c \
-              libmpcodecs/vf_rgb2bgr.c \
               libmpcodecs/vf_rgbtest.c \
               libmpcodecs/vf_rotate.c \
               libmpcodecs/vf_sab.c \

--- a/libmpcodecs/vf.c	Tue Jun 08 20:11:01 2010 +0000
+++ b/libmpcodecs/vf.c	Wed Jun 09 07:26:54 2010 +0000
@@ -52,7 +52,6 @@
 extern const vf_info_t vf_info_format;
 extern const vf_info_t vf_info_noformat;
 extern const vf_info_t vf_info_flip;
-extern const vf_info_t vf_info_rgb2bgr;
 extern const vf_info_t vf_info_rotate;
 extern const vf_info_t vf_info_mirror;
 extern const vf_info_t vf_info_palette;
@@ -137,7 +136,6 @@
     &vf_info_format,
     &vf_info_noformat,
     &vf_info_flip,
-    &vf_info_rgb2bgr,
     &vf_info_rotate,
     &vf_info_mirror,
     &vf_info_palette,

--- a/libmpcodecs/vf_rgb2bgr.c	Tue Jun 08 20:11:01 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
- * 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
-};
-
-//===========================================================================//