X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_filter%2Fmagnify.c;h=2ddbc8be0c36582d208608a42a31c0d19975898f;hb=bc09c365ab435fda0185e60a423f69d6dfa348c8;hp=fd0cb06b974a1e1c26e836ea9b6cf0ca04c42fc9;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc

diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c
index fd0cb06b97..2ddbc8be0c 100644
--- a/modules/video_filter/magnify.c
+++ b/modules/video_filter/magnify.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * magnify.c : Magnify/Zoom interactive effect
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
@@ -28,581 +28,399 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
-
 #include <math.h>
+#include <assert.h>
 
-#include "filter_common.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_image.h>
+#include <vlc_filter.h>
 #include "filter_picture.h"
 
-#include "vlc_image.h"
-#include "vlc_input.h"
-#include "vlc_playlist.h"
-
 /*****************************************************************************
- * Local prototypes
+ * Module descriptor
  *****************************************************************************/
 static int  Create    ( vlc_object_t * );
 static void Destroy   ( vlc_object_t * );
 
-static int  Init      ( vout_thread_t * );
-static void End       ( vout_thread_t * );
-static void Render    ( vout_thread_t *, picture_t * );
+vlc_module_begin ()
+    set_description( N_("Magnify/Zoom interactive video filter") )
+    set_shortname( N_( "Magnify" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    set_callbacks( Create, Destroy )
+vlc_module_end ()
 
-static int  SendEvents   ( vlc_object_t *, char const *,
-                           vlc_value_t, vlc_value_t, void * );
-static int  MouseEvent   ( vlc_object_t *, char const *,
-                           vlc_value_t, vlc_value_t, void * );
 
 /*****************************************************************************
- * Module descriptor
+ * Local prototypes
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("Magnify/Zoom interactive video filter") );
-    set_shortname( _( "Magnify" ));
-    set_capability( "video filter", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+static picture_t *Filter( filter_t *, picture_t * );
+static int Mouse( filter_t *, vlc_mouse_t *, const vlc_mouse_t *, const vlc_mouse_t * );
 
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+/* */
+static void DrawZoomStatus( uint8_t *, int i_pitch, int i_width, int i_height,
+                            int i_offset_x, int i_offset_y, bool b_visible );
+static void DrawRectangle( uint8_t *, int i_pitch, int i_width, int i_height,
+                           int x, int y, int i_w, int i_h );
 
-/*****************************************************************************
- * vout_sys_t: Magnify video output method descriptor
- *****************************************************************************/
-struct vout_sys_t
+/* */
+struct filter_sys_t
 {
-    vout_thread_t *p_vout;
-
     image_handler_t *p_image;
 
+    int64_t i_hide_timeout;
+
     int i_zoom; /* zoom level in percent */
     int i_x, i_y; /* top left corner coordinates in original image */
 
     bool b_visible; /* is "interface" visible ? */
+
+    int64_t i_last_activity;
 };
 
-/*****************************************************************************
- * Control: control facility for the vout (forwards to child vout)
- *****************************************************************************/
-static int Control( vout_thread_t *p_vout, int i_query, va_list args )
-{
-    return vout_vaControl( p_vout->p_sys->p_vout, i_query, args );
-}
+#define VIS_ZOOM 4
+#define ZOOM_FACTOR 8
 
 /*****************************************************************************
- * Create: allocates Magnify video thread output method
+ * Create:
  *****************************************************************************/
 static int Create( vlc_object_t *p_this )
 {
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
+    filter_t *p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys;
 
-    switch( p_vout->fmt_in.i_chroma )
+    /* */
+    switch( p_filter->fmt_in.i_codec )
     {
-        CASE_PLANAR_YUV
-        case VLC_FOURCC('G','R','E','Y'):
-            break;
-        default:
-            msg_Err( p_vout, "Unsupported chroma" );
-            return VLC_EGENERIC;
+    CASE_PLANAR_YUV
+    case VLC_CODEC_GREY:
+        break;
+    default:
+        msg_Err( p_filter, "Unsupported chroma" );
+        return VLC_EGENERIC;
     }
-
-    /* Allocate structure */
-    p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
-    if( p_vout->p_sys == NULL )
+    if( !es_format_IsSimilar( &p_filter->fmt_in, &p_filter->fmt_out ) )
     {
-        msg_Err( p_vout, "out of memory" );
-        return VLC_ENOMEM;
+        msg_Err( p_filter, "Input and output format does not match" );
+        return VLC_EGENERIC;
     }
 
-    p_vout->p_sys->p_image = image_HandlerCreate( p_vout );
-
-    p_vout->pf_init = Init;
-    p_vout->pf_end = End;
-    p_vout->pf_manage = NULL;
-    p_vout->pf_render = Render;
-    p_vout->pf_display = NULL;
-    p_vout->pf_control = Control;
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Init: initialize Magnify video thread output method
- *****************************************************************************/
-static int Init( vout_thread_t *p_vout )
-{
-    int i_index;
-    picture_t *p_pic;
-    video_format_t fmt;
-
-    memset( &fmt, 0, sizeof(video_format_t) );
-    I_OUTPUTPICTURES = 0;
-
-    /* Initialize the output structure */
-    p_vout->output.i_chroma = p_vout->render.i_chroma;
-    p_vout->output.i_width  = p_vout->render.i_width;
-    p_vout->output.i_height = p_vout->render.i_height;
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-
-    p_vout->fmt_out = p_vout->fmt_in;
-    fmt = p_vout->fmt_out;
-
-    /* Try to open the real video output */
-    msg_Dbg( p_vout, "spawning the real video output" );
-
-    p_vout->p_sys->p_vout = vout_Create( p_vout, &fmt );
+    /* Allocate structure */
+    p_filter->p_sys = p_sys = malloc( sizeof( *p_sys ) );
+    if( !p_filter->p_sys )
+        return VLC_ENOMEM;
 
-    /* Everything failed */
-    if( p_vout->p_sys->p_vout == NULL )
+    p_sys->p_image = image_HandlerCreate( p_filter );
+    if( !p_sys->p_image )
     {
-        msg_Err( p_vout, "cannot open vout, aborting" );
+        free( p_sys );
         return VLC_EGENERIC;
     }
 
-#define VIS_ZOOM 4
-    p_vout->p_sys->i_x = 0;
-    p_vout->p_sys->i_y = 0;
-#define ZOOM_FACTOR 8
-    p_vout->p_sys->i_zoom = 2*ZOOM_FACTOR;
-    p_vout->p_sys->b_visible = true;
-
-    var_AddCallback( p_vout->p_sys->p_vout, "mouse-x", MouseEvent, p_vout );
-    var_AddCallback( p_vout->p_sys->p_vout, "mouse-y", MouseEvent, p_vout );
-    var_AddCallback( p_vout->p_sys->p_vout, "mouse-clicked",
-                     MouseEvent, p_vout);
-
-    ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
-    ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
-    ADD_PARENT_CALLBACKS( SendEventsToChild );
+    p_sys->i_x = 0;
+    p_sys->i_y = 0;
+    p_sys->i_zoom = 2*ZOOM_FACTOR;
+    p_sys->b_visible = true;
+    p_sys->i_last_activity = mdate();
+    p_sys->i_hide_timeout = 1000 * var_CreateGetInteger( p_filter, "mouse-hide-timeout" ); /* FIXME */
 
+    /* */
+    p_filter->pf_video_filter = Filter;
+    p_filter->pf_video_mouse = Mouse;
     return VLC_SUCCESS;
 }
 
 /*****************************************************************************
- * End: terminate Magnify video thread output method
- *****************************************************************************/
-static void End( vout_thread_t *p_vout )
-{
-    int i_index;
-
-    /* Free the fake output buffers we allocated */
-    for( i_index = I_OUTPUTPICTURES ; i_index ; )
-    {
-        i_index--;
-        free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
-    }
-
-    var_DelCallback( p_vout->p_sys->p_vout, "mouse-x", MouseEvent, p_vout);
-    var_DelCallback( p_vout->p_sys->p_vout, "mouse-y", MouseEvent, p_vout);
-    var_DelCallback( p_vout->p_sys->p_vout, "mouse-clicked", MouseEvent, p_vout);
-}
-
-/*****************************************************************************
- * Destroy: destroy Magnify video thread output method
+ * Destroy:
  *****************************************************************************/
 static void Destroy( vlc_object_t *p_this )
 {
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
+    filter_t *p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys = p_filter->p_sys;
 
-    if( p_vout->p_sys->p_vout )
-    {
-        DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
-        vlc_object_detach( p_vout->p_sys->p_vout );
-        vout_Destroy( p_vout->p_sys->p_vout );
-    }
-
-    image_HandlerDelete( p_vout->p_sys->p_image );
+    image_HandlerDelete( p_sys->p_image );
 
-    DEL_PARENT_CALLBACKS( SendEventsToChild );
-
-    free( p_vout->p_sys );
+    free( p_sys );
 }
 
 /*****************************************************************************
  * Render: displays previously rendered output
  *****************************************************************************/
-static void Render( vout_thread_t *p_vout, picture_t *p_pic )
+static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 {
+    filter_sys_t *p_sys = p_filter->p_sys;
     picture_t *p_outpic;
 
-    int o_x = p_vout->p_sys->i_x;
-    int o_y = p_vout->p_sys->i_y;
-    int o_zoom = p_vout->p_sys->i_zoom;
-    int x,y,o_yp,o_xp;
     int v_w, v_h;
-    video_format_t fmt_out;
     picture_t *p_converted;
-    plane_t *p_oyp=NULL;
+    plane_t *p_oyp;
     int i_plane;
 
-    memset( &fmt_out, 0, sizeof(video_format_t) );
-    /* This is a new frame. Get a structure from the video_output. */
-    while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
-              == NULL )
+    p_outpic = filter_NewPicture( p_filter );
+    if( !p_outpic )
     {
-        if( p_vout->b_die || p_vout->b_error )
-        {
-            return;
-        }
-        msleep( VOUT_OUTMEM_SLEEP );
+        picture_Release( p_pic );
+        return NULL;
     }
 
-    vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
-
-    p_oyp = &(p_outpic->p[Y_PLANE]);
+    /* */
+    const bool b_visible = p_sys->b_visible;
+    const int o_x = p_sys->i_x;
+    const int o_y = p_sys->i_y;
+    const int o_zoom = p_sys->i_zoom;
 
     /* background magnified image */
     if( o_zoom != ZOOM_FACTOR )
     {
+        video_format_t fmt_in;
+        video_format_t fmt_out;
+        picture_t crop;
+
+        crop = *p_pic;
         for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
         {
-            o_yp = o_y*p_outpic->p[i_plane].i_lines
-                   /p_outpic->p[Y_PLANE].i_lines;
-            o_xp = o_x*p_outpic->p[i_plane].i_pitch
-                   /p_outpic->p[Y_PLANE].i_pitch;
-            int i_pitch = p_outpic->p[i_plane].i_pitch;
-#if 0
-            int o_zoom2 = o_zoom*o_zoom;
-            int o_zoom3 = o_zoom*o_zoom*o_zoom;
-            int o_zoom4 = o_zoom*o_zoom*o_zoom*o_zoom;
-            int o_zoom6 = o_zoom*o_zoom*o_zoom * o_zoom*o_zoom*o_zoom;
-#endif
-            for( y=0; y<p_outpic->p[i_plane].i_visible_lines; y++ )
-            {
-                for( x=0; x<p_outpic->p[i_plane].i_visible_pitch; x++ )
-                {
-#if 0
-                    /* Nearest neighbor */
-                    int nx = o_xp + x*ZOOM_FACTOR/o_zoom;
-                    int ny = o_yp + y*ZOOM_FACTOR/o_zoom;
-                    p_outpic->p[i_plane].p_pixels[y*i_pitch+x] =
-                        p_pic->p[i_plane].p_pixels[ny*i_pitch+nx];
-#elif 1
-                    /* Bi-linear */
-                    int nx_real = o_xp*o_zoom + x*ZOOM_FACTOR;
-                    int ny_real = o_yp*o_zoom + y*ZOOM_FACTOR;
-                    int nx = nx_real/o_zoom;
-                    int ny = ny_real/o_zoom;
-                    int wtl = ((nx+1)*o_zoom-nx_real)*((ny+1)*o_zoom-ny_real);
-                    int wtr = (nx_real-nx*o_zoom)*((ny+1)*o_zoom-ny_real);
-                    int wbl = ((nx+1)*o_zoom-nx_real)*(ny_real-ny*o_zoom);
-                    int wbr = (nx_real-nx*o_zoom)*(ny_real-ny*o_zoom);
-                    p_outpic->p[i_plane].p_pixels[y*i_pitch+x] =
-                        ( wtl*p_pic->p[i_plane].p_pixels[ny*i_pitch+nx]
-                        + wtr*p_pic->p[i_plane].p_pixels[ny*i_pitch+(nx+1)]
-                        + wbl*p_pic->p[i_plane].p_pixels[(ny+1)*i_pitch+nx]
-                        + wbr*p_pic->p[i_plane].p_pixels[(ny+1)*i_pitch+(nx+1)]
-                        ) / (o_zoom*o_zoom);
-#else
-                    /* Bi-cubic */
-                    /* FIXME: doesn't work */
-                    /* \Sigma_{i=0..3} \Sigma_{j=0..3} \alpha_{i,j} x^i y^j
-                     * 16 \alpha_{i,j} so we need to use the 16 nearest pixels
-                     *
-                     * In fact we should be able to write it as:
-                     * \Pi_{i=1..16} [ \Pi_{j!=i} ( x - x_j ) * ( y - y_j ) ]
-                     *   * z_i / [ \Pi_{j!=i} ( x_i - x_j ) * ( y_i - y_j ) ]
-                     * We also have to make sure that we don't use any
-                     * x_j == x_i or y_j == y_i in the \Pi on j (else we get
-                     * a 0/0 which kind of sucks) .
-                     */
-                    uint8_t *p = p_pic->p[i_plane].p_pixels;
-                    int nx_real = o_xp*o_zoom + x*ZOOM_FACTOR;
-                    int ny_real = o_yp*o_zoom + y*ZOOM_FACTOR;
-
-                    int nx = nx_real/o_zoom;
-                    int ny = ny_real/o_zoom;
-
-                    int xi, yi, xj, yj;
-                    int my = __MAX( ny-1, 0 );
-                    int mx = __MAX( nx-1, 0 );
-                    //p_outpic->p[i_plane].i_visible_lines - 4
-                    //p_outpic->p[i_plane].i_visible_pitch - 4
-                    int v = 1;
-                    for( yi = my; yi <= my+3; yi++ )
-                    {
-                        int numy = 1;
-                        int deny = 1;
-                        /*
-                        for( yj = my; yj <= my+3; yj++ )
-                        {
-                            if( yj != yi )
-                            {
-                                numy *= (ny_real-yj*o_zoom);
-                                deny *= (yi - yj);
-                            }
-                        }
-                        numy /= o_zoom2;*/
-                        for( xi = mx; xi <= mx+3; xi++ )
-                        {
-                            int num = numy;
-                            int den = deny;
-                            for( xj = mx; xj <= mx+3; xj++ )
-                            {
-                                if( xj != xi )
-                                {
-                                    num *= (nx_real-xj*o_zoom);
-                                    den *= (xi - xj);
-                                }
-                            }
-                            v = ( v * (p[yi*i_pitch+xi] * num) ) / ( den * o_zoom3 );
-                        }
-                    }
-                    p_outpic->p[i_plane].p_pixels[y*i_pitch+x] = v;
-#endif
-                }
-            }
+            const int o_yp = o_y * p_outpic->p[i_plane].i_lines / p_outpic->p[Y_PLANE].i_lines;
+            const int o_xp = o_x * p_outpic->p[i_plane].i_pitch / p_outpic->p[Y_PLANE].i_pitch;
+
+            crop.p[i_plane].p_pixels += o_yp * p_pic->p[i_plane].i_pitch + o_xp;
         }
+
+        /* */
+        fmt_in = p_filter->fmt_in.video;
+        fmt_in.i_width  = (fmt_in.i_width  * ZOOM_FACTOR / o_zoom) & ~1;
+        fmt_in.i_height = (fmt_in.i_height * ZOOM_FACTOR / o_zoom) & ~1;
+
+        /* */
+        fmt_out = p_filter->fmt_out.video;
+
+        p_converted = image_Convert( p_sys->p_image, &crop, &fmt_in, &fmt_out );
+
+        picture_CopyPixels( p_outpic, p_converted );
+
+        picture_Release( p_converted );
     }
     else
     {
-        for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
-        {
-        p_vout->p_libvlc->
-        pf_memcpy( p_outpic->p[i_plane].p_pixels, p_pic->p[i_plane].p_pixels,
-            p_outpic->p[i_plane].i_lines * p_outpic->p[i_plane].i_pitch );
-        }
+        picture_CopyPixels( p_outpic, p_pic );
     }
 
-    if( p_vout->p_sys->b_visible )
+    /* */
+    p_oyp = &p_outpic->p[Y_PLANE];
+    if( b_visible )
     {
+        video_format_t fmt_out;
+
         /* image visualization */
-        fmt_out = p_vout->fmt_out;
-        fmt_out.i_width = p_vout->render.i_width/VIS_ZOOM;
-        fmt_out.i_height = p_vout->render.i_height/VIS_ZOOM;
-        p_converted = image_Convert( p_vout->p_sys->p_image, p_pic,
-                                     &(p_pic->format), &fmt_out );
-        for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
-        {
-            for( y=0; y<p_converted->p[i_plane].i_visible_lines; y++)
-            {
-                p_vout->p_libvlc->pf_memcpy(
-                p_outpic->p[i_plane].p_pixels+y*p_outpic->p[i_plane].i_pitch,
-                p_converted->p[i_plane].p_pixels+y*p_converted->p[i_plane].i_pitch,
-                p_converted->p[i_plane].i_visible_pitch );
-            }
-        }
-        p_converted->pf_release( p_converted );
+        fmt_out = p_filter->fmt_out.video;
+        fmt_out.i_width  = (fmt_out.i_width /VIS_ZOOM) & ~1;
+        fmt_out.i_height = (fmt_out.i_height/VIS_ZOOM) & ~1;
+        p_converted = image_Convert( p_sys->p_image, p_pic,
+                                     &p_pic->format, &fmt_out );
+
+        /* It will put only what can be copied at the top left */
+        picture_CopyPixels( p_outpic, p_converted );
+
+        picture_Release( p_converted );
 
         /* white rectangle on visualization */
-        v_w = p_oyp->i_pitch*ZOOM_FACTOR/(VIS_ZOOM*o_zoom);
-        v_h = (o_y+p_oyp->i_lines*ZOOM_FACTOR/o_zoom)/VIS_ZOOM;
-        /* top line */
-        p_vout->p_libvlc->pf_memset( p_oyp->p_pixels
-                                     + o_y/VIS_ZOOM*p_oyp->i_pitch
-                                     + o_x/VIS_ZOOM, 0xff, v_w+1 );
-
-        for( y = o_y/VIS_ZOOM+1; y < v_h; y++ )
-        {
-            /* left line */
-            p_oyp->p_pixels[
-                y*p_oyp->i_pitch+o_x/VIS_ZOOM
-            ] = 0xff;
-            /* right line */
-            p_oyp->p_pixels[
-                y*p_oyp->i_pitch+o_x/VIS_ZOOM + v_w
-            ] = 0xff;
-        }
-        /* bottom line */
-        p_vout->p_libvlc->pf_memset( p_oyp->p_pixels
-                                     + v_h*p_oyp->i_pitch
-                                     + o_x/VIS_ZOOM, 0xff, v_w+1 );
+        v_w = __MIN( fmt_out.i_width  * ZOOM_FACTOR / o_zoom, fmt_out.i_width - 1 );
+        v_h = __MIN( fmt_out.i_height * ZOOM_FACTOR / o_zoom, fmt_out.i_height - 1 );
+
+        DrawRectangle( p_oyp->p_pixels, p_oyp->i_pitch,
+                       p_oyp->i_pitch, p_oyp->i_lines,
+                       o_x/VIS_ZOOM, o_y/VIS_ZOOM,
+                       v_w, v_h );
 
         /* */
-        v_h = p_oyp->i_lines/VIS_ZOOM;
+        v_h = fmt_out.i_height + 1;
     }
     else
     {
         v_h = 1;
     }
 
-    /* print a small "VLC ZOOM" ... gruikkkkkkkkk */
-#define DRAW(a) {int c,l=1;L a;}
-#define L ;l++,c=1
-#define X ;draw(l,c);c+=1
-#define o +1
-#define draw(y,x) p_oyp->p_pixels[(v_h+y)*p_oyp->i_pitch+x] = 0xff;
-if( p_vout->p_sys->b_visible )
-DRAW(
-X o o o X o X o o o o o o X X X X o o o X X X X X o o X X X o o o X X X o o X X o X X o o o X o o o X o X X X X X o X X X X o o X X X X X L
-X o o o X o X o o o o o X o o o o o o o o o o X o o X o o o X o X o o o X o X o X o X o o o X o o o X o o o X o o o X o o o X o X o o o o L
-o X o X o o X o o o o o X o o o o o o o o o X o o o X o o o X o X o o o X o X o o o X o o o X X X X X o o o X o o o X o o o X o X X X X o L
-o X o X o o X o o o o o X o o o o o o o o X o o o o X o o o X o X o o o X o X o o o X o o o X o o o X o o o X o o o X o o o X o X o o o o L
-o o X o o o X X X X X o o X X X X o o o X X X X X o o X X X o o o X X X o o X o o o X o o o X o o o X o X X X X X o X X X X o o X X X X X L
-)
-else
-DRAW(
-X o o o X o X o o o o o o X X X X o o o X X X X X o o X X X o o o X X X o o X X o X X o o o o X X X X o X o o o X o o X X X o o X o o o X L
-X o o o X o X o o o o o X o o o o o o o o o o X o o X o o o X o X o o o X o X o X o X o o o X o o o o o X o o o X o X o o o X o X o o o X L
-o X o X o o X o o o o o X o o o o o o o o o X o o o X o o o X o X o o o X o X o o o X o o o o X X X o o X X X X X o X o o o X o X o X o X L
-o X o X o o X o o o o o X o o o o o o o o X o o o o X o o o X o X o o o X o X o o o X o o o o o o o X o X o o o X o X o o o X o X o X o X L
-o o X o o o X X X X X o o X X X X o o o X X X X X o o X X X o o o X X X o o X o o o X o o o X X X X o o X o o o X o o X X X o o o X o X o L
-)
-#undef DRAW
-#undef L
-#undef X
-#undef O
-#undef draw
-
-    if( p_vout->p_sys->b_visible )
+    /* print a small "VLC ZOOM" */
+
+    if( b_visible || p_sys->i_last_activity + p_sys->i_hide_timeout > mdate() )
+        DrawZoomStatus( p_oyp->p_pixels, p_oyp->i_pitch, p_oyp->i_pitch, p_oyp->i_lines,
+                        1, v_h, b_visible );
+
+    if( b_visible )
     {
         /* zoom gauge */
-        p_vout->p_libvlc->pf_memset( p_oyp->p_pixels
-                                     + (v_h+9)*p_oyp->i_pitch,
-                                     0xff, 41 );
-        for( y = v_h + 10; y < v_h + 90; y++ )
+        memset( p_oyp->p_pixels + (v_h+9)*p_oyp->i_pitch, 0xff, 41 );
+        for( int y = v_h + 10; y < v_h + 90; y++ )
         {
-            int width = v_h + 90 - y;
-            width = (width*width)/160;
-            if( (80 - y + v_h)*10 < o_zoom )
+            int i_width = v_h + 90 - y;
+            i_width = i_width * i_width / 160;
+            if( (80 - y + v_h)*ZOOM_FACTOR/10 < o_zoom )
             {
-                p_vout->p_libvlc->pf_memset( p_oyp->p_pixels
-                                             + y*p_oyp->i_pitch,
-                                             0xff, width );
+                memset( p_oyp->p_pixels + y*p_oyp->i_pitch, 0xff, i_width );
             }
             else
             {
                 p_oyp->p_pixels[y*p_oyp->i_pitch] = 0xff;
-                p_oyp->p_pixels[y*p_oyp->i_pitch + width - 1] = 0xff;
+                p_oyp->p_pixels[y*p_oyp->i_pitch + i_width - 1] = 0xff;
             }
         }
     }
 
-    vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }
 
-/*****************************************************************************
- * SendEvents: forward mouse and keyboard events to the parent p_vout
- *****************************************************************************/
-static int SendEvents( vlc_object_t *p_this, char const *psz_var,
-                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static void DrawZoomStatus( uint8_t *pb_dst, int i_pitch, int i_width, int i_height,
+                            int i_offset_x, int i_offset_y, bool b_visible )
 {
-    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
-    var_Set( (vlc_object_t *)p_data, psz_var, newval );
-
-    return VLC_SUCCESS;
+    static const char *p_hide =
+        "X   X X      XXXX   XXXXX  XXX   XXX  XX XX   X   X XXXXX XXXX  XXXXXL"
+        "X   X X     X          X  X   X X   X X X X   X   X   X   X   X X    L"
+        " X X  X     X         X   X   X X   X X   X   XXXXX   X   X   X XXXX L"
+        " X X  X     X        X    X   X X   X X   X   X   X   X   X   X X    L"
+        "  X   XXXXX  XXXX   XXXXX  XXX   XXX  X   X   X   X XXXXX XXXX  XXXXXL";
+    static const char *p_show = 
+        "X   X X      XXXX   XXXXX  XXX   XXX  XX XX    XXXX X   X  XXX  X   XL"
+        "X   X X     X          X  X   X X   X X X X   X     X   X X   X X   XL"
+        " X X  X     X         X   X   X X   X X   X    XXX  XXXXX X   X X X XL"
+        " X X  X     X        X    X   X X   X X   X       X X   X X   X X X XL"
+        "  X   XXXXX  XXXX   XXXXX  XXX   XXX  X   X   XXXX  X   X  XXX   X X L";
+    const char *p_draw = b_visible ? p_hide : p_show;
+    int i, y, x;
+
+    for( i = 0, x = i_offset_x, y = i_offset_y; p_draw[i] != '\0'; i++ )
+    {
+        if( p_draw[i] == 'X' )
+        {
+            if( x < i_width && y < i_height )
+                pb_dst[y*i_pitch + x] = 0xff;
+            x++;
+        }
+        else if( p_draw[i] == ' ' )
+        {
+            x++;
+        }
+        else if( p_draw[i] == 'L' )
+        {
+            x = i_offset_x;
+            y++;
+        }
+    }
 }
-
-/*****************************************************************************
- * SendEventsToChild: forward events to the child/children vout
- *****************************************************************************/
-static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
-                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static void DrawRectangle( uint8_t *pb_dst, int i_pitch, int i_width, int i_height,
+                           int x, int y, int i_w, int i_h )
 {
-    VLC_UNUSED(p_data); VLC_UNUSED(oldval);
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    var_Set( p_vout->p_sys->p_vout, psz_var, newval );
-    return VLC_SUCCESS;
+    int dy;
+
+    if( x + i_w > i_width || y + i_h > i_height )
+        return;
+
+    /* top line */
+    vlc_memset( &pb_dst[y * i_pitch + x], 0xff, i_w );
+
+    /* left and right */
+    for( dy = 1; dy < i_h-1; dy++ )
+    {
+        pb_dst[(y+dy) * i_pitch + x +     0] = 0xff;
+        pb_dst[(y+dy) * i_pitch + x + i_w-1] = 0xff;
+    }
+
+    /* bottom line */
+    vlc_memset( &pb_dst[(y+i_h-1) * i_pitch + x], 0xff, i_w );
 }
 
-/*****************************************************************************
- * MouseEvent: callback for mouse events
- *****************************************************************************/
-static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
-                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse, const vlc_mouse_t *p_old, const vlc_mouse_t *p_new )
 {
-    VLC_UNUSED(p_this);
-    vout_thread_t *p_vout = (vout_thread_t*)p_data;
-    vlc_value_t vald,valx,valy;
-
-#define MOUSE_DOWN    1
-#define MOUSE_CLICKED 2
-#define MOUSE_MOVE_X  4
-#define MOUSE_MOVE_Y  8
-#define MOUSE_MOVE    12
-    uint8_t mouse= 0;
-
-    int v_h = p_vout->output.i_height*ZOOM_FACTOR/p_vout->p_sys->i_zoom;
-    int v_w = p_vout->output.i_width*ZOOM_FACTOR/p_vout->p_sys->i_zoom;
-
-    if( psz_var[6] == 'x' ) mouse |= MOUSE_MOVE_X;
-    if( psz_var[6] == 'y' ) mouse |= MOUSE_MOVE_Y;
-    if( psz_var[6] == 'c' ) mouse |= MOUSE_CLICKED;
-
-    var_Get( p_vout->p_sys->p_vout, "mouse-button-down", &vald );
-    if( vald.i_int & 0x1 ) mouse |= MOUSE_DOWN;
-    var_Get( p_vout->p_sys->p_vout, "mouse-y", &valy );
-    var_Get( p_vout->p_sys->p_vout, "mouse-x", &valx );
-
-    if( ( mouse&MOUSE_MOVE && mouse&MOUSE_DOWN)
-        || mouse&MOUSE_CLICKED )
+    filter_sys_t *p_sys = p_filter->p_sys;
+    const video_format_t *p_fmt = &p_filter->fmt_in.video;
+
+    /* */
+    const bool b_click = vlc_mouse_HasPressed( p_old, p_new, MOUSE_BUTTON_LEFT );
+    const bool b_pressed = vlc_mouse_IsLeftPressed( p_new );
+
+    bool b_grab = false;
+
+    /* Find the mouse position */
+    if( p_sys->b_visible )
     {
-    /* (mouse moved and mouse button is down) or (mouse clicked) */
-        if( p_vout->p_sys->b_visible )
+        const int i_visu_width  = p_fmt->i_width  / VIS_ZOOM;
+        const int i_visu_height = p_fmt->i_height / VIS_ZOOM;
+
+        if( p_new->i_x >= 0 && p_new->i_x < i_visu_width &&
+            p_new->i_y >= 0 && p_new->i_y < i_visu_height )
         {
-            if(    0 <= valy.i_int
-                && valy.i_int < (int)p_vout->output.i_height/VIS_ZOOM
-                && 0 <= valx.i_int
-                && valx.i_int < (int)p_vout->output.i_width/VIS_ZOOM )
-            {
-            /* mouse is over visualisation */
-                p_vout->p_sys->i_x = __MIN( __MAX( valx.i_int*VIS_ZOOM - v_w/2, 0 ),
-                                            p_vout->output.i_width - v_w - 1);
-                p_vout->p_sys->i_y = __MIN( __MAX( valy.i_int * VIS_ZOOM - v_h/2,
-                                        0 ), p_vout->output.i_height - v_h - 1);
-            }
-            else if( valx.i_int >= 0 && valx.i_int < 80
-                && valy.i_int >= (int)p_vout->output.i_height/VIS_ZOOM
-                && valy.i_int < (int)p_vout->output.i_height/VIS_ZOOM + 9
-                && mouse&MOUSE_CLICKED )
-            {
-            /* mouse is over the "VLC ZOOM HIDE" text */
-                p_vout->p_sys->b_visible = false;
-            }
-            else if(    (int)p_vout->output.i_height/VIS_ZOOM + 9 <= valy.i_int
-                     && valy.i_int <= (int)p_vout->output.i_height/VIS_ZOOM + 90
-                     && 0 <= valx.i_int
-                     && valx.i_int <=
-                     (( (int)p_vout->output.i_height/VIS_ZOOM + 90 -  valy.i_int)
-               *( (int)p_vout->output.i_height/VIS_ZOOM + 90 -  valy.i_int))/160 )
+            /* Visualization */
+            if( b_pressed )
             {
-            /* mouse is over zoom gauge */
-                p_vout->p_sys->i_zoom = __MAX( ZOOM_FACTOR,
-                                ( 80 + (int)p_vout->output.i_height/VIS_ZOOM
-                                   - valy.i_int + 2) * ZOOM_FACTOR/10 );
-            }
-            else if( mouse&MOUSE_MOVE_X && !(mouse&MOUSE_CLICKED) )
-            {
-                p_vout->p_sys->i_x -= (newval.i_int - oldval.i_int)
-                                      *ZOOM_FACTOR/p_vout->p_sys->i_zoom;
-            }
-            else if( mouse&MOUSE_MOVE_Y && !(mouse&MOUSE_CLICKED) )
-            {
-                p_vout->p_sys->i_y -= (newval.i_int - oldval.i_int)
-                                      *ZOOM_FACTOR/p_vout->p_sys->i_zoom;
+                const int v_w = p_fmt->i_width  * ZOOM_FACTOR / p_sys->i_zoom;
+                const int v_h = p_fmt->i_height * ZOOM_FACTOR / p_sys->i_zoom;
+
+                p_sys->i_x = __MIN( __MAX( p_new->i_x * VIS_ZOOM - v_w/2, 0 ),
+                                           (int)p_fmt->i_width  - v_w - 1);
+                p_sys->i_y = __MIN( __MAX( p_new->i_y * VIS_ZOOM - v_h/2, 0 ),
+                                           (int)p_fmt->i_height - v_h - 1);
+
+                b_grab = true;
             }
         }
-        else
+        else if( p_new->i_x >= 0 && p_new->i_x < 80 &&
+                 p_new->i_y >= i_visu_height &&
+                 p_new->i_y <  i_visu_height + 9 )
         {
-            if( valx.i_int >= 0 && valx.i_int < 80 && valy.i_int >= 0
-                && valy.i_int <= 10 && mouse&MOUSE_CLICKED )
+            /* Hide text */
+            if( b_click )
             {
-            /* mouse is over the "VLC ZOOM SHOW" text */
-                p_vout->p_sys->b_visible = true;
+                p_sys->b_visible = false;
+                b_grab = true;
             }
-            else if( mouse&MOUSE_MOVE_X && !(mouse&MOUSE_CLICKED) )
+        }
+        else if( p_new->i_x >= 0 &&
+                 p_new->i_x <= ( i_visu_height + 90 - p_new->i_y ) *
+                               ( i_visu_height + 90 - p_new->i_y ) / 160 &&
+                 p_new->i_y >= i_visu_height + 9 &&
+                 p_new->i_y <= i_visu_height + 90 )
+        {
+            /* Zoom gauge */
+            if( b_pressed )
             {
-                p_vout->p_sys->i_x -= (newval.i_int - oldval.i_int)
-                                      *ZOOM_FACTOR/p_vout->p_sys->i_zoom;
+                p_sys->i_zoom = __MAX( ZOOM_FACTOR,
+                                       (80 + i_visu_height - p_new->i_y + 2) *
+                                           ZOOM_FACTOR / 10 );
+
+                const int v_w = p_fmt->i_width  * ZOOM_FACTOR / p_sys->i_zoom;
+                const int v_h = p_fmt->i_height * ZOOM_FACTOR / p_sys->i_zoom;
+                p_sys->i_x = __MAX( __MIN( p_sys->i_x, (int)p_fmt->i_width  - v_w - 1 ), 0 );
+                p_sys->i_y = __MAX( __MIN( p_sys->i_y, (int)p_fmt->i_height - v_h - 1 ), 0 );
+
+                b_grab = true;
             }
-            else if( mouse&MOUSE_MOVE_Y && !(mouse&MOUSE_CLICKED) )
+        }
+    }
+    else
+    {
+        if( p_new->i_x >= 0 && p_new->i_x <  80 &&
+            p_new->i_y >= 0 && p_new->i_y <= 10 )
+        {
+            /* Show text */
+            if( b_click )
             {
-                p_vout->p_sys->i_y -= (newval.i_int - oldval.i_int)
-                                      *ZOOM_FACTOR/p_vout->p_sys->i_zoom;
+                p_sys->b_visible = true;
+                b_grab = true;
             }
         }
     }
 
-    p_vout->p_sys->i_x =
-         __MAX( 0, __MIN( p_vout->p_sys->i_x, (int)p_vout->output.i_width
-         - (int)p_vout->output.i_width*ZOOM_FACTOR/p_vout->p_sys->i_zoom - 1 ));
-    p_vout->p_sys->i_y =
-         __MAX( 0, __MIN( p_vout->p_sys->i_y, (int)p_vout->output.i_height
-        - (int)p_vout->output.i_height*ZOOM_FACTOR/p_vout->p_sys->i_zoom - 1 ));
+    if( vlc_mouse_HasMoved( p_old, p_new ) )
+        p_sys->i_last_activity = mdate();
 
+    if( b_grab )
+        return VLC_EGENERIC;
 
+    /* */
+    *p_mouse = *p_new;
+    p_mouse->i_x = p_sys->i_x + p_new->i_x * ZOOM_FACTOR / p_sys->i_zoom;
+    p_mouse->i_y = p_sys->i_y + p_new->i_y * ZOOM_FACTOR / p_sys->i_zoom;
     return VLC_SUCCESS;
 }
+