Win32: Add an option to set the DEP and ASLR flags for all binaries.

[vlc] / include / vlc_filter.h

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index b1f23250587053a332e7d99a4597a03445c24b5b..cd7943ac5974407ef2a4c4476848e101f0998162 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -22,10 +22,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_FILTER_H
-#define _VLC_FILTER_H 1
+#ifndef VLC_FILTER_H
+#define VLC_FILTER_H 1
 
 #include <vlc_es.h>
+#include <vlc_picture.h>
+#include <vlc_subpicture.h>
+#include <vlc_mouse.h>
 
 /**
  * \file
@@ -59,8 +62,8 @@ struct filter_t
 
     picture_t *         ( * pf_video_filter ) ( filter_t *, picture_t * );
     block_t *           ( * pf_audio_filter ) ( filter_t *, block_t * );
-    void                ( * pf_video_blend )  ( filter_t *, picture_t *,
-                                                picture_t *, picture_t *,
+    void                ( * pf_video_blend )  ( filter_t *,
+                                                picture_t *, const picture_t *,
                                                 int, int, int );
 
     subpicture_t *      ( *pf_sub_filter ) ( filter_t *, mtime_t );
@@ -69,6 +72,18 @@ struct filter_t
     int                 ( *pf_render_html ) ( filter_t *, subpicture_region_t *,
                                               subpicture_region_t * );
 
+    /* Filter mouse state.
+     *
+     * If non NULL, you must convert from output format to input format,
+     * if VLC_SUCCESS is returned, the mouse state is then propagated.
+     * If NULL, the mouse state is considered unchanged and will be
+     * propagated.
+     *
+     * If VLC_SUCCESS is not returned, the mouse changes are not propagated.
+     */
+    int                 ( *pf_mouse )( filter_t *, vlc_mouse_t *,
+                                       const vlc_mouse_t *p_old,
+                                       const vlc_mouse_t *p_new );
     /*
      * Buffers allocation
      */
@@ -166,6 +181,32 @@ static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size )
     return p_block;
 }
 
+/**
+ * It creates a blend filter.
+ *
+ * Only the chroma properties of the dest format is used (chroma
+ * type, rgb masks and shifts)
+ */
+VLC_EXPORT( filter_t *, filter_NewBlend, ( vlc_object_t *, const video_format_t *p_dst_chroma ) );
+
+/**
+ * It configures blend filter parameters that are allowed to changed
+ * after the creation.
+ */
+VLC_EXPORT( int, filter_ConfigureBlend, ( filter_t *, int i_dst_width, int i_dst_height, const video_format_t *p_src ) );
+
+/**
+ * It blends a picture into another one.
+ *
+ * The input picture is not modified and not released.
+ */
+VLC_EXPORT( int, filter_Blend, ( filter_t *, picture_t *p_dst, int i_dst_x, int i_dst_y, const picture_t *p_src, int i_alpha ) );
+
+/**
+ * It destroys a blend filter created by filter_NewBlend.
+ */
+VLC_EXPORT( void, filter_DeleteBlend, ( filter_t * ) );
+
 /**
  * Create a picture_t *(*)( filter_t *, picture_t * ) compatible wrapper
  * using a void (*)( filter_t *, picture_t *, picture_t * ) function
@@ -177,17 +218,12 @@ static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size )
                                         picture_t *p_pic )              \
     {                                                                   \
         picture_t *p_outpic = filter_NewPicture( p_filter );            \
-        if( !p_outpic )                                                 \
+        if( p_outpic )                                                  \
         {                                                               \
-            picture_Release( p_pic );                                   \
-            return NULL;                                                \
+            name( p_filter, p_pic, p_outpic );                          \
+            picture_CopyProperties( p_outpic, p_pic );                  \
         }                                                               \
-                                                                        \
-        name( p_filter, p_pic, p_outpic );                              \
-                                                                        \
-        picture_CopyProperties( p_outpic, p_pic );                      \
         picture_Release( p_pic );                                       \
-                                                                        \
         return p_outpic;                                                \
     }
 
@@ -263,16 +299,6 @@ VLC_EXPORT( int, filter_chain_AppendFromString, ( filter_chain_t *, const char *
  */
 VLC_EXPORT( int, filter_chain_DeleteFilter, ( filter_chain_t *, filter_t * ) );
 
-/**
- * Get filter by name of position in the filter chain.
- *
- * \param p_chain pointer to filter chain
- * \param i_position position of filter in filter chain
- * \param psz_name name of filter to get
- * \return filter object based on position or name provided
- */
-VLC_EXPORT( filter_t *, filter_chain_GetFilter, ( filter_chain_t *, int, const char * ) );
-
 /**
  * Get the number of filters in the filter chain.
  *
@@ -315,5 +341,15 @@ VLC_EXPORT( block_t *, filter_chain_AudioFilter, ( filter_chain_t *, block_t * )
  */
 VLC_EXPORT( void, filter_chain_SubFilter, ( filter_chain_t *, mtime_t ) );
 
+/**
+ * Apply the filter chain to a mouse state.
+ *
+ * It will be applied from the output to the input. It makes sense only
+ * for a video filter chain.
+ *
+ * The vlc_mouse_t* pointers may be the same.
+ */
+VLC_EXPORT( int, filter_chain_MouseFilter, ( filter_chain_t *, vlc_mouse_t *, const vlc_mouse_t * ) );
+
 #endif /* _VLC_FILTER_H */