* modules/codec/mpeg_video/headers.c: more checks in PictureDisplayExtension,

* modules/gui/macosx/intf.m: one of the threads wasn't in real-time
  priority !!!
* include/vlc_threads.h: tuned up OS X priorities

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index b93b328b173e62a938dec732be9fff31e9c8244d..dc7c4772c7862cbe153c636336dacebf019b9f02 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -3,7 +3,7 @@
  * This header provides portable declarations for mutexes & conditions
  *****************************************************************************
  * Copyright (C) 1999, 2002 VideoLAN
- * $Id: vlc_threads.h,v 1.24 2003/01/29 14:03:07 gbazin Exp $
+ * $Id: vlc_threads.h,v 1.25 2003/01/30 00:39:41 massiot Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -73,10 +73,10 @@
 /* Thread priorities */
 #ifdef SYS_DARWIN
 #   define VLC_THREAD_PRIORITY_LOW 32
-#   define VLC_THREAD_PRIORITY_INPUT 35
-#   define VLC_THREAD_PRIORITY_AUDIO 36
-#   define VLC_THREAD_PRIORITY_VIDEO 31
-#   define VLC_THREAD_PRIORITY_OUTPUT 31
+#   define VLC_THREAD_PRIORITY_INPUT 36
+#   define VLC_THREAD_PRIORITY_AUDIO 37
+#   define VLC_THREAD_PRIORITY_VIDEO 33
+#   define VLC_THREAD_PRIORITY_OUTPUT 34
 
 #elif defined(WIN32) || defined(UNDER_CE)
 /* Define different priorities for WinNT/2K/XP and Win9x/Me */

diff --git a/modules/codec/mpeg_video/headers.c b/modules/codec/mpeg_video/headers.c
index f3129ebf4bed1a9ea5d5a8e3f2203d821f48d7d6..84877b4273946098deb116a89168f3987b6533ff 100644 (file)
--- a/modules/codec/mpeg_video/headers.c
+++ b/modules/codec/mpeg_video/headers.c
@@ -2,7 +2,7 @@
  * vpar_headers.c : headers parsing
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: headers.c,v 1.7 2003/01/15 13:16:39 sam Exp $
+ * $Id: headers.c,v 1.8 2003/01/30 00:39:41 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -1098,7 +1098,8 @@ static void PictureDisplayExtension( vpar_thread_t * p_vpar )
                                             p_vpar->picture.b_top_field_first
                            : ( p_vpar->picture.b_frame_structure + 1 ) +
                              p_vpar->picture.b_repeat_first_field;
-    for( i_dummy = 0; i_dummy < i_nb; i_dummy++ )
+    for( i_dummy = 0; i_dummy < i_nb && !p_vpar->p_fifo->b_die
+                       && !p_vpar->p_fifo->b_error; i_dummy++ )
     {
         RemoveBits( &p_vpar->bit_stream, 17 );
         RemoveBits( &p_vpar->bit_stream, 17 );

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index a2638e565385e1b6620312b384d3b9b67db0bdff..fd214f3970d4810f185332b7b0f6ba6510df4ff2 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.38 2003/01/29 11:34:11 jlj Exp $
+ * $Id: intf.m,v 1.39 2003/01/30 00:39:41 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -319,6 +319,8 @@ static void Run( intf_thread_t *p_intf )
     intf_thread_t * p_intf = [NSApp getIntf];
     NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
 
+    vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+
     while( !p_intf->b_die )
     {
         int i_start, i_stop;