[gentoo-commits] gentoo commit in src/patchsets/vlc/1.0.1: 500_all_codec-libass-avoid-possible-segfault.patch 510_all_Improved-pre-blending-in-ssa-decoder.patch 520_all_libass-rename-types-to-match-upstream.patch series

[Alexis Ballier (aballier)]

aballier    09/08/25 05:51:11

  Modified:             series
  Added:                500_all_codec-libass-avoid-possible-segfault.patch
                        510_all_Improved-pre-blending-in-ssa-decoder.patch
                        520_all_libass-rename-types-to-match-upstream.patch
  Log:
  backport fixes from 1.0-bugfix branch for libass 0.9.7

Revision  Changes    Path
1.3                  src/patchsets/vlc/1.0.1/series

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/series?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/series?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/series?r1=1.2&r2=1.3

Index: series
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/1.0.1/series,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- series	21 Aug 2009 11:36:25 -0000	1.2
+++ series	25 Aug 2009 05:51:10 -0000	1.3
@@ -4,3 +4,6 @@
 300_all_pic.patch
 310_all_mmx_pic.patch
 320_all_disable_media_list_player_tests.patch
+500_all_codec-libass-avoid-possible-segfault.patch
+510_all_Improved-pre-blending-in-ssa-decoder.patch
+520_all_libass-rename-types-to-match-upstream.patch



1.1                  src/patchsets/vlc/1.0.1/500_all_codec-libass-avoid-possible-segfault.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/500_all_codec-libass-avoid-possible-segfault.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/500_all_codec-libass-avoid-possible-segfault.patch?rev=1.1&content-type=text/plain

Index: 500_all_codec-libass-avoid-possible-segfault.patch
===================================================================
From 03212d87b4b8ff5a09c80106d1e21e15a9869586 Mon Sep 17 00:00:00 2001
From: Anthony Loiseau <thannoy@×××××××××××××××××.com>
Date: Tue, 28 Jul 2009 16:46:54 +0200
Subject: [PATCH 1/3] codec/libass: avoid possible segfault
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

dialog_ProgressCreate can return NULL. For this case,
only deal with the result if it is not NULL.

Signed-off-by: Rémi Duraffort <ivoire@××××××××.org>
(cherry picked from commit 29e7fc71082c08aec51d438b3d8564e25526b2d1)

Signed-off-by: Rémi Duraffort <ivoire@××××××××.org>
---
 modules/codec/libass.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

