Changeset 4b36edd1d545c74ce66ad959e6d08ad1ba947023

Timestamp:

09/04/08 10:34:45 (6 months ago)

Author:

Jean-Paul Saman <jean-paul.saman@m2x.nl>

git-committer:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1207730085 +0200

git-parent:

[91fcbb63196f47ef080ce2c16465a8da294a94c4]

git-author:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1204194705 +0100

Message:

Patch by Soren Bog <avacore@videolan.org> from GSoC: Overlay - Add alpha component to subpicture regions.

Files:

• include/vlc_vout.h (modified) (1 diff)
• src/video_output/vout_subpictures.c (modified) (4 diffs)

include/vlc_vout.h

@@ -212 +212 @@
-    int             i_y;                             /**< position of region */
-    int             i_align;                  /**< alignment within a region */
+    int             i_alpha;                               /**< transparency */
-
-    char            *psz_text;       /**< text string comprising this region */

src/video_output/vout_subpictures.c

@@ -292 +292 @@
-
-    memset( p_region, 0, sizeof(subpicture_region_t) );
+    p_region->i_alpha = 0xff
-    p_region->p_next = NULL;
-    p_region->p_cache = NULL;
@@ -337 +338 @@
-    if( !p_region ) return NULL;
-    memset( p_region, 0, sizeof(subpicture_region_t) );
+    p_region->i_alpha = 0xff;
-    p_region->p_next = 0;
-    p_region->p_cache = 0;
@@ -902 +904 @@
-                p_region->p_cache->i_y = p_region->i_y * pi_scale_height[ i_scale_idx ] / 1000;
-                p_region->p_cache->i_align = p_region->i_align;
+                p_region->p_cache->i_alpha = p_region->i_alpha;
-
-                p_pic = p_spu->p_scale->pf_video_filter(
@@ -1061 +1064 @@
-                    p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
-                        p_pic_src, &p_region->picture, i_x_offset, i_y_offset,
-/ 25
+* p_region->i_alpha / 6502
-                }
-                else