Changeset 289aade717ba57b0a47ea0aab00b3f5ca98a826b

Timestamp:

03/01/04 13:54:56 (5 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

Rocky Bernstein <rocky@videolan.org> 1073134496 +0000

git-parent:

[3a903d5fc45aaccbe084de600c2b3b47ee9b7df9]

git-author:

Rocky Bernstein <rocky@videolan.org> 1073134496 +0000

Message:

ogt.c cvd.c, subtitle.h: move common debug string help into subtitle.h
{cvd,ogt}_parse.c, common.c, subtitle.h: add ability to dump subtitles via
libpng.

Files:

• modules/codec/ogt/common.c (modified) (5 diffs)
• modules/codec/ogt/common.h (modified) (3 diffs)
• modules/codec/ogt/cvd.c (modified) (6 diffs)
• modules/codec/ogt/cvd_parse.c (modified) (4 diffs)
• modules/codec/ogt/ogt.c (modified) (2 diffs)
• modules/codec/ogt/ogt_parse.c (modified) (6 diffs)
• modules/codec/ogt/subtitle.h (modified) (3 diffs)

modules/codec/ogt/common.c

@@ -2 +2 @@
- * Common SVCD and VCD subtitle routines.
- *****************************************************************************
-
-2 2003/12/30 04:43:52
+, 2004
+3 2004/01/03 12:54:56
- *
- * Author: Rocky Bernstein
@@ -35 +35 @@
-#include "subtitle.h"
-#include "common.h"
+#ifdef HAVE_LIBPNG
+#include "write_png.h"
+#endif
-
-/*****************************************************************************
@@ -124 +127 @@
-
-  if ( chunk_length > 0 ) {
+#if 0
+    int i;
+    int8_t *b=buffer;
+    for (i=0; i<chunk_length; i++)
+      printf ("%02x", b[i]);
+    printf("\n");
+#endif
+    
-    memcpy(p_sys->subtitle_data + p_sys->subtitle_data_pos,
-       buffer, chunk_length);
@@ -176 +187 @@
-  
-  for ( ; n >= 0 ; n-- ) {
-i
+
-  }
-}
@@ -303 +314 @@
-}
-
+/* 
+   Dump an a subtitle image to standard output - for debugging.
+ */
+void VCDSubDumpImage( uint8_t *p_image, uint32_t i_height, uint32_t i_width )
+{
+  uint8_t *p = p_image;
+  unsigned int i_row;    /* scanline row number */
+  unsigned int i_column; /* scanline column number */
+
+  printf("-------------------------------------\n++");
+  for ( i_row=0; i_row < i_height; i_row ++ ) {
+    for ( i_column=0; i_column<i_width; i_column++ ) {
+      printf("%1d", *p++ & 0x03);
+    }
+    printf("\n++");
+  }
+  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
+    http://people.ee.ethz.ch/~buc/brechbuehler/mirror/color/ColorFAQ.html
+ 
+    Thanks to Billy Biggs <vektor@dumbterm.net> for the pointer and
+    the following conversion.
+ 
+    R' = [ 1.1644         0    1.5960 ]   ([ Y' ]   [  16 ])
+    G' = [ 1.1644   -0.3918   -0.8130 ] * ([ Cb ] - [ 128 ])
+    B' = [ 1.1644    2.0172         0 ]   ([ Cr ]   [ 128 ])
+
+  See also vlc/modules/video_chroma/i420_rgb.h and
+  vlc/modules/video_chroma/i420_rgb_c.h for a way to do this in a way
+  more optimized for integer arithmetic. Would be nice to merge the
+  two routines.
+ 
+***************************************************/
+
+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
+#define PALETTE_SIZE  4
+/* Note the below assumes the above is a power of 2 */
+#define PALETTE_SIZE_MASK (PALETTE_SIZE-1)
+
+/* 
+   Dump an a subtitle image to a Portable Network Graphics (PNG) file.
+   All we do here is convert YUV palette entries to RGB, expand
+   the image into a linear RGB pixel array, and call the routine
+   that does the PNG writing.
+ */
+
+void 
+VCDSubDumpPNG( uint8_t *p_image, decoder_t *p_dec,
+           uint32_t i_height, uint32_t i_width, const char *filename,
+           png_text *text_ptr, int i_text_count )
+{
+  decoder_sys_t *p_sys = p_dec->p_sys;
+  uint8_t *p = p_image;
+  uint8_t *image_data = malloc(BYTES_PER_RGB * i_height * i_width );
+  uint8_t *q = image_data;
+  unsigned int i_row;    /* scanline row number */
+  unsigned int i_column; /* scanline column number */
+  uint8_t rgb_palette[PALETTE_SIZE * BYTES_PER_RGB];
+  int i;
+
+  dbg_print( (DECODE_DBG_CALL), "%s", filename);
+  
+  if (NULL == image_data) return;
+
+  /* Convert palette YUV into RGB. */
+  for (i=0; i<PALETTE_SIZE; i++) {
+    ogt_yuvt_t *p_yuv     = &(p_sys->p_palette[i]);
+    uint8_t   *p_rgb_out  = &(rgb_palette[i*BYTES_PER_RGB]);
+    yuv2rgb( p_yuv, p_rgb_out );
+  }
+  
+  /* Convert palette entries into linear RGB array. */
+  for ( i_row=0; i_row < i_height; i_row ++ ) {
+    for ( i_column=0; i_column<i_width; i_column++ ) {
+      uint8_t *p_rgb = &rgb_palette[ ((*p)&PALETTE_SIZE_MASK)*BYTES_PER_RGB ];
+      *q++ = p_rgb[0];
+      *q++ = p_rgb[1];
+      *q++ = p_rgb[2];
+      p++;
+    }
+  }
+  
+  write_png( filename, i_height, i_width, image_data, text_ptr, i_text_count );
+  free(image_data);
+}
+#endif /*HAVE_LIBPNG*/

