Changeset 1374a69a5672071424e2af15bf8e281db7a6e126

Timestamp:

13/08/04 20:58:25 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1092423505 +0000

git-parent:

[cb047ed85d96168faa9f826f7d56b1da7938401a]

git-author:

Gildas Bazin <gbazin@videolan.org> 1092423505 +0000

Message:

* modules/codec/spudec/*: automatic cropping of fullscreen subpictures (most of them contain large transparent areas).
* src/video_output/vout_subpictures.c: more correct cropping (cropping coordinates are relative to the video size, not subpicture size).
* include/vlc_es.h, modules/video_filter/blend.c: use the i_entries member of video_palette_t.
* include/vlc_common.h: added SetWBE()/SetDWBE()/SetQWBE() facility.

Files:

• include/vlc_common.h (modified) (2 diffs)
• include/vlc_es.h (modified) (1 diff)
• modules/codec/spudec/parse.c (modified) (8 diffs)
• modules/codec/spudec/spudec.h (modified) (1 diff)
• modules/video_filter/blend.c (modified) (1 diff)
• src/video_output/vout_subpictures.c (modified) (1 diff)

include/vlc_common.h

@@ -609 +609 @@
-
-/* Helper writer functions */
-
-#define SetWLE( p, v ) _SetWLE( (uint8_t*)p, v)
-static inline void _SetWLE( uint8_t *p, uint16_t i_dw )
@@ -630 +629 @@
-    SetDWLE( p,   i_qw&0xffffffff );
-    SetDWLE( p+4, ( i_qw >> 32)&0xffffffff );
+}
+#define SetWBE( p, v ) _SetWBE( (uint8_t*)p, v)
+static inline void _SetWBE( uint8_t *p, uint16_t i_dw )
+{
+    p[0] = ( i_dw >>  8 )&0xff;
+    p[1] = ( i_dw       )&0xff;
+}
+
+#define SetDWBE( p, v ) _SetDWBE( (uint8_t*)p, v)
+static inline void _SetDWBE( uint8_t *p, uint32_t i_dw )
+{
+    p[0] = ( i_dw >> 24 )&0xff;
+    p[1] = ( i_dw >> 16 )&0xff;
+    p[2] = ( i_dw >>  8 )&0xff;
+    p[3] = ( i_dw       )&0xff;
+}
+#define SetQWBE( p, v ) _SetQWBE( (uint8_t*)p, v)
+static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
+{
+    SetDWBE( p+4,   i_qw&0xffffffff );
+    SetDWBE( p, ( i_qw >> 32)&0xffffffff );
-}
-

include/vlc_es.h

@@ -37 +37 @@
-struct video_palette_t
-{
-dummy;  
+entries;
-    uint8_t palette[256][4];                   /**< 4-byte RGBA/YUVA palette */
-};

modules/codec/spudec/parse.c

@@ -79 +79 @@
-    p_spu_data->p_data = (uint8_t *)p_spu_data + sizeof(subpicture_data_t);
-    p_spu_data->b_palette = VLC_FALSE;
+    p_spu_data->b_auto_crop = VLC_FALSE;
+    p_spu_data->i_y_top_offset = 0;
+    p_spu_data->i_y_bottom_offset = 0;
-
-    p_spu_data->pi_alpha[0] = 0x00;
@@ -250 +253 @@
-            p_spu->i_height = (((p_sys->buffer[i_index+4]&0x0f)<<8)|
-                              p_sys->buffer[i_index+5]) - p_spu->i_y + 1;
-
+
+
+
+
+
-            i_index += 6;
-            break;
@@ -343 +350 @@
-    unsigned int *pi_offset;
-
+    /* Cropping */
+    vlc_bool_t b_empty_top = VLC_TRUE;
+    unsigned int i_skipped_top = 0, i_skipped_bottom = 0;
+    unsigned int i_transparent_code = 0;
+ 
-    /* Colormap statistics */
-    int i_border = -1;
@@ -404 +416 @@
-            }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -444 +503 @@
-             p_spu->i_width, p_spu->i_height, p_spu->i_x, p_spu->i_y );
-
+    /* Crop if necessary */
+    if( i_skipped_top || i_skipped_bottom )
+    {
+        int i_y = p_spu->i_y + i_skipped_top;
+        int i_height = p_spu->i_height - (i_skipped_top + i_skipped_bottom);
+
+        p_spu_data->i_y_top_offset = i_skipped_top;
+        p_spu_data->i_y_bottom_offset = i_skipped_bottom;
+        msg_Dbg( p_dec, "cropped to: %ix%i, position: %i,%i",
+                 p_spu->i_width, i_height, p_spu->i_x, i_y );
+    }
+ 
-    /* Handle color if no palette was found */
-    if( !p_spu_data->b_palette )
@@ -516 +587 @@
-    fmt.i_aspect = VOUT_ASPECT_FACTOR;
-    fmt.i_width = fmt.i_visible_width = p_spu->i_width;
-
+
+
-    fmt.i_x_offset = fmt.i_y_offset = 0;
-    p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
@@ -525 +597 @@
-    }
-
-
+
+
-    p_p = p_spu->p_region->picture.p->p_pixels;
-    i_pitch = p_spu->p_region->picture.p->i_pitch;
-
-    /* Build palette */
-
+
+
-    {
-        fmt.p_palette->palette[i_x][0] = p_spu_data->pi_yuv[i_x][0];
@@ -541 +615 @@
-
-    /* Draw until we reach the bottom of the subtitle */
-p_spu->
+(int)fmt.
-    {
-        /* Draw until we reach the end of the line */
-p_spu->
+(int)fmt.
-        {
-            /* Get the RLE part, then draw the line */

modules/codec/spudec/spudec.h

@@ -49 +49 @@
-    uint8_t    pi_yuv[4][3];
-
+    /* Auto crop fullscreen subtitles */
+    vlc_bool_t b_auto_crop;
+    int i_y_top_offset;
+    int i_y_bottom_offset;
+
-} subpicture_data_t;
-

modules/video_filter/blend.c

@@ -825 +825 @@
-
-    /* Convert palette first */
-//i_y < p_filter->fmt_in.video.p_palette->i_dummy
+i_y < p_filter->fmt_in.video.p_palette->i_entries
-         i_y < 256; i_y++ )
-    {

src/video_output/vout_subpictures.c

@@ -434 +434 @@
-            if( p_vout->b_force_crop )
-            {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-