Changeset 81e3de1b3a1e02f5724d7add82340a9536a3e875

Timestamp:

03/30/08 01:33:39 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@free.fr>

git-committer:

Pierre d'Herbemont <pdherbemont@free.fr> 1206837219 +0100

git-parent:

[f8b8b4bfeb91ea2e4d55a68dd9fe7762e3a702d1]

git-author:

Pierre d'Herbemont <pdherbemont@free.fr> 1206837219 +0100

Message:

video_output: Don't keep the input around for a long time in RunThread?.

Else there is a circular dependency between the vout that yield() the input, where the vout is also an input child. This should fix properly the media_instance() tests.

Files:

• src/video_output/video_output.c (modified) (3 diffs)

src/video_output/video_output.c

@@ -781 +781 @@
-        current_date = mdate();
-
-        if( p_input && p_input->b_die )
-        {
-            vlc_object_release( p_input );
-            p_input = NULL;
-        }
-
-        i_loops++;
-            if( !p_input )
@@ -803 +797 @@
-                i_displayed = i_lost = 0;
-                vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+                vlc_object_release( p_input );
+                p_input = NULL;
-            }
-#if 0
@@ -1059 +1055 @@
-            p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date,
-            p_input ? var_GetBool( p_input, "state" ) == PAUSE_S : VLC_FALSE );
+            if( p_input )
+                vlc_object_release( p_input );
+            p_input = NULL;
-        }
-