Changeset acd09b4c95f13abdced07a7903f11e1217042573

Timestamp:

07/01/08 18:47:35 (2 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214930855 +0300

git-parent:

[6ad63e8cf411092b7888d0d08ab618650a495ba5]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214930486 +0300

Message:

Revert "Remove the suxor thread"

This reverts commit 74cf34e6ae1258f4d680ef3f69e7cfa690ab6ef8.

Files:

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

src/video_output/video_output.c

@@ -1402 +1402 @@
-
-/*****************************************************************************
+ * Helper thread for object variables callbacks.
+ * Only used to avoid deadlocks when using the video embedded mode.
+ *****************************************************************************/
+typedef struct suxor_thread_t
+{
+    VLC_COMMON_MEMBERS
+    input_thread_t *p_input;
+
+} suxor_thread_t;
+
+static void SuxorRestartVideoES( suxor_thread_t *p_this )
+{
+    /* Now restart current video stream */
+    int val = var_GetInteger( p_this->p_input, "video-es" );
+    if( val >= 0 )
+    {
+        var_SetInteger( p_this->p_input, "video-es", -VIDEO_ES );
+        var_SetInteger( p_this->p_input, "video-es", val );
+    }
+
+    vlc_object_release( p_this->p_input );
+
+    vlc_object_release( p_this );
+}
+
+/*****************************************************************************
- * object variables callbacks: a bunch of object variables are used by the
- * interfaces to interact with the vout.
@@ -1489 +1515 @@
-    if( val.i_int >= 0 )
-    {
+        suxor_thread_t *p_suxor =
+            vlc_object_create( p_vout, sizeof(suxor_thread_t) );
+        p_suxor->p_input = p_input;
-        p_vout->b_filter_change = true;
-
-
-
-
-
-
+
+
+
+
+
-    vlc_object_release( p_input );
+
-    return VLC_SUCCESS;
-}