modules/codec/ogt/common.h

@@ -2 +2 @@
- * Header for Common SVCD and VCD subtitle routines.
- *****************************************************************************
-
-2 2003/12/30 04:43:52
+, 2004
+3 2004/01/03 12:54:56
- *
- * Author: Rocky Bernstein
@@ -23 +23 @@
-
-void           VCDSubClose  ( vlc_object_t * );
+
-void           VCDSubInitSubtitleBlock( decoder_sys_t * p_sys );
+
-void           VCDSubInitSubtitleData(decoder_sys_t *p_sys);
+
-void           VCDSubAppendData( decoder_t *p_dec, uint8_t *buffer, 
-                 uint32_t buf_len );
@@ -31 +34 @@
-void           VCDSubScaleX( decoder_t *p_dec, subpicture_t *p_spu, 
-                 unsigned int i_scale_x, unsigned int i_scale_y );
+
-void           VCDSubDestroySPU( subpicture_t *p_spu );
+
-int            VCDSubCropCallback( vlc_object_t *p_object, char const *psz_var,
-                   vlc_value_t oldval, vlc_value_t newval, 
-                   void *p_data );
+
-void           VCDSubUpdateSPU( subpicture_t *p_spu, vlc_object_t *p_object );
+
-void           VCDInlinePalette ( /*inout*/ uint8_t *p_dest, 
-                  decoder_sys_t *p_sys, unsigned int i_height, 
-                  unsigned int i_width );
-
+void           VCDSubDumpImage( uint8_t *p_image, uint32_t i_height, 
+                uint32_t i_width );
-
-
+
+
+
+
+
+
+

