render.c: RV16 now works great - uses all colors, but no transparancy.

Started RV32 and- has bugs. (It'd be nice if something in rendering
worked the first time without a hassle).

Modules.am, pixmap.h, subtitle.h: Some of the pixel stuff has been
moved here.

cvd.c: remove option duplicated with ogt.c Probably should be hoisted more
to a main routine. Perhaps if spudec is folded in.

modules/codec/ogt/Modules.am

 SOURCES_svcdsub = \
 	common.c \
 	common.h \
+	subtitle.h \
 	ogt.c \
 	ogt.h \
-	subtitle.h \
 	ogt_parse.c \
+	pixmap.h \
 	render.c \
 	render.h \
 	write_png.c \
@@ -18,6 +19,7 @@ SOURCES_cvdsub = \
 	cvd.h \
 	subtitle.h \
 	cvd_parse.c \
+	pixmap.h \
 	render.c \
 	render.h \
 	write_png.c \

modules/codec/ogt/common.c

@@ -2,7 +2,7 @@
  * Common SVCD and VCD subtitle routines.
  *****************************************************************************
  * Copyright (C) 2003, 2004 VideoLAN
- * $Id: common.c,v 1.6 2004/01/14 11:47:19 rocky Exp $
+ * $Id: common.c,v 1.7 2004/01/16 04:14:54 rocky Exp $
  *
  * Author: Rocky Bernstein
  *   based on code from:
@@ -33,6 +33,7 @@
 #include <vlc/decoder.h>
 
 #include "subtitle.h"
+#include "pixmap.h"
 #include "common.h"
 #ifdef HAVE_LIBPNG
 #include "write_png.h"
@@ -346,49 +347,50 @@ VCDSubHandleScaling( subpicture_t *p_spu, decoder_t *p_dec )
   if (p_vout) {
     /* Check for user-configuration override. */
     unsigned int i_new_aspect = VCDSubGetAROverride( p_input, p_vout );
-        if (i_new_aspect == VOUT_ASPECT_FACTOR) {
-          /* For scaling 1:1, nothing needs to be done. Note this means
-             subtitles will get scaled the same way the video does.
-          */
-          ;
-        } else {
-          if (0 == i_new_aspect) {
-            /* Counteract the effects of background video scaling when
-               there is scaling. That's why x and y are reversed from
-               the else branch in the call below.
-            */
-            switch( p_vout->output.i_chroma )
-              {
-                /* chromas which are not scaled: */
-              case VLC_FOURCC('I','4','2','0'):
-              case VLC_FOURCC('I','Y','U','V'):
-              case VLC_FOURCC('Y','V','1','2'):
-              case VLC_FOURCC('Y','U','Y','2'):
-                return;
-                break;
-                
-                /* chromas which are scaled: */
-              case VLC_FOURCC('R','V','1','6'):
-              case VLC_FOURCC('R','V','2','4'):
-              case VLC_FOURCC('R','V','3','2'):
-              case VLC_FOURCC('R','G','B','2'):
-                break;
-                
-              default:
-                msg_Err( p_vout, "unknown chroma %x", 
-                         p_vout->output.i_chroma );
-                return;
-                break;
-              }
-            /* We get here only for scaled chromas. */
-            vout_AspectRatio( p_vout->render.i_aspect, &i_aspect_y, 
-                              &i_aspect_x );
-          } else {
-            /* User knows best? */
-            vout_AspectRatio( i_new_aspect, &i_aspect_x, &i_aspect_y );
+
+    if (i_new_aspect == VOUT_ASPECT_FACTOR) {
+      /* For scaling 1:1, nothing needs to be done. Note this means
+         subtitles will get scaled the same way the video does.
+      */
+      ;
+    } else {
+      if (0 == i_new_aspect) {
+        /* Counteract the effects of background video scaling when
+           there is scaling. That's why x and y are reversed from
+           the else branch in the call below.
+        */
+        switch( p_vout->output.i_chroma )
+          {
+            /* chromas which are not scaled: */
+          case VLC_FOURCC('I','4','2','0'):
+          case VLC_FOURCC('I','Y','U','V'):
+          case VLC_FOURCC('Y','V','1','2'):
+          case VLC_FOURCC('Y','U','Y','2'):
+            break;
+            
+            /* chromas which are scaled: */
+          case VLC_FOURCC('R','V','1','6'):
+          case VLC_FOURCC('R','V','2','4'):
+          case VLC_FOURCC('R','V','3','2'):
+          case VLC_FOURCC('R','G','B','2'):
+            return;
+            break;
+            
+          default:
+            msg_Err( p_vout, "unknown chroma %x", 
+                     p_vout->output.i_chroma );
+            return;
+            break;
           }
-          VCDSubScaleX( p_dec, p_spu, i_aspect_x, i_aspect_y );
-        }
+        /* We get here only for scaled chromas. */
+        vout_AspectRatio( p_vout->render.i_aspect, &i_aspect_y, 
+                          &i_aspect_x );
+      } else {
+        /* User knows best? */
+        vout_AspectRatio( i_new_aspect, &i_aspect_x, &i_aspect_y );
+      }
+      VCDSubScaleX( p_dec, p_spu, i_aspect_x, i_aspect_y );
+    }
   }
 }
 
@@ -466,20 +468,6 @@ void VCDSubDumpImage( uint8_t *p_image, uint32_t i_height, uint32_t i_width )
   printf("\n-------------------------------------\n");
 }
 