Index: vlc-1.0.1/modules/codec/libass.c
===================================================================
--- vlc-1.0.1.orig/modules/codec/libass.c
+++ vlc-1.0.1/modules/codec/libass.c
@@ -731,7 +731,8 @@ static ass_handle_t *AssHandleHold( deco
     ass_set_fonts_dir( p_library, psz_font_dir );
     free( psz_font_dir );
 #ifdef WIN32
-    dialog_ProgressSet( p_dialog, NULL, 0.1 );
+    if( p_dialog )
+        dialog_ProgressSet( p_dialog, NULL, 0.1 );
 #endif
 
     ass_set_extract_fonts( p_library, true );
@@ -754,7 +755,8 @@ static ass_handle_t *AssHandleHold( deco
 
 #ifdef HAVE_FONTCONFIG
 #ifdef WIN32
-    dialog_ProgressSet( p_dialog, NULL, 0.2 );
+    if( p_dialog )
+        dialog_ProgressSet( p_dialog, NULL, 0.2 );
 #endif
 #if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
     ass_set_fonts( p_renderer, psz_font, psz_family, true, NULL, 1 );  // setup default font/family
@@ -762,7 +764,8 @@ static ass_handle_t *AssHandleHold( deco
     ass_set_fonts( p_renderer, psz_font, psz_family );  // setup default font/family
 #endif
 #ifdef WIN32
-    dialog_ProgressSet( p_dialog, NULL, 1.0 );
+    if( p_dialog )
+        dialog_ProgressSet( p_dialog, NULL, 1.0 );
 #endif
 #else
     /* FIXME you HAVE to give him a font if no fontconfig */
@@ -781,7 +784,8 @@ static ass_handle_t *AssHandleHold( deco
     /* */
     vlc_mutex_unlock( &libass_lock );
 #ifdef WIN32
-    dialog_ProgressDestroy( p_dialog );
+    if( p_dialog )
+        dialog_ProgressDestroy( p_dialog );
 #endif
     return p_ass;
 



1.1                  src/patchsets/vlc/1.0.1/510_all_Improved-pre-blending-in-ssa-decoder.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/510_all_Improved-pre-blending-in-ssa-decoder.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/510_all_Improved-pre-blending-in-ssa-decoder.patch?rev=1.1&content-type=text/plain

Index: 510_all_Improved-pre-blending-in-ssa-decoder.patch
===================================================================
From 80b56ee54500d8755c60f3c75477214c79fd0936 Mon Sep 17 00:00:00 2001
From: Laurent Aimar <fenrir@××××××××.org>
Date: Sun, 26 Jul 2009 23:26:13 +0200
Subject: [PATCH 2/3] Improved pre-blending in ssa decoder.
 (cherry picked from commit 6456512fc613075a6f9d8638457044c8a4636783)

---
 modules/codec/libass.c |   35 +++++++++++++++++++++++++----------
 1 files changed, 25 insertions(+), 10 deletions(-)

Index: vlc-1.0.1/modules/codec/libass.c
===================================================================
--- vlc-1.0.1.orig/modules/codec/libass.c
+++ vlc-1.0.1/modules/codec/libass.c
@@ -591,26 +591,41 @@ static void RegionDraw( subpicture_regio
             p_img->dst_y < i_y || p_img->dst_y + p_img->h > i_y + i_height )
             continue;
 
-        const int r = (p_img->color >> 24)&0xff;
-        const int g = (p_img->color >> 16)&0xff;
-        const int b = (p_img->color >>  8)&0xff;
-        const int a = (p_img->color      )&0xff;
+        const unsigned r = (p_img->color >> 24)&0xff;
+        const unsigned g = (p_img->color >> 16)&0xff;
+        const unsigned b = (p_img->color >>  8)&0xff;
+        const unsigned a = (p_img->color      )&0xff;
         int x, y;
 
         for( y = 0; y < p_img->h; y++ )
         {
             for( x = 0; x < p_img->w; x++ )
             {
-                const int alpha = p_img->bitmap[y*p_img->stride+x];
-                const int an = (255 - a) * alpha / 255;
+                const unsigned alpha = p_img->bitmap[y*p_img->stride+x];
+                const unsigned an = (255 - a) * alpha / 255;
 
                 uint8_t *p_rgba = &p->p_pixels[(y+p_img->dst_y-i_y) * p->i_pitch + 4 * (x+p_img->dst_x-i_x)];
+                const unsigned ao = p_rgba[3];
 
                 /* Native endianness, but RGBA ordering */
-                p_rgba[0] = ( p_rgba[0] * (255-an) + r * an ) / 255;
-                p_rgba[1] = ( p_rgba[1] * (255-an) + g * an ) / 255;
-                p_rgba[2] = ( p_rgba[2] * (255-an) + b * an ) / 255;
-                p_rgba[3] = 255 - ( 255 - p_rgba[3] ) * ( 255 - an ) / 255;
+                if( ao == 0 )
+                {
+                    /* Optimized but the else{} will produce the same result */
+                    p_rgba[0] = r;
+                    p_rgba[1] = g;
+                    p_rgba[2] = b;
+                    p_rgba[3] = an;
+                }
+                else
+                {
+                    p_rgba[3] = 255 - ( 255 - p_rgba[3] ) * ( 255 - an ) / 255;
+                    if( p_rgba[3] != 0 )
+                    {
+                        p_rgba[0] = ( p_rgba[0] * ao * (255-an) / 255 + r * an ) / p_rgba[3];
+                        p_rgba[1] = ( p_rgba[1] * ao * (255-an) / 255 + g * an ) / p_rgba[3];
+                        p_rgba[2] = ( p_rgba[2] * ao * (255-an) / 255 + b * an ) / p_rgba[3];
+                    }
+                }
             }
         }
     }



1.1                  src/patchsets/vlc/1.0.1/520_all_libass-rename-types-to-match-upstream.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/520_all_libass-rename-types-to-match-upstream.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.1/520_all_libass-rename-types-to-match-upstream.patch?rev=1.1&content-type=text/plain

Index: 520_all_libass-rename-types-to-match-upstream.patch
===================================================================
From 5eeb2ea4d498043eb73bcc040ad234d85c901f0f Mon Sep 17 00:00:00 2001
From: Grigori Goronzy <greg@blackbox>
Date: Thu, 6 Aug 2009 23:53:38 +0200
Subject: [PATCH 3/3] libass: rename types to match upstream

Rename types and add compatibility macro for old libass versions.

Signed-off-by: Laurent Aimar <fenrir@××××××××.org>
Signed-off-by: Jean-Baptiste Kempf <jb@××××××××.org>

Cherry-picked from e8189268e1b1099611657b67800cf10454936af9
---
 modules/codec/libass.c |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

Index: vlc-1.0.1/modules/codec/libass.c
===================================================================
--- vlc-1.0.1.orig/modules/codec/libass.c
+++ vlc-1.0.1/modules/codec/libass.c
@@ -48,6 +48,14 @@
 #   include <vlc_charset.h>
 #endif
 
+/* Compatibility with old libass */
+#if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00907010
+#   define ASS_Renderer    ass_renderer_t
+#   define ASS_Library     ass_library_t
+#   define ASS_Track       ass_track_t
+#   define ASS_Image       ass_image_t
+#endif
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -73,13 +81,13 @@ static void UpdateRegions( spu_t *,
                            subpicture_t *, const video_format_t *, mtime_t );
 
 /* Yes libass sux with threads */
-typedef struct 
+typedef struct
 {
     vlc_object_t   *p_libvlc;
 
     int             i_refcount;
-    ass_library_t   *p_library;
-    ass_renderer_t  *p_renderer;
+    ASS_Library     *p_library;
+    ASS_Renderer    *p_renderer;
     video_format_t  fmt;
 } ass_handle_t;
 static ass_handle_t *AssHandleHold( decoder_t *p_dec );
@@ -98,7 +106,7 @@ struct decoder_sys_t
     ass_handle_t *p_ass;
 
     /* */
-    ass_track_t  *p_track;
+    ASS_Track    *p_track;
 
     /* */
     subpicture_t *p_spu_final;
@@ -122,9 +130,9 @@ typedef struct
     int y1;
 } rectangle_t;
 
-static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ass_image_t *p_img_list, int i_width, int i_height );
+static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ASS_Image *p_img_list, int i_width, int i_height );
 static void SubpictureReleaseRegions( spu_t *p_spu, subpicture_t *p_subpic );