modules/codec/ogt/cvd.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003 VideoLAN
-5 2004/01/01 13:54:24
+6 2004/01/03 12:54:56
- *
- * Authors: Rocky Bernstein
@@ -37 +37 @@
-#include "common.h"
-
-#define DEBUG_LONGTEXT N_( \
-    "This integer when viewed in binary is a debugging mask\n" \
-    "external call          1\n" \
-    "all calls              2\n" \
-    "packet assembly info   4\n" \
-    "image bitmaps          8\n" \
-    "image transformations 16\n" \
-    "misc info             32\n" )
-
-/*****************************************************************************
- * Module descriptor.
@@ -325 +316 @@
-               v, p[1], p[2], p[3]);
-        
-i
-i
-i
+
+
+
-        break;
-      }
@@ -344 +335 @@
-        
-        /* Highlight Palette */
-i
-i
-i
+
+
+
-        break;
-      }
@@ -352 +343 @@
-    case 0x37:
-      /* transparency for primary palette */
-i
-i
-i
-i
+
+
+
+
-
-      dbg_print( DECODE_DBG_PACKET,
-             "transparancy for primary palette 0..3: "
-             "0x%0x 0x%0x 0x%0x 0x%0x",
-i
-i
-i
-i
+
+
+
+
-
-      break;
@@ -369 +360 @@
-    case 0x3f:
-      /* transparency for highlight palette */
-i
-i
-i
-i
+
+
+
+
-
-      dbg_print( DECODE_DBG_PACKET,
-             "transparancy for primary palette 0..3: "
-             "0x%0x 0x%0x 0x%0x 0x%0x",
-i
-i
-i
-i
+
+
+
+
-
-      break;

modules/codec/ogt/cvd_parse.c

@@ -2 +2 @@
- * parse.c: Philips OGT (SVCD subtitle) packet parser
- *****************************************************************************
-
-4 2003/12/30 04:43:52
+, 2004
+5 2004/01/03 12:54:56
- *
- * Authors: Rocky Bernstein 
@@ -37 +37 @@
-#include "cvd.h"
-#include "common.h"
+
+#ifdef HAVE_LIBPNG
+#include <png.h>
+#endif
-
-/* An image color is a two-bit palette entry: 0..3 */ 
@@ -265 +269 @@
-      i_nibble_field = 2;  /* 4-bit pieces available in *p */
-
+#if 0
+      unsigned int i;
+      int8_t *b=p;
+      for (i=0; i< i_width * i_height; i++)
+    printf ("%02x", b[i]);
+      printf("\n");
+#endif
+    
-      for ( i_row=i_field; i_row < i_height; i_row += 2 ) {
-    b_filling   = VLC_FALSE;
@@ -327 +339 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    VCDInlinePalette( p_dest, p_sys, i_height, i_width );

modules/codec/ogt/ogt.c

@@ -2 +2 @@
- * ogt.c : Overlay Graphics Text (SVCD subtitles) decoder thread
- *****************************************************************************
-
-7 2004/01/01 13:55:17
-
-s
+, 2004
+8 2004/01/03 12:54:56
+
+
- *   based on code from:
- *       Julio Sanchez Fernandez (http://subhandler.sourceforge.net)
@@ -36 +36 @@
-#include "ogt.h"
-#include "common.h"
-
-#define DEBUG_LONGTEXT N_( \
-    "This integer when viewed in binary is a debugging mask\n" \
-    "external call          1\n" \
-    "all calls              2\n" \
-    "packet assembly info   4\n" \
-    "image bitmaps          8\n" \
-    "image transformations 16\n" \
-    "rendering information 32\n" \
-    "misc info             64\n" )
-
-
-/*****************************************************************************

modules/codec/ogt/ogt_parse.c

@@ -2 +2 @@
- * Philips OGT (SVCD subtitle) packet parser
- *****************************************************************************
-
-4 2003/12/30 04:43:52
+, 2004
+5 2004/01/03 12:54:56
- *
- * Author: Rocky Bernstein 
@@ -37 +37 @@
-#include "render.h"
-#include "ogt.h"
+
+#ifdef HAVE_LIBPNG
+#include <png.h>
+#endif
-
-/* An image color is a two-bit palette entry: 0..3 */ 
@@ -105 +109 @@
-  
-  for (i=0; i<4; i++) {
-i
-i
-i
+
+
+
-    /* OGT has 8-bit resolution for alpha, but DVD's and CVDS use 4-bits.
-       Since we want to use the same render routine, rather than scale up
-       CVD (and DVD) subtitles, we'll scale down ours. 
-    */
-i
+
-  }
-  p_sys->i_cmd = *p++;
@@ -137 +141 @@
-    for (i=0; i<4; i++) {
-      msg_Dbg( p_dec, "palette[%d]= T: %2x, Y: %2x, u: %2x, v: %2x", i,
-i_palette[i].s.t, p_sys->pi
-i_palette[i].s.u, p_sys->pi
+_palette[i].s.t, p_sys->p
+_palette[i].s.u, p_sys->p
-    }
-  }
@@ -326 +330 @@
-    }
-
-p_sys->i_debug & DECODE_DBG_IMAGE)    
+(p_sys->i_debug & DECODE_DBG_IMAGE))
-      printf("\n");
-
@@ -338 +342 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    VCDInlinePalette( p_dest, p_sys, i_height, i_width );
+    
-
-    /* The video is automatically scaled. However subtitle bitmaps

modules/codec/ogt/subtitle.h

@@ -2 +2 @@
- * subtitle.h : Common SVCD and CVD subtitles header
- *****************************************************************************
-
-2 2003/12/28 11:26:52
+,2004
+3 2004/01/03 12:54:56
- *
- * Author: Rocky Bernstein
@@ -31 +31 @@
-#define DECODE_DBG_TRANSFORM  16 /* bitmap transformations */
-#define DECODE_DBG_RENDER     32 /* rendering information */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define DECODE_DEBUG 1
@@ -125 +137 @@
-  uint16_t i_width, i_height;   /* dimensions in pixels of image */
-
-i
+
-                          in subtitle */
-
-
-i
+
-                               for CVD */
-