-/* 
-   FIXME: 
-   MOVE clip_8_bit and uuv2rgb TO A MORE GENERIC PLACE.
- */
-
-/* Force v in the range 0.255 */
-static inline uint8_t 
-clip_8_bit(int v)
-{
-  if (v<0)   return 0;
-  if (v>255) return 255;
-  return (uint8_t) v;
-}
-
 /***************************************************
    Color conversion from
     http://www.inforamp.net/~poynton/notes/colour_and_gamma/ColorFAQ.html#RTFToC30
@@ -499,28 +487,6 @@ clip_8_bit(int v)
  
 ***************************************************/
 
-static inline void
-yuv2rgb(ogt_yuvt_t *p_yuv, uint8_t *p_rgb_out )
-{
-  
-  int i_Y  = p_yuv->s.y - 16;
-  int i_Cb = p_yuv->s.v - 128;
-  int i_Cr = p_yuv->s.u - 128;
-  
-  int i_red   = (1.1644 * i_Y) + (1.5960 * i_Cr);
-  int i_green = (1.1644 * i_Y) - (0.3918 * i_Cb) - (0.8130 * i_Cr);
-  int i_blue  = (1.1644 * i_Y) + (2.0172 * i_Cb);
-  
-  i_red   = clip_8_bit( i_red );
-  i_green = clip_8_bit( i_green );
-  i_blue  = clip_8_bit( i_blue );
-  
-  *p_rgb_out++ = i_red;
-  *p_rgb_out++ = i_green;
-  *p_rgb_out++ = i_blue;
-  
-}
-
 #ifdef HAVE_LIBPNG
 
 #define BYTES_PER_RGB 3

modules/codec/ogt/cvd.c

@@ -2,7 +2,7 @@
  * cvd.c : CVD Subtitle decoder thread
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: cvd.c,v 1.10 2004/01/14 11:47:19 rocky Exp $
+ * $Id: cvd.c,v 1.11 2004/01/16 04:14:54 rocky Exp $
  *
  * Authors: Rocky Bernstein
  *   based on code from:
@@ -51,10 +51,6 @@ vlc_module_begin();
                   N_("set debug mask for additional debugging."),
                   N_(DEBUG_LONGTEXT), VLC_TRUE );
 
-    add_string( "sub-aspect-ratio", "", NULL,
-                SUB_ASPECT_RATIO_TEXT, SUB_ASPECT_RATIO_LONGTEXT, 
-		VLC_TRUE );
-
     add_integer( MODULE_STRING "-duration-scaling", 9, NULL,
 		 DURATION_SCALE_TEXT, DURATION_SCALE_LONGTEXT,
 		 VLC_TRUE );

modules/codec/ogt/pixmap.h

+/*****************************************************************************
+ * Common pixel/chroma manipulation routines.
+ *****************************************************************************
+ * Copyright (C) 2003, 2004 VideoLAN
+ * $Id: pixmap.h,v 1.1 2004/01/16 04:14:54 rocky Exp $
+ *
+ * Author: Rocky Bernstein
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+#ifndef PIXMAP_H
+#define PIXMAP_H 
+
+/* Color and transparency of a pixel or a palette (CLUT) entry */
+typedef union {
+  uint8_t plane[4];
+  struct {
+    uint8_t y;
+    uint8_t v;
+    uint8_t u;
+    uint8_t t;
+  } s;
+} ogt_yuvt_t;
+
+/* Force v in the range 0.255 */
+static inline uint8_t 
+clip_8_bit(int v)
+{
+  if (v<0)   return 0;
+  if (v>255) return 255;
+  return (uint8_t) v;
+}
+
+static inline void
+yuv2rgb(ogt_yuvt_t *p_yuv, uint8_t *p_rgb_out )
+{
+  
+  int i_Y  = p_yuv->s.y - 16;
+  int i_Cb = p_yuv->s.v - 128;
+  int i_Cr = p_yuv->s.u - 128;
+  
+  int i_red   = (1.1644 * i_Y) + (1.5960 * i_Cr);
+  int i_green = (1.1644 * i_Y) - (0.3918 * i_Cb) - (0.8130 * i_Cr);
+  int i_blue  = (1.1644 * i_Y) + (2.0172 * i_Cb);
+  
+  i_red   = clip_8_bit( i_red );
+  i_green = clip_8_bit( i_green );
+  i_blue  = clip_8_bit( i_blue );
+  
+  *p_rgb_out++ = i_red;
+  *p_rgb_out++ = i_green;
+  *p_rgb_out++ = i_blue;
+  
+}
+
+#endif /* PIXMAP_H */

modules/codec/ogt/subtitle.h

@@ -2,7 +2,7 @@
  * subtitle.h : Common SVCD and CVD subtitles header
  *****************************************************************************
  * Copyright (C) 2003,2004 VideoLAN
- * $Id: subtitle.h,v 1.7 2004/01/14 11:47:19 rocky Exp $
+ * $Id: subtitle.h,v 1.8 2004/01/16 04:14:54 rocky Exp $
  *
  * Author: Rocky Bernstein
  *   based on code from:
@@ -24,6 +24,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#include "pixmap.h"
+
 #define DECODE_DBG_EXT         1 /* Calls from external routines */
 #define DECODE_DBG_CALL        2 /* all calls */
 #define DECODE_DBG_PACKET      4 /* packet assembly info */
@@ -93,17 +95,6 @@ typedef enum  {
   SUBTITLE_BLOCK_COMPLETE
 } packet_state_t;
 
-/* Color and transparency of a pixel or a palette (CLUT) entry */
-typedef union {
-  uint8_t plane[4];
-  struct {
-    uint8_t y;
-    uint8_t v;
-    uint8_t u;
-    uint8_t t;
-  } s;
-} ogt_yuvt_t;
-
 /* The storage used by one pixel */
 #define PIXEL_SIZE 4