Skip to content

V
vlc
Commit 48e6695b authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Convert magnify to "video filter2".

parent 2e65da66
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 246 deletions
modules/video_filter/magnify.c
View file @ 48e6695b
/***************************************************************************** /*****************************************************************************
* magnify.c : Magnify/Zoom interactive effect * magnify.c : Magnify/Zoom interactive effect
***************************************************************************** *****************************************************************************
* Copyright (C) 2005 the VideoLAN team * Copyright (C) 2005-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Antoine Cellerier <dionoea -at- videolan -dot- org> * Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
...@@ -28,19 +28,15 @@ ...@@ -28,19 +28,15 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <math.h> #include <math.h>
#include <assert.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 "filter_picture.h"
#include "vlc_image.h"
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
...@@ -50,7 +46,7 @@ static void Destroy ( vlc_object_t * ); ...@@ -50,7 +46,7 @@ static void Destroy ( vlc_object_t * );
vlc_module_begin () vlc_module_begin ()
set_description( N_("Magnify/Zoom interactive video filter") ) set_description( N_("Magnify/Zoom interactive video filter") )
set_shortname( N_( "Magnify" )) set_shortname( N_( "Magnify" ))
set_capability( "video filter", 0 ) set_capability( "video filter2", 0 )
set_category( CAT_VIDEO ) set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VFILTER ) set_subcategory( SUBCAT_VIDEO_VFILTER )
...@@ -61,30 +57,22 @@ vlc_module_end () ...@@ -61,30 +57,22 @@ vlc_module_end ()
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static int Init ( vout_thread_t * ); static picture_t *Filter( filter_t *, picture_t * );
static void End ( vout_thread_t * ); static int Mouse( filter_t *, vlc_mouse_t *, const vlc_mouse_t *, const vlc_mouse_t * );
static void Render ( vout_thread_t *, picture_t * );
static int MouseEvent( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
/* */
static void DrawZoomStatus( uint8_t *, int i_pitch, int i_width, int i_height, 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 ); 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, static void DrawRectangle( uint8_t *, int i_pitch, int i_width, int i_height,
int x, int y, int i_w, int i_h ); int x, int y, int i_w, int i_h );
/***************************************************************************** /* */
* vout_sys_t: Magnify video output method descriptor struct filter_sys_t
*****************************************************************************/
struct vout_sys_t
{ {
vout_thread_t *p_vout;
image_handler_t *p_image; image_handler_t *p_image;
int64_t i_hide_timeout; int64_t i_hide_timeout;
vlc_mutex_t lock;
int i_zoom; /* zoom level in percent */ int i_zoom; /* zoom level in percent */
int i_x, i_y; /* top left corner coordinates in original image */ int i_x, i_y; /* top left corner coordinates in original image */
...@@ -97,128 +85,73 @@ struct vout_sys_t ...@@ -97,128 +85,73 @@ struct vout_sys_t
#define ZOOM_FACTOR 8 #define ZOOM_FACTOR 8
/***************************************************************************** /*****************************************************************************
* Control: control facility for the vout (forwards to child vout) * Create:
*****************************************************************************/
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 );
}
/*****************************************************************************
* Create: allocates Magnify video thread output method
*****************************************************************************/ *****************************************************************************/
static int Create( vlc_object_t *p_this ) 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_PLANAR_YUV
case VLC_CODEC_GREY: case VLC_CODEC_GREY:
break; break;
default: default:
msg_Err( p_vout, "Unsupported chroma" ); msg_Err( p_filter, "Unsupported chroma" );
return VLC_EGENERIC;
}
if( memcmp( &p_filter->fmt_in, &p_filter->fmt_out, sizeof(p_filter->fmt_in) ) )
{
msg_Err( p_filter, "Input and output format does not match" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
/* Allocate structure */ /* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); p_filter->p_sys = p_sys = malloc( sizeof( *p_sys ) );
if( p_vout->p_sys == NULL ) if( !p_filter->p_sys )
return VLC_ENOMEM; return VLC_ENOMEM;
p_vout->p_sys->p_image = image_HandlerCreate( p_vout ); p_sys->p_image = image_HandlerCreate( p_filter );
if( !p_sys->p_image )
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 )
{
video_format_t fmt;
I_OUTPUTPICTURES = 0;
memset( &fmt, 0, sizeof(video_format_t) );
/* 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 );
/* Everything failed */
if( p_vout->p_sys->p_vout == NULL )
{ {
msg_Err( p_vout, "cannot open vout, aborting" ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
vlc_mutex_init( &p_vout->p_sys->lock ); p_sys->i_x = 0;
p_vout->p_sys->i_x = 0; p_sys->i_y = 0;
p_vout->p_sys->i_y = 0; p_sys->i_zoom = 2*ZOOM_FACTOR;
p_vout->p_sys->i_zoom = 2*ZOOM_FACTOR; p_sys->b_visible = true;
p_vout->p_sys->b_visible = true; p_sys->i_last_activity = mdate();
p_vout->p_sys->i_last_activity = mdate(); p_sys->i_hide_timeout = 1000 * var_CreateGetInteger( p_filter, "mouse-hide-timeout" ); /* FIXME */
p_vout->p_sys->i_hide_timeout = 1000 * var_GetInteger( p_vout, "mouse-hide-timeout" );
vout_filter_AllocateDirectBuffers( p_vout, VOUT_MAX_PICTURES );
vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, MouseEvent );
/* */
p_filter->pf_video_filter = Filter;
p_filter->pf_mouse = Mouse;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/***************************************************************************** /*****************************************************************************
* End: terminate Magnify video thread output method * Destroy:
*****************************************************************************/
static void End( vout_thread_t *p_vout )
{
vout_sys_t *p_sys = p_vout->p_sys;
vout_filter_DelChild( p_vout, p_sys->p_vout, MouseEvent );
vout_CloseAndRelease( p_sys->p_vout );
vout_filter_ReleaseDirectBuffers( p_vout );
vlc_mutex_destroy( &p_vout->p_sys->lock );
}
/*****************************************************************************
* Destroy: destroy Magnify video thread output method
*****************************************************************************/ *****************************************************************************/
static void Destroy( vlc_object_t *p_this ) 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;
image_HandlerDelete( p_vout->p_sys->p_image );
image_HandlerDelete( p_sys->p_image );
free( p_vout->p_sys ); free( p_sys );
} }
/***************************************************************************** /*****************************************************************************
* Render: displays previously rendered output * 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 )
{ {
vout_sys_t *p_sys = p_vout->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
picture_t *p_outpic; picture_t *p_outpic;
int v_w, v_h; int v_w, v_h;
...@@ -226,26 +159,18 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -226,26 +159,18 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
plane_t *p_oyp; plane_t *p_oyp;
int i_plane; int i_plane;
/* This is a new frame. Get a structure from the video_output. */ p_outpic = filter_NewPicture( p_filter );
while( ( p_outpic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 ) ) if( !p_outpic )
== NULL )
{
if( !vlc_object_alive (p_vout) || p_vout->b_error )
{ {
return; picture_Release( p_pic );
} return NULL;
msleep( VOUT_OUTMEM_SLEEP );
} }
p_outpic->date = p_pic->date; /* */
vlc_mutex_lock( &p_sys->lock );
const bool b_visible = p_sys->b_visible; const bool b_visible = p_sys->b_visible;
const int o_x = p_sys->i_x; const int o_x = p_sys->i_x;
const int o_y = p_sys->i_y; const int o_y = p_sys->i_y;
const int o_zoom = p_sys->i_zoom; const int o_zoom = p_sys->i_zoom;
const int64_t i_last_activity = p_sys->i_last_activity;
vlc_mutex_unlock( &p_sys->lock );
/* background magnified image */ /* background magnified image */
if( o_zoom != ZOOM_FACTOR ) if( o_zoom != ZOOM_FACTOR )
...@@ -264,12 +189,12 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -264,12 +189,12 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
} }
/* */ /* */
fmt_in = p_vout->fmt_out; fmt_in = p_filter->fmt_in.video;
fmt_in.i_width = (fmt_in.i_width * ZOOM_FACTOR / o_zoom) & ~1; 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_in.i_height = (fmt_in.i_height * ZOOM_FACTOR / o_zoom) & ~1;
/* */ /* */
fmt_out = p_vout->fmt_out; fmt_out = p_filter->fmt_out.video;
p_converted = image_Convert( p_sys->p_image, &crop, &fmt_in, &fmt_out ); p_converted = image_Convert( p_sys->p_image, &crop, &fmt_in, &fmt_out );
...@@ -289,22 +214,15 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -289,22 +214,15 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
video_format_t fmt_out; video_format_t fmt_out;
/* image visualization */ /* image visualization */
fmt_out = p_vout->fmt_out; fmt_out = p_filter->fmt_out.video;
fmt_out.i_width = (p_vout->render.i_width/VIS_ZOOM ) & ~1; fmt_out.i_width = (fmt_out.i_width /VIS_ZOOM) & ~1;
fmt_out.i_height = (p_vout->render.i_height/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_converted = image_Convert( p_sys->p_image, p_pic,
&p_pic->format, &fmt_out ); &p_pic->format, &fmt_out );
for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{ /* It will put only what can be copied at the top left */
int y; picture_CopyPixels( p_outpic, p_converted );
for( y = 0; y < p_converted->p[i_plane].i_visible_lines; y++)
{
vlc_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 );
}
}
picture_Release( p_converted ); picture_Release( p_converted );
/* white rectangle on visualization */ /* white rectangle on visualization */
...@@ -325,33 +243,32 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -325,33 +243,32 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
} }
/* print a small "VLC ZOOM" */ /* print a small "VLC ZOOM" */
if( b_visible || i_last_activity + p_sys->i_hide_timeout > mdate() )
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, DrawZoomStatus( p_oyp->p_pixels, p_oyp->i_pitch, p_oyp->i_pitch, p_oyp->i_lines,
1, v_h, b_visible ); 1, v_h, b_visible );
if( b_visible ) if( b_visible )
{ {
int y;
/* zoom gauge */ /* zoom gauge */
vlc_memset( p_oyp->p_pixels + (v_h+9)*p_oyp->i_pitch, 0xff, 41 ); memset( p_oyp->p_pixels + (v_h+9)*p_oyp->i_pitch, 0xff, 41 );
for( y = v_h + 10; y < v_h + 90; y++ ) for( int y = v_h + 10; y < v_h + 90; y++ )
{ {
int width = v_h + 90 - y; int i_width = v_h + 90 - y;
width = (width*width)/160; i_width = i_width * i_width / 160;
if( (80 - y + v_h)*ZOOM_FACTOR/10 < o_zoom ) if( (80 - y + v_h)*ZOOM_FACTOR/10 < o_zoom )
{ {
vlc_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 else
{ {
p_oyp->p_pixels[y*p_oyp->i_pitch] = 0xff; 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_sys->p_vout, p_outpic ); return CopyInfoAndRelease( p_outpic, p_pic );
} }
static void DrawZoomStatus( uint8_t *pb_dst, int i_pitch, int i_width, int i_height, static void DrawZoomStatus( uint8_t *pb_dst, int i_pitch, int i_width, int i_height,
...@@ -413,118 +330,97 @@ static void DrawRectangle( uint8_t *pb_dst, int i_pitch, int i_width, int i_heig ...@@ -413,118 +330,97 @@ static void DrawRectangle( uint8_t *pb_dst, int i_pitch, int i_width, int i_heig
vlc_memset( &pb_dst[(y+i_h-1) * i_pitch + x], 0xff, i_w ); vlc_memset( &pb_dst[(y+i_h-1) * i_pitch + x], 0xff, i_w );
} }
/***************************************************************************** static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse, const vlc_mouse_t *p_old, const vlc_mouse_t *p_new )
* 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 )
{ {
vout_thread_t *p_vout = p_data; filter_sys_t *p_sys = p_filter->p_sys;
vlc_value_t vald,valx,valy; const video_format_t *p_fmt = &p_filter->fmt_in.video;
assert( p_this == VLC_OBJECT(p_vout->p_sys->p_vout) );
#define MOUSE_DOWN 1 /* */
#define MOUSE_CLICKED 2 const bool b_click = vlc_mouse_HasPressed( p_old, p_new, MOUSE_BUTTON_LEFT );
#define MOUSE_MOVE_X 4 const bool b_pressed = vlc_mouse_IsLeftPressed( p_new );
#define MOUSE_MOVE_Y 8
#define MOUSE_MOVE 12
uint8_t mouse= 0;
if( psz_var[6] == 'x' ) mouse |= MOUSE_MOVE_X; bool b_grab = false;
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 ); /* Find the mouse position */
if( vald.i_int & 0x1 ) mouse |= MOUSE_DOWN; if( p_sys->b_visible )
var_Get( p_vout->p_sys->p_vout, "mouse-y", &valy ); {
var_Get( p_vout->p_sys->p_vout, "mouse-x", &valx ); const int i_visu_width = p_fmt->i_width / VIS_ZOOM;
const int i_visu_height = p_fmt->i_height / VIS_ZOOM;
vlc_mutex_lock( &p_vout->p_sys->lock ); 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 )
{
/* Visualization */
if( b_pressed )
{
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;
const int v_h = p_vout->output.i_height*ZOOM_FACTOR/p_vout->p_sys->i_zoom; p_sys->i_x = __MIN( __MAX( p_new->i_x * VIS_ZOOM - v_w/2, 0 ),
const int v_w = p_vout->output.i_width*ZOOM_FACTOR/p_vout->p_sys->i_zoom; (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);
if( ( mouse&MOUSE_MOVE && mouse&MOUSE_DOWN) b_grab = true;
|| mouse&MOUSE_CLICKED ) }
{ }
/* (mouse moved and mouse button is down) or (mouse clicked) */ else if( p_new->i_x >= 0 && p_new->i_x < 80 &&
if( p_vout->p_sys->b_visible ) p_new->i_y >= i_visu_height &&
p_new->i_y < i_visu_height + 9 )
{ {
if( 0 <= valy.i_int /* Hide text */
&& valy.i_int < (int)p_vout->output.i_height/VIS_ZOOM if( b_click )
&& 0 <= valx.i_int
&& valx.i_int < (int)p_vout->output.i_width/VIS_ZOOM )
{ {
/* mouse is over visualisation */ p_sys->b_visible = false;
p_vout->p_sys->i_x = __MIN( __MAX( valx.i_int*VIS_ZOOM - v_w/2, 0 ), b_grab = true;
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 else if( p_new->i_x >= 0 &&
&& valy.i_int <= (int)p_vout->output.i_height/VIS_ZOOM + 90 p_new->i_x <= ( i_visu_height + 90 - p_new->i_y ) *
&& 0 <= valx.i_int ( i_visu_height + 90 - p_new->i_y ) / 160 &&
&& valx.i_int <= p_new->i_y >= i_visu_height + 9 &&
(( (int)p_vout->output.i_height/VIS_ZOOM + 90 - valy.i_int) p_new->i_y <= i_visu_height + 90 )
*( (int)p_vout->output.i_height/VIS_ZOOM + 90 - valy.i_int))/160 )
{ {
/* mouse is over zoom gauge */ /* Zoom gauge */
p_vout->p_sys->i_zoom = __MAX( ZOOM_FACTOR, if( b_pressed )
( 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) p_sys->i_zoom = __MAX( ZOOM_FACTOR,
*ZOOM_FACTOR/p_vout->p_sys->i_zoom; (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) )
{
p_vout->p_sys->i_y -= (newval.i_int - oldval.i_int)
*ZOOM_FACTOR/p_vout->p_sys->i_zoom;
} }
} }
else else
{ {
if( valx.i_int >= 0 && valx.i_int < 80 && valy.i_int >= 0 if( p_new->i_x >= 0 && p_new->i_x < 80 &&
&& valy.i_int <= 10 && mouse&MOUSE_CLICKED ) p_new->i_y >= 0 && p_new->i_y <= 10 )
{
/* mouse is over the "VLC ZOOM SHOW" text */
p_vout->p_sys->b_visible = true;
}
else if( mouse&MOUSE_MOVE_X && !(mouse&MOUSE_CLICKED) )
{ {
p_vout->p_sys->i_x -= (newval.i_int - oldval.i_int) /* Show text */
*ZOOM_FACTOR/p_vout->p_sys->i_zoom; if( b_click )
}
else if( mouse&MOUSE_MOVE_Y && !(mouse&MOUSE_CLICKED) )
{ {
p_vout->p_sys->i_y -= (newval.i_int - oldval.i_int) p_sys->b_visible = true;
*ZOOM_FACTOR/p_vout->p_sys->i_zoom; b_grab = true;
} }
} }
} }
p_vout->p_sys->i_x = if( vlc_mouse_HasMoved( p_old, p_new ) )
__MAX( 0, __MIN( p_vout->p_sys->i_x, (int)p_vout->output.i_width p_sys->i_last_activity = mdate();
- (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 ));
p_vout->p_sys->i_last_activity = mdate();
vlc_mutex_unlock( &p_vout->p_sys->lock );
/* FIXME forward event when not grabbed */ 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; return VLC_SUCCESS;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment