X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Ftransform.c;h=c5dff9d3aab5c28c377d3c5b327eb7c9bc6eb1ec;hb=121a30e2dcb0f5444d53e5664f8e3e044f52b080;hp=01e88442c0da09a34c799d822c1d216a608547ae;hpb=4f028428053d0342c55deb6ba8b8da114c6a0caa;p=vlc diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c index 01e88442c0..c5dff9d3aa 100644 --- a/modules/video_filter/transform.c +++ b/modules/video_filter/transform.c @@ -25,10 +25,14 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include -#include "filter_common.h" #include "filter_picture.h" #define TRANSFORM_MODE_HFLIP 1 @@ -48,9 +52,10 @@ static void End ( vout_thread_t * ); static void Render ( vout_thread_t *, picture_t * ); static void FilterPlanar( vout_thread_t *, const picture_t *, picture_t * ); +static void FilterI422( vout_thread_t *, const picture_t *, picture_t * ); static void FilterYUYV( vout_thread_t *, const picture_t *, picture_t * ); -static int SendEvents( vlc_object_t *, char const *, +static int MouseEvent( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); /***************************************************************************** @@ -59,29 +64,31 @@ static int SendEvents( vlc_object_t *, char const *, #define TYPE_TEXT N_("Transform type") #define TYPE_LONGTEXT N_("One of '90', '180', '270', 'hflip' and 'vflip'") -static const char *type_list[] = { "90", "180", "270", "hflip", "vflip" }; -static const char *type_list_text[] = { N_("Rotate by 90 degrees"), +static const char *const type_list[] = { "90", "180", "270", "hflip", "vflip" }; +static const char *const type_list_text[] = { N_("Rotate by 90 degrees"), N_("Rotate by 180 degrees"), N_("Rotate by 270 degrees"), N_("Flip horizontally"), N_("Flip vertically") }; +#define TRANSFORM_HELP N_("Rotate or flip the video") #define CFG_PREFIX "transform-" -vlc_module_begin(); - set_description( _("Video transformation filter") ); - set_shortname( _("Transformation")); - set_capability( "video filter", 0 ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); +vlc_module_begin () + set_description( N_("Video transformation filter") ) + set_shortname( N_("Transformation")) + set_help(TRANSFORM_HELP) + set_capability( "video filter", 0 ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) add_string( CFG_PREFIX "type", "90", NULL, - TYPE_TEXT, TYPE_LONGTEXT, VLC_FALSE); - change_string_list( type_list, type_list_text, 0); + TYPE_TEXT, TYPE_LONGTEXT, false) + change_string_list( type_list, type_list_text, 0) - add_shortcut( "transform" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + add_shortcut( "transform" ) + set_callbacks( Create, Destroy ) +vlc_module_end () -static const char *ppsz_filter_options[] = { +static const char *const ppsz_filter_options[] = { "type", NULL }; @@ -94,7 +101,7 @@ static const char *ppsz_filter_options[] = { struct vout_sys_t { int i_mode; - vlc_bool_t b_rotation; + bool b_rotation; vout_thread_t *p_vout; void (*pf_filter)( vout_thread_t *, const picture_t *, picture_t * ); @@ -121,10 +128,7 @@ static int Create( vlc_object_t *p_this ) /* 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->pf_init = Init; p_vout->pf_end = End; @@ -137,15 +141,20 @@ static int Create( vlc_object_t *p_this ) p_vout->p_cfg ); /* Look what method was requested */ - psz_method = var_CreateGetNonEmptyString( p_vout, "transform-type" ); + psz_method = var_CreateGetNonEmptyStringCommand( p_vout, "transform-type" ); switch( p_vout->fmt_in.i_chroma ) { - CASE_PLANAR_YUV - case VLC_FOURCC('G','R','E','Y'): + CASE_PLANAR_YUV_SQUARE + case VLC_CODEC_GREY: p_vout->p_sys->pf_filter = FilterPlanar; break; + case VLC_CODEC_I422: + case VLC_CODEC_J422: + p_vout->p_sys->pf_filter = FilterI422; + break; + CASE_PACKED_YUV_422 p_vout->p_sys->pf_filter = FilterYUYV; break; @@ -208,8 +217,6 @@ static int Create( vlc_object_t *p_this ) *****************************************************************************/ static int Init( vout_thread_t *p_vout ) { - int i_index; - picture_t *p_pic; video_format_t fmt; I_OUTPUTPICTURES = 0; @@ -236,9 +243,6 @@ static int Init( vout_thread_t *p_vout ) fmt.i_visible_height = p_vout->fmt_out.i_visible_width; fmt.i_y_offset = p_vout->fmt_out.i_x_offset; - fmt.i_aspect = VOUT_ASPECT_FACTOR * - (uint64_t)VOUT_ASPECT_FACTOR / fmt.i_aspect; - fmt.i_sar_num = p_vout->fmt_out.i_sar_den; fmt.i_sar_den = p_vout->fmt_out.i_sar_num; } @@ -252,11 +256,9 @@ static int Init( vout_thread_t *p_vout ) return VLC_EGENERIC; } - ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); + vout_filter_AllocateDirectBuffers( p_vout, VOUT_MAX_PICTURES ); - ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - - ADD_PARENT_CALLBACKS( SendEventsToChild ); + vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, MouseEvent ); return VLC_SUCCESS; } @@ -266,14 +268,12 @@ static int Init( vout_thread_t *p_vout ) *****************************************************************************/ static void End( vout_thread_t *p_vout ) { - int i_index; + vout_sys_t *p_sys = p_vout->p_sys; - /* Free the fake output buffers we allocated */ - for( i_index = I_OUTPUTPICTURES ; i_index ; ) - { - i_index--; - free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); - } + vout_filter_DelChild( p_vout, p_sys->p_vout, MouseEvent ); + vout_CloseAndRelease( p_sys->p_vout ); + + vout_filter_ReleaseDirectBuffers( p_vout ); } /***************************************************************************** @@ -285,15 +285,6 @@ static void Destroy( vlc_object_t *p_this ) { 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 ); - } - - DEL_PARENT_CALLBACKS( SendEventsToChild ); - free( p_vout->p_sys ); } @@ -312,14 +303,14 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) while( ( p_outpic = vout_CreatePicture( p_vout->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 ); + p_outpic->date = p_pic->date; vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic ); p_vout->p_sys->pf_filter( p_vout, p_pic, p_outpic ); @@ -329,75 +320,51 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic ); } -/***************************************************************************** - * 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_vout ) +/** + * Forward mouse event with proper conversion. + */ +static int MouseEvent( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t val, void *p_data ) { - vout_thread_t *p_vout = (vout_thread_t *)_p_vout; - vlc_value_t sentval = newval; + vout_thread_t *p_vout = p_data; + VLC_UNUSED(p_this); VLC_UNUSED(oldval); - /* Translate the mouse coordinates */ - if( !strcmp( psz_var, "mouse-x" ) ) + /* Translate the mouse coordinates + * FIXME missing lock */ + if( !strcmp( psz_var, "mouse-button-down" ) ) + return var_SetChecked( p_vout, psz_var, VLC_VAR_INTEGER, val ); + + int x = val.coords.x, y = val.coords.y; + + switch( p_vout->p_sys->i_mode ) { - switch( p_vout->p_sys->i_mode ) - { - case TRANSFORM_MODE_270: - sentval.i_int = p_vout->p_sys->p_vout->output.i_width - - sentval.i_int; case TRANSFORM_MODE_90: - var_Set( p_vout, "mouse-y", sentval ); - return VLC_SUCCESS; + x = p_vout->p_sys->p_vout->output.i_height - val.coords.y; + y = val.coords.x; + break; case TRANSFORM_MODE_180: - case TRANSFORM_MODE_HFLIP: - sentval.i_int = p_vout->p_sys->p_vout->output.i_width - - sentval.i_int; + x = p_vout->p_sys->p_vout->output.i_width - val.coords.x; + y = p_vout->p_sys->p_vout->output.i_height - val.coords.y; break; - case TRANSFORM_MODE_VFLIP: - default: - break; - } - } - else if( !strcmp( psz_var, "mouse-y" ) ) - { - switch( p_vout->p_sys->i_mode ) - { - case TRANSFORM_MODE_90: - sentval.i_int = p_vout->p_sys->p_vout->output.i_height - - sentval.i_int; case TRANSFORM_MODE_270: - var_Set( p_vout, "mouse-x", sentval ); - return VLC_SUCCESS; + x = val.coords.y; + y = p_vout->p_sys->p_vout->output.i_width - val.coords.x; + break; + + case TRANSFORM_MODE_HFLIP: + x = p_vout->p_sys->p_vout->output.i_width - val.coords.x; + break; - case TRANSFORM_MODE_180: case TRANSFORM_MODE_VFLIP: - sentval.i_int = p_vout->p_sys->p_vout->output.i_height - - sentval.i_int; + y = p_vout->p_sys->p_vout->output.i_height - val.coords.y; break; - case TRANSFORM_MODE_HFLIP: default: break; - } } - - var_Set( p_vout, psz_var, sentval ); - - return VLC_SUCCESS; -} - -/***************************************************************************** - * 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 ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - var_Set( p_vout->p_sys->p_vout, psz_var, newval ); - return VLC_SUCCESS; + return var_SetCoords( p_vout, psz_var, x, y ); } static void FilterPlanar( vout_thread_t *p_vout, @@ -497,7 +464,7 @@ static void FilterPlanar( vout_thread_t *p_vout, } break; - case TRANSFORM_MODE_HFLIP: + case TRANSFORM_MODE_VFLIP: for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) { uint8_t *p_in = p_pic->p[i_index].p_pixels; @@ -509,14 +476,14 @@ static void FilterPlanar( vout_thread_t *p_vout, for( ; p_in < p_in_end ; ) { p_in_end -= p_pic->p[i_index].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in_end, - p_pic->p[i_index].i_visible_pitch ); - p_out += p_pic->p[i_index].i_pitch; + vlc_memcpy( p_out, p_in_end, + p_pic->p[i_index].i_visible_pitch ); + p_out += p_outpic->p[i_index].i_pitch; } } break; - case TRANSFORM_MODE_VFLIP: + case TRANSFORM_MODE_HFLIP: for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) { uint8_t *p_in = p_pic->p[i_index].p_pixels; @@ -536,6 +503,158 @@ static void FilterPlanar( vout_thread_t *p_vout, } p_in += p_pic->p[i_index].i_pitch; + p_out += p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; + } + } + break; + + default: + break; + } +} + +static void FilterI422( vout_thread_t *p_vout, + const picture_t *p_pic, picture_t *p_outpic ) +{ + int i_index; + switch( p_vout->p_sys->i_mode ) + { + case TRANSFORM_MODE_180: + case TRANSFORM_MODE_HFLIP: + case TRANSFORM_MODE_VFLIP: + /* Fall back on the default implementation */ + FilterPlanar( p_vout, p_pic, p_outpic ); + return; + + case TRANSFORM_MODE_90: + for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) + { + int i_pitch = p_pic->p[i_index].i_pitch; + + uint8_t *p_in = p_pic->p[i_index].p_pixels; + + uint8_t *p_out = p_outpic->p[i_index].p_pixels; + uint8_t *p_out_end = p_out + + p_outpic->p[i_index].i_visible_lines * + p_outpic->p[i_index].i_pitch; + + if( i_index == 0 ) + { + for( ; p_out < p_out_end ; ) + { + uint8_t *p_line_end; + + p_out_end -= p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; + p_line_end = p_in + p_pic->p[i_index].i_visible_lines * + i_pitch; + + for( ; p_in < p_line_end ; ) + { + p_line_end -= i_pitch; + *(--p_out_end) = *p_line_end; + } + + p_in++; + } + } + else /* i_index == 1 or 2 */ + { + for( ; p_out < p_out_end ; ) + { + uint8_t *p_line_end, *p_out_end2; + + p_out_end -= p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; + p_out_end2 = p_out_end - p_outpic->p[i_index].i_pitch; + p_line_end = p_in + p_pic->p[i_index].i_visible_lines * + i_pitch; + + for( ; p_in < p_line_end ; ) + { + uint8_t p1, p2; + + p_line_end -= i_pitch; + p1 = *p_line_end; + p_line_end -= i_pitch; + p2 = *p_line_end; + + /* Trick for (x+y)/2 without overflow, based on + * x + y == (x ^ y) + 2 * (x & y) */ + *(--p_out_end) = (p1 & p2) + ((p1 ^ p2) / 2); + *(--p_out_end2) = (p1 & p2) + ((p1 ^ p2) / 2); + } + + p_out_end = p_out_end2; + p_in++; + } + } + } + break; + + case TRANSFORM_MODE_270: + for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) + { + int i_pitch = p_pic->p[i_index].i_pitch; + + uint8_t *p_in = p_pic->p[i_index].p_pixels; + + uint8_t *p_out = p_outpic->p[i_index].p_pixels; + uint8_t *p_out_end = p_out + + p_outpic->p[i_index].i_visible_lines * + p_outpic->p[i_index].i_pitch; + + if( i_index == 0 ) + { + for( ; p_out < p_out_end ; ) + { + uint8_t *p_in_end; + + p_in_end = p_in + p_pic->p[i_index].i_visible_lines * + i_pitch; + + for( ; p_in < p_in_end ; ) + { + p_in_end -= i_pitch; + *p_out++ = *p_in_end; + } + + p_out += p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; + p_in++; + } + } + else /* i_index == 1 or 2 */ + { + for( ; p_out < p_out_end ; ) + { + uint8_t *p_in_end, *p_out2; + + p_in_end = p_in + p_pic->p[i_index].i_visible_lines * + i_pitch; + p_out2 = p_out + p_outpic->p[i_index].i_pitch; + + for( ; p_in < p_in_end ; ) + { + uint8_t p1, p2; + + p_in_end -= i_pitch; + p1 = *p_in_end; + p_in_end -= i_pitch; + p2 = *p_in_end; + + /* Trick for (x+y)/2 without overflow, based on + * x + y == (x ^ y) + 2 * (x & y) */ + *p_out++ = (p1 & p2) + ((p1 ^ p2) / 2); + *p_out2++ = (p1 & p2) + ((p1 ^ p2) / 2); + } + + p_out2 += p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; + p_out = p_out2; + p_in++; + } } } break; @@ -556,6 +675,11 @@ static void FilterYUYV( vout_thread_t *p_vout, switch( p_vout->p_sys->i_mode ) { + case TRANSFORM_MODE_VFLIP: + /* Fall back on the default implementation */ + FilterPlanar( p_vout, p_pic, p_outpic ); + return; + case TRANSFORM_MODE_90: for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) { @@ -679,25 +803,6 @@ static void FilterYUYV( vout_thread_t *p_vout, break; case TRANSFORM_MODE_HFLIP: - for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) - { - uint8_t *p_in = p_pic->p[i_index].p_pixels; - uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines - * p_pic->p[i_index].i_pitch; - - uint8_t *p_out = p_outpic->p[i_index].p_pixels; - - for( ; p_in < p_in_end ; ) - { - p_in_end -= p_pic->p[i_index].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in_end, - p_pic->p[i_index].i_visible_pitch ); - p_out += p_pic->p[i_index].i_pitch; - } - } - break; - - case TRANSFORM_MODE_VFLIP: for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) { uint8_t *p_in = p_pic->p[i_index].p_pixels; @@ -722,6 +827,8 @@ static void FilterYUYV( vout_thread_t *p_vout, } p_in += p_pic->p[i_index].i_pitch; + p_out += p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; } } break;