Changeset 23cc599d06abb5c84913c7399dd08c6b283fc49e

Timestamp:

18/06/07 23:08:03 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1182200883 +0000

git-parent:

[877cfa025934f31c5f621fbcc6a8d0b30165b086]

git-author:

Laurent Aimar <fenrir@videolan.org> 1182200883 +0000

Message:

Patch by Bernie Purcell :
"This is part of a former submission stripped out for easier

assimilation. It modifies vout_subpictures to use the existing alignment
field on each region, rather than the alignment on the subpicture plane
itself. Modifications are made to everywhere that depended on the former
behaviour, to make it use the new alignment location instead."

Files:

• include/vlc_vout.h (modified) (1 diff)
• modules/codec/dvbsub.c (modified) (2 diffs)
• modules/codec/subsdec.c (modified) (6 diffs)
• modules/codec/telx.c (modified) (1 diff)
• modules/video_filter/logo.c (modified) (2 diffs)
• modules/video_filter/marq.c (modified) (2 diffs)
• modules/video_filter/mosaic.c (modified) (1 diff)
• modules/video_filter/rss.c (modified) (2 diffs)
• src/control/mediacontrol_audio_video.c (modified) (2 diffs)
• src/osd/osd_text.c (modified) (2 diffs)
• src/video_output/video_text.c (modified) (2 diffs)
• src/video_output/vout_subpictures.c (modified) (3 diffs)

include/vlc_vout.h

