/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <math.h>
#include "filter_common.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 * );
+vlc_module_begin();
+ set_description( N_("Magnify/Zoom interactive video filter") );
+ set_shortname( N_( "Magnify" ));
+ set_capability( "video filter", 0 );
+ set_category( CAT_VIDEO );
+ set_subcategory( SUBCAT_VIDEO_VFILTER );
+
+ set_callbacks( Create, Destroy );
+vlc_module_end();
+
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
static int Init ( vout_thread_t * );
static void End ( vout_thread_t * );
static void Render ( vout_thread_t *, picture_t * );
static int MouseEvent ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-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 );
-
- 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
image_handler_t *p_image;
+ int64_t i_hide_timeout;
+
+ vlc_mutex_t lock;
int i_zoom; /* zoom level in percent */
int i_x, i_y; /* top left corner coordinates in original image */
- vlc_bool_t b_visible; /* is "interface" visible ? */
+ bool b_visible; /* is "interface" visible ? */
+
+ int64_t i_last_activity;
};
+#define VIS_ZOOM 4
+#define ZOOM_FACTOR 8
+
/*****************************************************************************
* Control: control facility for the vout (forwards to child vout)
*****************************************************************************/
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ switch( p_vout->fmt_in.i_chroma )
+ {
+ CASE_PLANAR_YUV
+ case VLC_FOURCC('G','R','E','Y'):
+ break;
+ default:
+ msg_Err( p_vout, "Unsupported chroma" );
+ return VLC_EGENERIC;
+ }
+
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
return VLC_ENOMEM;
- }
p_vout->p_sys->p_image = image_HandlerCreate( p_vout );
{
int i_index;
picture_t *p_pic;
- video_format_t fmt = {0};
+ video_format_t fmt;
+ memset( &fmt, 0, sizeof(video_format_t) );
I_OUTPUTPICTURES = 0;
/* Initialize the output structure */
return VLC_EGENERIC;
}
-#define VIS_ZOOM 4
+ vlc_mutex_init( &p_vout->p_sys->lock );
p_vout->p_sys->i_x = 0;
p_vout->p_sys->i_y = 0;
-#define ZOOM_FACTOR 100
- p_vout->p_sys->i_zoom = 200;
+ p_vout->p_sys->i_zoom = 2*ZOOM_FACTOR;
+ p_vout->p_sys->b_visible = true;
+ p_vout->p_sys->i_last_activity = mdate();
+ p_vout->p_sys->i_hide_timeout = 1000 * var_GetInteger( p_vout, "mouse-hide-timeout" );
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 );
{
int i_index;
+ DEL_PARENT_CALLBACKS( SendEventsToChild );
+
+ DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+
/* Free the fake output buffers we allocated */
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
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);
+
+ vlc_mutex_destroy( &p_vout->p_sys->lock );
+
+ vout_CloseAndRelease( p_vout->p_sys->p_vout );
}
/*****************************************************************************
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- 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 );
- DEL_PARENT_CALLBACKS( SendEventsToChild );
free( p_vout->p_sys );
}
*****************************************************************************/
static void Render( vout_thread_t *p_vout, picture_t *p_pic )
{
+ vout_sys_t *p_sys = p_vout->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 = {0};
picture_t *p_converted;
- plane_t *p_oyp=NULL;
+ plane_t *p_oyp;
+ int i_plane;
/* 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 ) )
+ while( ( p_outpic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 ) )
== NULL )
{
- if( p_vout->b_die || p_vout->b_error )
+ if( !vlc_object_alive (p_vout) || p_vout->b_error )
{
return;
}
msleep( VOUT_OUTMEM_SLEEP );
}
- vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
+ vout_DatePicture( p_sys->p_vout, p_outpic, p_pic->date );
+
- p_oyp = &(p_outpic->p[Y_PLANE]);
+ vlc_mutex_lock( &p_sys->lock );
+ 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;
+ const int64_t i_last_activity = p_sys->i_last_activity;
+ vlc_mutex_unlock( &p_sys->lock );
/* background magnified image */
if( o_zoom != ZOOM_FACTOR )
{
-#define magnify( plane ) \
- o_yp = o_y*p_outpic->p[plane].i_lines/p_outpic->p[Y_PLANE].i_lines; \
- o_xp = o_x*p_outpic->p[plane].i_pitch/p_outpic->p[Y_PLANE].i_pitch; \
- for( y=0; y<p_outpic->p[plane].i_visible_lines; y++ ) \
- { \
- for( x=0; x<p_outpic->p[plane].i_visible_pitch; x++ ) \
- { \
- p_outpic->p[plane].p_pixels[y*p_outpic->p[plane].i_pitch+x] = \
- p_pic->p[plane].p_pixels[ \
- ( o_yp + y*ZOOM_FACTOR/o_zoom )*p_outpic->p[plane].i_pitch \
- + o_xp + x*ZOOM_FACTOR/o_zoom \
- ]; \
- } \
- }
- magnify( Y_PLANE );
- magnify( U_PLANE );
- magnify( V_PLANE );
-#undef magnify
+ 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++ )
+ {
+ 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_outpic->p[i_plane].i_pitch + o_xp;
+ }
+
+ /* */
+ fmt_in = p_vout->fmt_out;
+ 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_vout->fmt_out;
+
+ p_converted = image_Convert( p_sys->p_image, &crop, &fmt_in, &fmt_out );
+
+ picture_CopyPixels( p_outpic, p_converted );
+
+ picture_Release( p_converted );
}
else
{
-#define copy( plane ) \
- memcpy( p_outpic->p[plane].p_pixels, p_pic->p[plane].p_pixels, \
- p_outpic->p[plane].i_lines * p_outpic->p[plane].i_pitch );
- copy( Y_PLANE );
- copy( U_PLANE );
- copy( V_PLANE );
-#undef copy
+ 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 );
- #define copyimage( plane ) \
- for( y=0; y<p_converted->p[plane].i_visible_lines; y++) \
- { \
- memcpy( p_outpic->p[plane].p_pixels+y*p_outpic->p[plane].i_pitch, \
- p_converted->p[plane].p_pixels+y*p_converted->p[plane].i_pitch, \
- p_converted->p[plane].i_visible_pitch ); \
+ fmt_out.i_width = (p_vout->render.i_width/VIS_ZOOM ) & ~1;
+ fmt_out.i_height = (p_vout->render.i_height/VIS_ZOOM) & ~1;
+ p_converted = image_Convert( p_sys->p_image, p_pic,
+ &p_pic->format, &fmt_out );
+ for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
+ {
+ int y;
+ 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 );
+ }
}
- copyimage( Y_PLANE );
- copyimage( U_PLANE );
- copyimage( V_PLANE );
- #undef copyimage
- p_converted->pf_release( 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 */
- 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 */
- 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 || 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 )
{
+ int y;
+
/* zoom gauge */
- memset( p_oyp->p_pixels
- + (v_h+9)*p_oyp->i_pitch,
- 0xff, 41 );
+ vlc_memset( p_oyp->p_pixels + (v_h+9)*p_oyp->i_pitch, 0xff, 41 );
for( 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 )
+ if( (80 - y + v_h)*ZOOM_FACTOR/10 < o_zoom )
{
- memset( p_oyp->p_pixels
- + y*p_oyp->i_pitch,
- 0xff, width );
+ vlc_memset( p_oyp->p_pixels + y*p_oyp->i_pitch, 0xff, width );
}
else
{
}
}
- vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
+ vout_DisplayPicture( p_sys->p_vout, p_outpic );
+}
+
+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 )
+{
+ 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++;
+ }
+ }
+}
+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 )
+{
+ 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 );
}
/*****************************************************************************
static int SendEvents( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval);
var_Set( (vlc_object_t *)p_data, psz_var, newval );
return VLC_SUCCESS;
static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ 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;
vout_thread_t *p_vout = (vout_thread_t*)p_data;
vlc_value_t vald,valx,valy;
+ VLC_UNUSED(p_this);
+
#define MOUSE_DOWN 1
#define MOUSE_CLICKED 2
#define MOUSE_MOVE_X 4
#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-y", &valy );
var_Get( p_vout->p_sys->p_vout, "mouse-x", &valx );
+ vlc_mutex_lock( &p_vout->p_sys->lock );
+
+ const int v_h = p_vout->output.i_height*ZOOM_FACTOR/p_vout->p_sys->i_zoom;
+ const int v_w = p_vout->output.i_width*ZOOM_FACTOR/p_vout->p_sys->i_zoom;
+
if( ( mouse&MOUSE_MOVE && mouse&MOUSE_DOWN)
|| mouse&MOUSE_CLICKED )
{
&& mouse&MOUSE_CLICKED )
{
/* mouse is over the "VLC ZOOM HIDE" text */
- p_vout->p_sys->b_visible = VLC_FALSE;
+ 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
&& valy.i_int <= 10 && mouse&MOUSE_CLICKED )
{
/* mouse is over the "VLC ZOOM SHOW" text */
- p_vout->p_sys->b_visible = VLC_TRUE;
+ p_vout->p_sys->b_visible = true;
}
else if( mouse&MOUSE_MOVE_X && !(mouse&MOUSE_CLICKED) )
{
__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 );
return VLC_SUCCESS;
}
projects / vlc / blobdiff