changeset 31265:59f9bf345c0f

Extend -vf format to allow substituting the format for a compatible one (e.g. chaning rgb24 to bgr24).

--- a/DOCS/man/en/mplayer.1	Sat Jun 05 17:45:35 2010 +0000
+++ b/DOCS/man/en/mplayer.1	Sat Jun 05 17:55:20 2010 +0000
@@ -6101,7 +6101,7 @@
 RGB/BGR 8 \-> 15/16/24/32bpp colorspace conversion using palette.
 .
 .TP
-.B format[=fourcc]
+.B format[=fourcc[:outfourcc]]
 Restricts the colorspace for the next filter without doing any conversion.
 Use together with the scale filter for a real conversion.
 .br
@@ -6111,6 +6111,17 @@
 .RSs
 .IPs <fourcc>
 format name like rgb15, bgr24, yv12, etc (default: yuy2)
+.IPs <outfourcc>
+Format name that should be substituted for the output.
+If this is not 100% compatible with the <fourcc> value it will crash.
+.br
+Valid examples:
+.br
+format=rgb24:bgr24 format=yuyv:yuy2
+.br
+Invalid examples (will crash):
+.br
+format=rgb24:yv12
 .RE
 .PD 1
 .

--- a/libmpcodecs/vf_format.c	Sat Jun 05 17:45:35 2010 +0000
+++ b/libmpcodecs/vf_format.c	Sat Jun 05 17:55:20 2010 +0000
@@ -34,28 +34,42 @@
 
 static struct vf_priv_s {
     unsigned int fmt;
+    unsigned int outfmt;
 } const vf_priv_dflt = {
-  IMGFMT_YUY2
+  IMGFMT_YUY2,
+  0
 };
 
 //===========================================================================//
 
 static int query_format(struct vf_instance *vf, unsigned int fmt){
-    if(fmt==vf->priv->fmt)
+    if(fmt==vf->priv->fmt) {
+        if (vf->priv->outfmt)
+            fmt = vf->priv->outfmt;
 	return vf_next_query_format(vf,fmt);
+    }
     return 0;
 }
 
+static int config(struct vf_instance *vf, int width, int height,
+                  int d_width, int d_height,
+                  unsigned flags, unsigned outfmt){
+    return vf_next_config(vf, width, height, d_width, d_height, flags, vf->priv->outfmt);
+}
+
 static int vf_open(vf_instance_t *vf, char *args){
     vf->query_format=query_format;
     vf->draw_slice=vf_next_draw_slice;
     vf->default_caps=0;
+    if (vf->priv->outfmt)
+        vf->config=config;
     return 1;
 }
 
 #define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f)
 static const m_option_t vf_opts_fields[] = {
   {"fmt", ST_OFF(fmt), CONF_TYPE_IMGFMT, 0,0 ,0, NULL},
+  {"outfmt", ST_OFF(outfmt), CONF_TYPE_IMGFMT, 0,0 ,0, NULL},
   { NULL, NULL, 0, 0, 0, 0,  NULL }
 };