Changeset dd066314d5dde1a5d828d2c51c0296dd7b04bac7

Timestamp:

17/07/08 20:00:46 (4 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[8006b9d92aa68fc941e930bee4866f49ed238b60]

git-author:

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

Message:

Revived vout_Destroy from the dead.
No you CANNOT release a vout by vlc_object_release if you have created
it by vout_Request or vout_Create.

Files:

• include/vlc_vout.h (modified) (1 diff)
• src/libvlccore.sym (modified) (2 diffs)
• src/video_output/video_output.c (modified) (4 diffs)

include/vlc_vout.h

@@ -525 +525 @@
- * Prototypes
- *****************************************************************************/
+
+/**
+ * This function will
+ *  - returns a suitable vout (if requested by a non NULL p_fmt)
+ *  - recycles an old vout (if given) by either destroying it or by saving it
+ *  for latter usage.
+ *
+ * The purpose of this function is to avoid unnecessary creation/destruction of
+ * vout (and to allow optional vout reusing).
+ *
+ * You can call vout_Request on a vout created by vout_Create or by a previous
+ * call to vout_Request.
+ * You can release the returned value either by vout_Request or vout_Destroy.
+ *
+ * \param p_this a vlc object
+ * \param p_vout a vout candidate
+ * \param p_fmt the video format requested or NULL
+ * \return a vout if p_fmt is non NULL and the request is successfull, NULL
+ * otherwise
+ */
-#define vout_Request(a,b,c) __vout_Request(VLC_OBJECT(a),b,c)
-
+
+
+
+
+
+
+
+
+
+
+
-#define vout_Create(a,b) __vout_Create(VLC_OBJECT(a),b)
-
-
-
+
+
+
+
+
+
+
+
+
+
-VLC_EXPORT( int,             vout_ChromaCmp,      ( uint32_t, uint32_t ) );
-

src/libvlccore.sym

@@ -482 +482 @@
-__vout_CopyPicture
-__vout_Create
+vout_Destroy
-vout_CreatePicture
-vout_DatePicture
@@ -502 +503 @@
-vout_UnlinkPicture
-vout_vaControlDefault
-vout_VarCallback
-__xml_Create
-xml_Delete

src/video_output/video_output.c

@@ -130 +130 @@
-         * reference handling. */
-        if( p_vout )
-
-
-
-
-
-
-
+
-        return NULL;
-    }
@@ -448 +442 @@
-    {
-        msg_Err( p_vout, "video output creation failed" );
-
-
-
-
-
-
+
-        return NULL;
-    }
@@ -460 +449 @@
-}
-
+/*****************************************************************************
+ * vout_Destroy: destroys a vout created by vout_Create.
+ *****************************************************************************
+ * You HAVE to call it on vout created by vout_Create. You should NEVER call
+ * it on vout not obtained though vout_Create (like with vout_Request or
+ * vlc_object_find.)
+ *****************************************************************************/
+void vout_Destroy( vout_thread_t *p_vout )
+{
+    assert( p_vout );
+
+    vlc_object_kill( p_vout );
+    vlc_thread_join( p_vout );
+    module_Unneed( p_vout, p_vout->p_module );
+    vlc_object_release( p_vout );
+}
+
+/* */
-static void vout_Destructor( vlc_object_t * p_this )
-{
@@ -1388 +1395 @@
-
-/*****************************************************************************
- * vout_VarCallback: generic callback for intf variables
- *****************************************************************************/
-int vout_VarCallback( vlc_object_t * p_this, const char * psz_variable,
-                      vlc_value_t oldval, vlc_value_t newval,
-                      void *p_data )
-{
-    vout_thread_t * p_vout = (vout_thread_t *)p_this;
-    vlc_value_t val;
-    (void)psz_variable; (void)newval; (void)oldval; (void)p_data;
-    val.b_bool = true;
-    var_Set( p_vout, "intf-change", val );
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Helper thread for object variables callbacks.
- * Only used to avoid deadlocks when using the video embedded mode.