-static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img );
+static void RegionDraw( subpicture_region_t *p_region, ASS_Image *p_img );
 
 static vlc_mutex_t libass_lock = VLC_STATIC_MUTEX;
 
@@ -137,7 +145,7 @@ static int Create( vlc_object_t *p_this 
 {
     decoder_t *p_dec = (decoder_t *)p_this;
     decoder_sys_t *p_sys;
-    ass_track_t *p_track;
+    ASS_Track *p_track;
 
     if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') )
         return VLC_EGENERIC;
@@ -361,8 +369,8 @@ static void UpdateRegions( spu_t *p_spu,
     /* */
     const mtime_t i_stream_date = p_subpic->p_sys->i_pts + (i_ts - p_subpic->i_start);
     int i_changed;
-    ass_image_t *p_img = ass_render_frame( p_ass->p_renderer, p_sys->p_track,
-                                           i_stream_date/1000, &i_changed );
+    ASS_Image *p_img = ass_render_frame( p_ass->p_renderer, p_sys->p_track,
+                                         i_stream_date/1000, &i_changed );
 
     if( !i_changed && !b_fmt_changed &&
         (p_img != NULL) == (p_subpic->p_region != NULL) )
@@ -430,7 +438,7 @@ static rectangle_t r_create( int x0, int
     rectangle_t r = { x0, y0, x1, y1 };
     return r;
 }
-static rectangle_t r_img( const ass_image_t *p_img )
+static rectangle_t r_img( const ASS_Image *p_img )
 {
     return r_create( p_img->dst_x, p_img->dst_y, p_img->dst_x+p_img->w, p_img->dst_y+p_img->h );
 }
@@ -451,9 +459,9 @@ static bool r_overlap( const rectangle_t
             __MAX(a->y0-i_dy, b->y0) < __MIN( a->y1+i_dy, b->y1 );
 }
 
-static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ass_image_t *p_img_list, int i_width, int i_height )
+static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ASS_Image *p_img_list, int i_width, int i_height )
 {
-    ass_image_t *p_tmp;
+    ASS_Image *p_tmp;
     int i_count;
 
     VLC_UNUSED(p_spu);
@@ -467,7 +475,7 @@ static int BuildRegions( spu_t *p_spu, r
     if( i_count <= 0 )
         return 0;
 
-    ass_image_t **pp_img = calloc( i_count, sizeof(*pp_img) );
+    ASS_Image **pp_img = calloc( i_count, sizeof(*pp_img) );
     if( !pp_img )
         return 0;
 
@@ -500,7 +508,7 @@ static int BuildRegions( spu_t *p_spu, r
             b_ok = false;
             for( n = 0; n < i_count; n++ )
             {
-                ass_image_t *p_img = pp_img[n];
+                ASS_Image *p_img = pp_img[n];
                 if( !p_img )
                     continue;
                 rectangle_t r = r_img( p_img );
@@ -576,7 +584,7 @@ static int BuildRegions( spu_t *p_spu, r
     return i_region;
 }
 
-static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img )
+static void RegionDraw( subpicture_region_t *p_region, ASS_Image *p_img )
 {
     const plane_t *p = &p_region->p_picture->p[0];
     const int i_x = p_region->i_x;
@@ -655,8 +663,8 @@ static ass_handle_t *AssHandleHold( deco
     vlc_mutex_lock( &libass_lock );
 
     ass_handle_t *p_ass = NULL;
-    ass_library_t *p_library = NULL;
-    ass_renderer_t *p_renderer = NULL;
+    ASS_Library *p_library = NULL;
+    ASS_Renderer *p_renderer = NULL;
     vlc_value_t val;
 
     var_Create( p_dec->p_libvlc, "libass-handle", VLC_VAR_ADDRESS );
@@ -836,4 +844,3 @@ static void AssHandleRelease( ass_handle
     vlc_mutex_unlock( &libass_lock );
     free( p_ass );
 }
-