Changeset 25768ec58d736505992cc19a25d09c4897b544af

Timestamp:

24/07/08 23:44:36 (4 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1216935876 +0200

git-parent:

[054067808a7d91f465c521395ea602803a9095dc]

git-author:

Laurent Aimar <fenrir@videolan.org> 1216935685 +0200

Message:

Fixed dvd menu highlight (close #1709)
Properly lock spu variable inside UpdateSPU.

No, locking is NOT something you can just igore !

Files:

• src/video_output/vout_subpictures.c (modified) (8 diffs)

src/video_output/vout_subpictures.c

@@ -658 +658 @@
-                             const video_format_t *p_fmt )
-{
-orig_fmt
+fmt_original
-    bool b_rerender_text;
-    int i_fade_alpha;
@@ -667 +667 @@
-    int i_inv_scale_y;
-
-
+
+
+
-    b_rerender_text = false;
-    if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
@@ -708 +710 @@
-    if( p_spu->p_scale &&
-        ( ( pi_scale_width[i_scale_idx]  > 0 && pi_scale_width[i_scale_idx]  != 1000 ) ||
-
+
+
-    {
-        const int i_dst_width  = p_region->fmt.i_width  * pi_scale_width[i_scale_idx] / 1000;
@@ -717 +720 @@
-        {
-            if( p_region->p_cache->fmt.i_width  != i_dst_width ||
-
+
+
-            {
-                p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
@@ -770 +774 @@
-        /* And use the scaled picture */
-        if( p_region->p_cache )
+        {
-            p_region = p_region->p_cache;
+            fmt_original = p_region->fmt;
+        }
-    }
-
@@ -908 +915 @@
-        p_region->picture.pf_release( &p_region->picture );
-        memset( &p_region->picture, 0, sizeof( picture_t ) );
-orig_fmt
+fmt_original
-        p_region->i_align &= ~SUBPICTURE_RENDERED;
-    }
+    else if( p_spu->b_force_crop )
+    {
+        p_region->fmt = fmt_original;
+    }
+
-}
-
@@ -1323 +1335 @@
-    vlc_value_t val;
-
+    vlc_mutex_lock( &p_spu->subpicture_lock );
+
-    p_spu->b_force_palette = false;
-    p_spu->b_force_crop = false;
-
-
+
+
+
+
+
-
-    p_spu->b_force_crop = true;
@@ -1343 +1361 @@
-        p_spu->b_force_palette = true;
-    }
+    vlc_mutex_unlock( &p_spu->subpicture_lock );
-
-    msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i",