* modules/stream_out/bridge.c: Fixed deleting/adding of streams.

 * modules/stream_out/mosaic_bridge.c: Fixed potential segfault.
 * modules/video_filter/mosaic.c: Run the mosaic thread in a higher priority.

diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index 1b24f663d9ed15a7472f46a09b6b8806aa22d71f..0f949c3630268e9b37dd144bf1ae1078b8cf02d6 100644 (file)
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -432,6 +432,8 @@ static int SendIn( sout_stream_t *p_stream, sout_stream_id_t *id,
                           < p_bridge->pp_es[i]->i_last) )
         {
             block_t *p_block = p_bridge->pp_es[i]->p_block;
+            msg_Dbg( p_stream, "dropping a packet (" I64Fd ")",
+                     p_bridge->pp_es[i]->i_last - p_block->i_dts );
             p_bridge->pp_es[i]->p_block
                 = p_bridge->pp_es[i]->p_block->p_next;
             block_Release( p_block );
@@ -489,10 +491,9 @@ static int SendIn( sout_stream_t *p_stream, sout_stream_id_t *id,
         if ( p_bridge->pp_es[i]->id != NULL )
         {
             block_t *p_block = p_bridge->pp_es[i]->p_block;
-            p_bridge->pp_es[i]->i_last = p_bridge->pp_es[i]->p_block->i_dts
-                                   + p_bridge->pp_es[i]->p_block->i_length;
             while ( p_block != NULL )
             {
+                p_bridge->pp_es[i]->i_last = p_block->i_dts;
                 p_block->i_pts += p_sys->i_delay;
                 p_block->i_dts += p_sys->i_delay;
                 p_block = p_block->p_next;

diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index 41c2a98cfabde2ab3763de36383295a8e1f82065..9c4b4f32bc303d01c5a0a581000f97badc0971ed 100644 (file)
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -408,7 +408,6 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 
             vout_CopyPicture( p_stream, p_new_pic, p_pic );
         }
-        p_pic->pf_release( p_pic );
 
         p_new_pic->i_refcount = 1;
         p_new_pic->i_status = DESTROYED_PICTURE;
@@ -417,6 +416,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
         p_new_pic->pf_release = ReleasePicture;
         p_new_pic->date = p_pic->date;
 
+        p_pic->pf_release( p_pic );
         PushPicture( p_stream, p_new_pic );
     }
 

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 83a096553ce99c00380a902d6d36bfaf619c91e4..a008d83b58c2a197e74a285f3697efcec37434fb 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -164,6 +164,9 @@ static int CreateFilter( vlc_object_t *p_this )
     int i_index;
     vlc_value_t val;
 
+    /* The mosaic thread is more important than the decoder threads */
+    vlc_thread_set_priority( p_this, VLC_THREAD_PRIORITY_OUTPUT );
+
     /* Allocate structure */
     p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_sys == NULL )