@@ -307 +307 @@
-#define SUBPICTURE_ALIGN_TOP 0x4
-#define SUBPICTURE_ALIGN_BOTTOM 0x8
+#define SUBPICTURE_ALIGN_MASK ( SUBPICTURE_ALIGN_LEFT|SUBPICTURE_ALIGN_RIGHT| \
+                                SUBPICTURE_ALIGN_TOP |SUBPICTURE_ALIGN_BOTTOM )
-
-/*****************************************************************************

modules/codec/dvbsub.c

@@ -1493 +1493 @@
-        p_spu_region->i_x = p_regiondef->i_x;
-        p_spu_region->i_y = p_regiondef->i_y;
+        p_spu_region->i_align = p_sys->i_spu_position;
-        *pp_spu_region = p_spu_region;
-        pp_spu_region = &p_spu_region->p_next;
@@ -1547 +1548 @@
-            p_spu_region->i_x = p_regiondef->i_x + p_object_def->i_x;
-            p_spu_region->i_y = p_regiondef->i_y + p_object_def->i_y;
+            p_spu_region->i_align = p_sys->i_spu_position;
-            *pp_spu_region = p_spu_region;
-            pp_spu_region = &p_spu_region->p_next;

modules/codec/subsdec.c

@@ -449 +449 @@
-    {
-        /* Normal text subs, easy markup */
-i_flags
+p_region->i_align
-        p_spu->i_x = p_sys->i_align ? 20 : 0;
-        p_spu->i_y = 10;
@@ -575 +575 @@
-    if( p_style == NULL )
-    {
-i_flags
+p_region->i_align
-        p_spu->i_x = p_sys->i_align ? 20 : 0;
-        p_spu->i_y = 10;
@@ -583 +583 @@
-        msg_Dbg( p_dec, "style is: %s", p_style->psz_stylename);
-        p_spu->p_region->p_style = &p_style->font_style;
-i_flags
+p_region->i_align
-    }
-}
@@ -679 +679 @@
-    if( p_style == NULL )
-    {
-i_flags
+p_region->i_align
-        p_spu->i_x = p_sys->i_align ? 20 : 0;
-        p_spu->i_y = 10;
@@ -687 +687 @@
-        msg_Dbg( p_dec, "style is: %s", p_style->psz_stylename);
-        p_spu->p_region->p_style = &p_style->font_style;
-i_flags
+p_region->i_align
-        if( p_style->i_align & SUBPICTURE_ALIGN_LEFT )
-        {
@@ -1148 +1148 @@
-
-                    p_style->i_align = 0;
-1
+7
-                    if( i_align == 0x3 || i_align == 0x6 || i_align == 0x9 ) p_style->i_align |= SUBPICTURE_ALIGN_RIGHT;
-                    if( i_align == 0x7 || i_align == 0x8 || i_align == 0x9 ) p_style->i_align |= SUBPICTURE_ALIGN_TOP;

modules/codec/telx.c

@@ -712 +712 @@
-
-    /* Normal text subs, easy markup */
-i_flags
+p_region->i_align
-    p_spu->i_x = p_sys->i_align ? 20 : 0;
-    p_spu->i_y = 10;

modules/video_filter/logo.c

@@ -883 +883 @@
-    if( p_sys->posx < 0 || p_sys->posy < 0 )
-    {   /* set to one of the 9 relative locations */
-i_flags
+p_region->i_align
-        p_spu->i_x = 0;
-        p_spu->i_y = 0;
@@ -890 +890 @@
-    else
-    {   /*  set to an absolute xy, referenced to upper left corner */
-i_flags
+p_region->i_align
-        p_spu->i_x = p_sys->posx;
-        p_spu->i_y = p_sys->posy;

modules/video_filter/marq.c

@@ -297 +297 @@
-    if( p_sys->i_xoff < 0 || p_sys->i_yoff < 0 )
-    {   /* set to one of the 9 relative locations */
-i_flags
+p_region->i_align
-        p_spu->i_x = 0;
-        p_spu->i_y = 0;
@@ -304 +304 @@
-    else
-    {   /*  set to an absolute xy, referenced to upper left corner */
-i_flags
+p_region->i_align
-        p_spu->i_x = p_sys->i_xoff;
-        p_spu->i_y = p_sys->i_yoff;

modules/video_filter/mosaic.c

@@ -711 +711 @@
-                    + ( row_inner_height - fmt_out.i_height ) / 2;
-        }
+        p_region->i_align = p_sys->i_align;
-
-        if( p_region_prev == NULL )

modules/video_filter/rss.c

@@ -483 +483 @@
-    if( p_sys->i_xoff < 0 || p_sys->i_yoff < 0 )
-    {   /* set to one of the 9 relative locations */
-i_flags
+p_region->i_align
-        p_spu->i_x = 0;
-        p_spu->i_y = 0;
@@ -490 +490 @@
-    else
-    {   /*  set to an absolute xy, referenced to upper left corner */
-i_flags
+p_region->i_align
-        p_spu->i_x = p_sys->i_xoff;
-        p_spu->i_y = p_sys->i_yoff;

src/control/mediacontrol_audio_video.c

@@ -147 +147 @@
-
-    p_spu->p_region->psz_text = strdup( psz_string );
+    p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
-    p_spu->i_start = i_start;
-    p_spu->i_stop = i_stop;
@@ -154 +155 @@
-    p_spu->i_x = i_hmargin;
-    p_spu->i_y = i_vmargin;
-
+ & ~SUBPICTURE_ALIGN_MASK
-    p_spu->i_channel = i_channel;
-

src/osd/osd_text.c

@@ -93 +93 @@
-
-    p_spu->p_region->psz_text = strdup( psz_string );
+    p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
-    p_spu->i_start = i_start;
-    p_spu->i_stop = i_stop;
@@ -100 +101 @@
-    p_spu->i_x = i_hmargin;
-    p_spu->i_y = i_vmargin;
-
+ & ~SUBPICTURE_ALIGN_MASK
-    p_spu->i_channel = i_channel;
-

src/video_output/video_text.c

@@ -94 +94 @@
-
-    p_spu->p_region->psz_text = strdup( psz_string );
+    p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
-    p_spu->i_start = i_start;
-    p_spu->i_stop = i_stop;
@@ -102 +103 @@
-    p_spu->i_x = i_hmargin;
-    p_spu->i_y = i_vmargin;
-
+ & ~SUBPICTURE_ALIGN_MASK
-    p_spu->i_channel = i_channel;
-

src/video_output/vout_subpictures.c

@@ -662 +662 @@
-                if( p_spu->p_text && p_spu->p_text->p_module )
-                {
-                    p_region->i_align = p_subpic->i_flags;
-
-                    if( p_spu->p_text->pf_render_html && p_region->psz_html )
-                    {
@@ -729 +727 @@
-                p_region->p_cache->i_x = p_region->i_x * i_scale_width / 1000;
-                p_region->p_cache->i_y = p_region->i_y * i_scale_height / 1000;
+                p_region->p_cache->i_align = p_region->i_align;
-
-                p_pic = p_spu->p_scale->pf_video_filter(
@@ -746 +745 @@
-            }
-
-subpic->i_flags
+region->i_align
-            {
-                i_y_offset = p_fmt->i_height - p_region->fmt.i_height -
-
-
-subpic->i_flags
+ - p_region->i_y
+
+region->i_align
-            {
-                i_y_offset = p_fmt->i_height / 2 - p_region->fmt.i_height / 2;
-            }
-
-subpic->i_flags
+region->i_align
-            {
-                i_x_offset = p_fmt->i_width - p_region->fmt.i_width -
-
-
-subpic->i_flags
+ - p_region->i_x
+
+region->i_align
-            {
-                i_x_offset = p_fmt->i_width / 2 - p_region->fmt.i_width / 2;