Changeset 636df0d7bc8d467c915436684e3fb5580e53255f

Timestamp:

01/31/04 06:53:35 (5 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

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

git-parent:

[acdfa3528ac2065633045d17717c47dae07f6552]

git-author:

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

Message:

render.c: RGB2 now gets the right color from the RGB color map.

And a first cut at handling transparancy values properly. However
to do this we merely needed to

pixmap.[ch]: write our own routines for retrieving a close colormap index

given a pixel value. Well, and also had to

video_chroma/i420_rgb.[ch]: save the RGB colormap that is allocated.

Modules.am: forgot new pixmap.c

others: more misc abstraction/cleanup

Files:

• modules/codec/ogt/Modules.am (modified) (1 diff)
• modules/codec/ogt/common.c (modified) (1 diff)
• modules/codec/ogt/pixmap.c (modified) (8 diffs)
• modules/codec/ogt/pixmap.h (modified) (4 diffs)
• modules/codec/ogt/render.c (modified) (12 diffs)
• modules/video_chroma/i420_rgb.c (modified) (4 diffs)
• modules/video_chroma/i420_rgb.h (modified) (3 diffs)

modules/codec/ogt/Modules.am

@@ -21 +21 @@
-    subtitle.h \
-    cvd_parse.c \
+    pixmap.c \
-    pixmap.h \
-    render.c \

modules/codec/ogt/common.c

@@ -1 +1 @@
-/*****************************************************************************
-VC
+CV
- *****************************************************************************
- * Copyright (C) 2003, 2004 VideoLAN
-1 2004/01/30 13:17:12
+2 2004/01/31 05:53:35
- *
- * Author: Rocky Bernstein <rocky@panix.com>

modules/codec/ogt/pixmap.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003, 2004 VideoLAN
-2 2004/01/30 13:23:08
+3 2004/01/31 05:53:35
- *
- * Author: Rocky Bernstein
@@ -51 +51 @@
-       p_rgb_b[i])
-     */
-8_t  *p_rgb_r;               
-8_t  *p_rgb_g;               
-8_t  *p_rgb_b;               
+16_t  p_rgb_r[CMAP_RGB2_SIZE];
+16_t  p_rgb_g[CMAP_RGB2_SIZE];
+16_t  p_rgb_b[CMAP_RGB2_SIZE];
-};
-
-
-/* Number of entries in RGB palette/colormap*/
-#define CMAP_SIZE 256
-
-/* 
@@ -111 +108 @@
-/** 
-   Find the nearest colormap entry in p_vout (assumed to have RGB2
-entries) that is closest in color to p_yuv
-RGB to the color found and return the colormap index. -1 is returned
-
+8bpp entries) that is closest in color to p_rgb
+out_rgb to the color found and return the colormap index.
+INVALID_CMAP_ENTRY is returned 
-
-   The closest match is determined by the the Euclidean distance
@@ -122 +119 @@
-*/
-
-in
-ogt_yuvt_t *p_yuv
+cmap_
+uint8_t *rgb
-               uint8_t *out_rgb) 
-{
-
-
-
-
+
+
+
-  
-  int i;
-int i_bestmatch=0
+cmap_t i_bestmatch = INVALID_CMAP_ENTRY
-  uint32_t i_mindist = 0xFFFFFFFF; /* The largest number here. */
-
@@ -138 +134 @@
-  
-  if ( !p_vout && p_vout->output.i_chroma  != VLC_FOURCC('R','G','B','2') )
--1
+INVALID_CMAP_ENTRY
-
-  p_cmap_r=p_vout->chroma.p_sys->p_rgb_r;
@@ -144 +140 @@
-  p_cmap_b=p_vout->chroma.p_sys->p_rgb_b;
-
-
-
-
+
-    /* Interval range calculations to show that we don't overflow the
-       word sizes below. pixels component values start out 8
@@ -171 +165 @@
-#define int32_sqr(x) ( ((int32_t) (x)) * ((int32_t) x) )
-
-
+
+
+
+
+
+
+
-                 << SCALEBITS ) ) >> (SCALEBITS*2);
-p_cmap_g[i]
+CMAP8_GREEN(i)
-                 << SCALEBITS ) ) >> (SCALEBITS*2);
-p_cmap_b[i]
- 
+CMAP8_BLUE(i)
+
-
-    uint32_t i_dist = dr + dg + db;
@@ -182 +182 @@
-      i_bestmatch = i;
-      i_mindist = i_dist;
+#if 0      
+      printf("+++Change dist to %d RGB cmap %d (%0x, %0x, %0x)\n", 
+             i_dist, i, p_cmap_r[ i ], p_cmap_g[ i ], p_cmap_b[ i ]);
+#endif
-    }
-  }
-
-
-
-
+
+
+
+
+
+
-
-  return i_bestmatch;
+}
+
+/**
+   Get the the rgb value for a given colormap entry for p_vout (which is'
+   assumed to have RGB2 chroma). 
+
+   VLC_FALSE is returned if there was some error.
+*/
+vlc_bool_t
+query_color(const vout_thread_t *p_vout, cmap_t i_cmap,
+            /*out*/ uint8_t *out_rgb) 
+{
+  uint16_t *p_cmap_r;
+  uint16_t *p_cmap_g;
+  uint16_t *p_cmap_b;
+
+  /* Check that we really have RGB2. */
+  
+  if ( !p_vout && p_vout->output.i_chroma  != VLC_FOURCC('R','G','B','2') )
+    return VLC_FALSE;
+
+  if ( !out_rgb ) 
+    return VLC_FALSE;
+
+  p_cmap_r=p_vout->chroma.p_sys->p_rgb_r;
+  p_cmap_g=p_vout->chroma.p_sys->p_rgb_g;
+  p_cmap_b=p_vout->chroma.p_sys->p_rgb_b;
+
+  out_rgb[RED_PIXEL]   = CMAP8_RED(i_cmap);
+  out_rgb[GREEN_PIXEL] = CMAP8_GREEN(i_cmap);
+  out_rgb[BLUE_PIXEL]  = CMAP8_BLUE(i_cmap);
+
+  return VLC_TRUE;
-}
-

modules/codec/ogt/pixmap.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003, 2004 VideoLAN
-4 2004/01/30 13:17:12
+5 2004/01/31 05:53:35
- *
- * Author: Rocky Bernstein
@@ -36 +36 @@
-  } s;
-} ogt_yuvt_t;
+
+/** An undefined or invalid colormap index. */
+#define INVALID_CMAP_ENTRY -1
+
+/** Type of a palette/colormap index*/
+typedef int16_t cmap_t;
+
+/** Number of entries in RGB palette/colormap*/
+#define CMAP_RGB2_SIZE 256
-
-/**
@@ -114 +123 @@
- */
-static inline void
-
+/*out*/ 
-{
-#ifdef WORDS_BIGENDIAN
@@ -125 +134 @@
-
-/**
-
-chroma, i.e. 256 RGB entries) that is closest in color to p_yuv
-rgb to the color found and return the colormap index. -1 is returned
-
+  
+  chroma, i.e. 256 RGB 8bpp entries) that is closest in color to p_rgb
+  out_rgb to the color found and return the colormap index. 
+  INVALID_CMAP_ENTRY is returned 
-*/
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#endif /* PIXMAP_H */

modules/codec/ogt/render.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003, 2004 VideoLAN
-6 2004/01/29 11:50:22
+7 2004/01/31 05:53:35
- *
- * Author: Rocky Bernstein <rocky@panix.com>
@@ -26 +26 @@
- *****************************************************************************/
-
-BLENDING
+TRANSPARENCY
-
-/*****************************************************************************
@@ -236 +236 @@
-          }
-
-BLENDING
+TRANSPARENCY
-          if (p_source->s.t == MAX_ALPHA) p_source->s.t >>= 1;
-#endif
@@ -435 +435 @@
-            i_avg_tr = ( p_source->s.t + (p_source+1)->s.t ) / 2;
-          
-BLENDING
+TRANSPARENCY
-          if (i_avg_tr == MAX_ALPHA) i_avg_tr >>= 1;
-#endif
@@ -802 +802 @@
-          }
-          
-BLENDING
+TRANSPARENCY
-              if (p_source->s.t == MAX_ALPHA) p_source->s.t >>= 1;
-#endif
@@ -1111 +1111 @@
-          }
-          
-BLENDING
+TRANSPARENCY
-              if (p_source->s.t == MAX_ALPHA) p_source->s.t >>= 2;
-#endif
@@ -1575 +1575 @@
-}
-
+/*
+  Return the colormap index for the average of p_pixel and a subtitle
+  pixel in RGB form.
+ */
+static inline cmap_t
+avg_rgb2(const vout_thread_t *p_vout, uint8_t i_pixel, cmap_t i_cmap_sub,
+         const uint8_t rgb_sub[] )
+{
+  uint8_t rgb_vout[RGB_SIZE];
+  static cmap_t avg_cache[CMAP_RGB2_SIZE][NUM_SUBTITLE_COLORS];
+  static vlc_bool_t b_first_time = VLC_TRUE;
+  int i;
+
+  /* FIXME: really we need to save subtitle number since in theory
+     the palette can change each on each distinct subtitle. In practice
+     this doesn't happen that much.
+   */
+  if (b_first_time) 
+    {
+      int i, j;
+      for (i=0; i<CMAP_RGB2_SIZE; i++) 
+        for (j=0; j<NUM_SUBTITLE_COLORS; j++) 
+          avg_cache[i][j] = INVALID_CMAP_ENTRY;
+    }
+
+  if ( avg_cache[i_pixel][i_cmap_sub] != INVALID_CMAP_ENTRY ) 
+    return avg_cache[i_pixel][i_cmap_sub];
+
+  if ( !query_color(p_vout, i_pixel, rgb_vout) ) return INVALID_CMAP_ENTRY;
+
+  for (i = 0; i < RGB_SIZE; i++) 
+    {
+      rgb_vout[i] = (rgb_vout[i] + rgb_sub[i]) / 2;
+    }
+
+#if 0
+ {
+  uint8_t rgb_approx[RGB_SIZE];
+
+  avg_cache[i_pixel][i_cmap_sub] = 
+    find_cmap_rgb8_nearest(p_vout, rgb_vout, rgb_approx);
+  printf(
+         "cmap old %0x new 0%x sub=(%0x, %0x, %0x) "
+         "avg=(%0x, %0x, %0x) vout=(%0x, %0x, %0x)\n", 
+         i_pixel, i_cmap,
+         rgb_sub[RED_PIXEL], rgb_sub[GREEN_PIXEL], rgb_sub[BLUE_PIXEL],
+         rgb_approx[RED_PIXEL], rgb_approx[GREEN_PIXEL], rgb_approx[BLUE_PIXEL],
+         rgb_vout[RED_PIXEL], rgb_vout[GREEN_PIXEL], rgb_vout[BLUE_PIXEL]);
+ }  
+#else 
+  avg_cache[i_pixel][i_cmap_sub] = 
+    find_cmap_rgb8_nearest(p_vout, rgb_vout, NULL);
+#endif
+  return avg_cache[i_pixel][i_cmap_sub];
+}
+
-#undef  BYTES_PER_PIXEL
-#define BYTES_PER_PIXEL 1
@@ -1602 +1658 @@
-    int i_x_start, i_y_start, i_x_end, i_y_end;
-
- entry colormap
+-entry array of colormap indices
-    uint8_t cmap[NUM_SUBTITLE_COLORS];
-
+
+
+
+
-
-    struct subpicture_sys_t *p_sys = p_spu->p_sys;
@@ -1612 +1671 @@
-                      &i_aspect_x );
-    
-    /* Find a corresponding colormap entries for our palette entries. */
-    for( i_cmap = 0; i_cmap < NUM_SUBTITLE_COLORS; i_cmap++ )
-    {
-      uint8_t Y = p_sys->p_palette[i_cmap].s.y;
-
-      /* FIXME: when we have a way to look at colormap entries we can
-         do better.  For now we have to use 0xff for white 0x00 for
-         black and 0x44 for something in between. To do this we use
-         only the Y component.
-      */
-      if (Y > 0x70) 
-        cmap[i_cmap] = 0xff; /* Use white. */
-      else if (Y < 0x10) 
-        cmap[i_cmap] = 0x00; /* Use black. */
-      else 
-        cmap[i_cmap] = 0x44; /* Use something else. */
-    }
-
-    i_xscale = (( p_vout->output.i_width << ASCALE ) * i_aspect_x)
-      / (i_aspect_y * p_vout->render.i_width);
@@ -1644 +1685 @@
-    i_width  = p_spu->i_width  * i_xscale;
-    i_height = p_spu->i_height * i_yscale;
+
+
+    /** FIXME: do once per subtitle in subtitle processing, not here
+        each time we render.  */
+    /* Find a corresponding colormap entries for our palette entries. */
+    for( i = 0; i < NUM_SUBTITLE_COLORS; i++ )
+    {
+
+      if ( p_sys->p_palette[i].s.t != 0 ) {
+        uint8_t rgb[RGB_SIZE]; 
+        uint8_t approx_rgb[RGB_SIZE]; 
+        yuv2rgb(&(p_sys->p_palette[i]), rgb);
+        cmap[i] = 
+          find_cmap_rgb8_nearest(p_vout, rgb, approx_rgb);
+        dbg_print( (DECODE_DBG_RENDER), 
+                   "palette %d RGB=(%0x, %0x, %0x)\n", i,
+                   rgb[RED_PIXEL], rgb[GREEN_PIXEL], rgb[BLUE_PIXEL]);
+      }
+    }
-
-    /* Set where we will start blending subtitle from using
@@ -1707 +1767 @@
-              
-              p_yuvt = p_sys->p_palette[*p_source & 0x3];
-
-
-
+
+
+
+
+
+
+
+
+
-#if 0
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-#if 0
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-#if 0
@@ -1759 +1851 @@
-              }
-              
-
-
-
+
+
+
+
+
+
+
-#if 0
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-#if 0
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
+
-        }
-      }

modules/video_chroma/i420_rgb.c

@@ -2 +2 @@
- * i420_rgb.c : YUV to bitmap RGB conversion module for vlc
- *****************************************************************************
-
-6 2003/12/22 14:32:56 sam
+, 2004
+7 2004/01/31 05:53:35 rocky
- *
- * Author: Sam Hocevar <sam@zoy.org>
@@ -345 +345 @@
-    int r,g,b;
-    int i = 0, j = 0;
-
+
+
+
+
-    unsigned char p_lookup[PALETTE_TABLE_SIZE];
-
@@ -372 +375 @@
-
-                    /* Clip the colors */
-
-
-
+
+
+
+
+
+
+
+
+
-
-                    /* Allocate color */
@@ -391 +400 @@
-
-    /* The colors have been allocated, we can set the palette */
-red, green, blue
+p_cmap_r, p_cmap_g, p_cmap_b
-
-#if 0

modules/video_chroma/i420_rgb.h

@@ -2 +2 @@
- * i420_rgb.h : YUV to bitmap RGB conversion module for vlc
- *****************************************************************************
-
-4 2003/08/29 18:58:05 fenrir
+, 2004
+5 2004/01/31 05:53:35 rocky
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -22 +22 @@
- *****************************************************************************/
-
-
+
+
+
+
- * chroma_sys_t: chroma method descriptor
-
+
- * This structure is part of the chroma transformation descriptor, it
- * describes the yuv2rgb specific properties.
-****************************************************************************
+
-struct chroma_sys_t
-{
@@ -34 +37 @@
-
-#ifdef MODULE_NAME_IS_i420_rgb
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
-};