X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Ftransform.c;h=dc880d2efc4d26464e9084986002ca1f13b81ce1;hb=9bc8ac74bdb378fe610efaff6420712140ae3e71;hp=1bcd2571151fd3247e679af40f3d5f1f5017ba30;hpb=f5bcfe6da7cce84abcb2fc9670126e7a3ec6edf0;p=vlc diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c index 1bcd257115..dc880d2efc 100644 --- a/modules/video_filter/transform.c +++ b/modules/video_filter/transform.c @@ -24,13 +24,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#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 #define TRANSFORM_MODE_VFLIP 2 @@ -48,6 +52,10 @@ static int Init ( vout_thread_t * ); 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 *, vlc_value_t, vlc_value_t, void * ); @@ -57,29 +65,29 @@ 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 CFG_PREFIX "transform-" vlc_module_begin(); - set_description( _("Video transformation filter") ); - set_shortname( _("Transformation")); + set_description( N_("Video transformation filter") ); + set_shortname( N_("Transformation")); 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); + TYPE_TEXT, TYPE_LONGTEXT, false); change_string_list( type_list, type_list_text, 0); 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 }; @@ -92,8 +100,10 @@ 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 * ); }; /***************************************************************************** @@ -117,10 +127,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; @@ -135,6 +142,28 @@ static int Create( vlc_object_t *p_this ) /* Look what method was requested */ psz_method = var_CreateGetNonEmptyString( p_vout, "transform-type" ); + switch( p_vout->fmt_in.i_chroma ) + { + CASE_PLANAR_YUV_SQUARE + case VLC_FOURCC('G','R','E','Y'): + p_vout->p_sys->pf_filter = FilterPlanar; + break; + + case VLC_FOURCC('I','4','2','2'): + case VLC_FOURCC('J','4','2','2'): + p_vout->p_sys->pf_filter = FilterI422; + break; + + CASE_PACKED_YUV_422 + p_vout->p_sys->pf_filter = FilterYUYV; + break; + + default: + msg_Err( p_vout, "Unsupported chroma" ); + free( p_vout->p_sys ); + return VLC_EGENERIC; + } + if( psz_method == NULL ) { msg_Err( p_vout, "configuration variable %s empty", "transform-type" ); @@ -189,9 +218,10 @@ static int Init( vout_thread_t *p_vout ) { int i_index; picture_t *p_pic; - video_format_t fmt = {0}; + 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; @@ -267,7 +297,7 @@ static void Destroy( vlc_object_t *p_this ) { 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 ); + vlc_object_release( p_vout->p_sys->p_vout ); } DEL_PARENT_CALLBACKS( SendEventsToChild ); @@ -285,13 +315,12 @@ static void Destroy( vlc_object_t *p_this ) static void Render( vout_thread_t *p_vout, picture_t *p_pic ) { picture_t *p_outpic; - int i_index; /* 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 ) { - if( p_vout->b_die || p_vout->b_error ) + if( !vlc_object_alive (p_vout) || p_vout->b_error ) { return; } @@ -301,6 +330,90 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, 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 ); + + vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic ); + + 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 ) +{ + VLC_UNUSED(p_this); VLC_UNUSED(oldval); + vout_thread_t *p_vout = (vout_thread_t *)_p_vout; + vlc_value_t sentval = newval; + + /* Translate the mouse coordinates */ + if( !strcmp( psz_var, "mouse-x" ) ) + { + 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; + + case TRANSFORM_MODE_180: + case TRANSFORM_MODE_HFLIP: + sentval.i_int = p_vout->p_sys->p_vout->output.i_width + - sentval.i_int; + 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; + + case TRANSFORM_MODE_180: + case TRANSFORM_MODE_VFLIP: + sentval.i_int = p_vout->p_sys->p_vout->output.i_height + - sentval.i_int; + 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 ) +{ + 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; +} + +static void FilterPlanar( 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_90: @@ -406,8 +519,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) 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 ); + vlc_memcpy( p_out, p_in_end, + p_pic->p[i_index].i_visible_pitch ); p_out += p_pic->p[i_index].i_pitch; } } @@ -418,14 +531,14 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) { 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; + * p_pic->p[i_index].i_pitch; uint8_t *p_out = p_outpic->p[i_index].p_pixels; for( ; p_in < p_in_end ; ) { uint8_t *p_line_end = p_in - + p_pic->p[i_index].i_visible_pitch; + + p_pic->p[i_index].i_visible_pitch; for( ; p_in < p_line_end ; ) { @@ -440,79 +553,326 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) default: break; } - - vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic ); - - 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 ) +static void FilterI422( vout_thread_t *p_vout, + const picture_t *p_pic, picture_t *p_outpic ) { - vout_thread_t *p_vout = (vout_thread_t *)_p_vout; - vlc_value_t sentval = newval; - - /* Translate the mouse coordinates */ - if( !strcmp( psz_var, "mouse-x" ) ) + int i_index; + 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; - case TRANSFORM_MODE_180: case TRANSFORM_MODE_HFLIP: - sentval.i_int = p_vout->p_sys->p_vout->output.i_width - - sentval.i_int; + 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; - case TRANSFORM_MODE_VFLIP: default: break; - } } - else if( !strcmp( psz_var, "mouse-y" ) ) +} + +static void FilterYUYV( vout_thread_t *p_vout, + const picture_t *p_pic, picture_t *p_outpic ) +{ + int i_index; + int i_y_offset, i_u_offset, i_v_offset; + if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset, + &i_u_offset, &i_v_offset ) != VLC_SUCCESS ) + return; + + switch( p_vout->p_sys->i_mode ) { - switch( p_vout->p_sys->i_mode ) - { + case TRANSFORM_MODE_HFLIP: + /* Fall back on the default implementation */ + FilterPlanar( p_vout, p_pic, p_outpic ); + return; + 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; + 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; + + int i_offset = i_u_offset; + int i_offset2 = i_v_offset; + 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 -= 4; + p_out_end[i_y_offset+2] = p_line_end[i_y_offset]; + p_out_end[i_u_offset] = p_line_end[i_offset]; + p_line_end -= i_pitch; + p_out_end[i_y_offset] = p_line_end[i_y_offset]; + p_out_end[i_v_offset] = p_line_end[i_offset2]; + } + + p_in += 2; + + { + int a = i_offset; + i_offset = i_offset2; + i_offset2 = a; + } + } + } + break; case TRANSFORM_MODE_180: - case TRANSFORM_MODE_VFLIP: - sentval.i_int = p_vout->p_sys->p_vout->output.i_height - - sentval.i_int; + 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 ; ) + { + uint8_t *p_line_start = p_in_end + - p_pic->p[i_index].i_pitch; + p_in_end -= p_pic->p[i_index].i_pitch + - p_pic->p[i_index].i_visible_pitch; + + for( ; p_line_start < p_in_end ; ) + { + p_in_end -= 4; + p_out[i_y_offset] = p_in_end[i_y_offset+2]; + p_out[i_u_offset] = p_in_end[i_u_offset]; + p_out[i_y_offset+2] = p_in_end[i_y_offset]; + p_out[i_v_offset] = p_in_end[i_v_offset]; + p_out += 4; + } + + p_out += p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; + } + } break; - case TRANSFORM_MODE_HFLIP: - default: + 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; + + int i_offset = i_u_offset; + int i_offset2 = i_v_offset; + 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[i_y_offset] = p_in_end[i_y_offset]; + p_out[i_u_offset] = p_in_end[i_offset]; + p_in_end -= i_pitch; + p_out[i_y_offset+2] = p_in_end[i_y_offset]; + p_out[i_v_offset] = p_in_end[i_offset2]; + p_out += 4; + } + + p_out += p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; + p_in += 2; + + { + int a = i_offset; + i_offset = i_offset2; + i_offset2 = a; + } + } + } break; - } - } - var_Set( p_vout, psz_var, sentval ); + 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; + uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines + * p_pic->p[i_index].i_pitch; - return VLC_SUCCESS; -} + uint8_t *p_out = p_outpic->p[i_index].p_pixels; -/***************************************************************************** - * 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; + for( ; p_in < p_in_end ; ) + { + uint8_t *p_line_end = p_in + + p_pic->p[i_index].i_visible_pitch; + + for( ; p_in < p_line_end ; ) + { + p_line_end -= 4; + p_out[i_y_offset] = p_line_end[i_y_offset+2]; + p_out[i_u_offset] = p_line_end[i_u_offset]; + p_out[i_y_offset+2] = p_line_end[i_y_offset]; + p_out[i_v_offset] = p_line_end[i_v_offset]; + p_out += 4; + } + + p_in += p_pic->p[i_index].i_pitch; + } + } + break; + + default: + break; + } }