X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_filter%2Ftransform.c;h=5e86fc0cfbc7af34ece86c3e3903340023422ba9;hb=cbad172ff6c98bacf969be6e63135fe2185a212c;hp=5dc45714e3108176f37e1a9ea37e0881a4ac5339;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c index 5dc45714e3..5e86fc0cfb 100644 --- a/modules/video_filter/transform.c +++ b/modules/video_filter/transform.c @@ -2,9 +2,11 @@ * transform.c : transform image module for vlc ***************************************************************************** * Copyright (C) 2000-2006 the VideoLAN team + * Copyright (C) 2010 Laurent Aimar * $Id$ * * Authors: Samuel Hocevar + * Laurent Aimar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,276 +26,402 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include -#include "filter_common.h" - -#define TRANSFORM_MODE_HFLIP 1 -#define TRANSFORM_MODE_VFLIP 2 -#define TRANSFORM_MODE_90 3 -#define TRANSFORM_MODE_180 4 -#define TRANSFORM_MODE_270 5 +#include +#include +#include /***************************************************************************** - * 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 * ); +static int Open (vlc_object_t *); +static void Close(vlc_object_t *); -static int SendEvents( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); +#define CFG_PREFIX "transform-" -/***************************************************************************** - * Module descriptor - *****************************************************************************/ #define TYPE_TEXT N_("Transform type") #define TYPE_LONGTEXT N_("One of '90', '180', '270', 'hflip' and 'vflip'") - -static char *type_list[] = { "90", "180", "270", "hflip", "vflip" }; -static 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") }; -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(N_("Rotate or flip the video")) + set_capability("video filter2", 0) + set_category(CAT_VIDEO) + set_subcategory(SUBCAT_VIDEO_VFILTER) - add_string( "transform-type", "90", NULL, - TYPE_TEXT, TYPE_LONGTEXT, VLC_FALSE); - change_string_list( type_list, type_list_text, 0); + add_string(CFG_PREFIX "type", "90", 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(Open, Close) +vlc_module_end() /***************************************************************************** - * vout_sys_t: Transform video output method descriptor - ***************************************************************************** - * This structure is part of the video output thread descriptor. - * It describes the Transform specific properties of an output thread. + * Local prototypes *****************************************************************************/ -struct vout_sys_t +static void HFlip(int *sx, int *sy, int w, int h, int dx, int dy) { - int i_mode; - vlc_bool_t b_rotation; - vout_thread_t *p_vout; -}; - -/***************************************************************************** - * Control: control facility for the vout (forwards to child vout) - *****************************************************************************/ -static int Control( vout_thread_t *p_vout, int i_query, va_list args ) + VLC_UNUSED( h ); + *sx = w - 1 - dx; + *sy = dy; +} +static void VFlip(int *sx, int *sy, int w, int h, int dx, int dy) { - return vout_vaControl( p_vout->p_sys->p_vout, i_query, args ); + VLC_UNUSED( w ); + *sx = dx; + *sy = h - 1 - dy; } - -/***************************************************************************** - * Create: allocates Transform video thread output method - ***************************************************************************** - * This function allocates and initializes a Transform vout method. - *****************************************************************************/ -static int Create( vlc_object_t *p_this ) +static void R90(int *sx, int *sy, int w, int h, int dx, int dy) +{ + VLC_UNUSED( h ); + *sx = dy; + *sy = w - 1 - dx; +} +static void R180(int *sx, int *sy, int w, int h, int dx, int dy) { - vout_thread_t *p_vout = (vout_thread_t *)p_this; - char *psz_method; + *sx = w - dx; + *sy = h - dy; +} +static void R270(int *sx, int *sy, int w, int h, int dx, int dy) +{ + VLC_UNUSED( w ); + *sx = h - 1 - dy; + *sy = dx; +} +typedef void (*convert_t)(int *, int *, int, int, int, int); - /* 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; +static void Planar(plane_t *dst, const plane_t *src, convert_t f) +{ + for (int y = 0; y < dst->i_visible_lines; y++) { + for (int x = 0; x < dst->i_visible_pitch; x++) { + int sx, sy; + f(&sx, &sy, dst->i_visible_pitch, dst->i_visible_lines, x, y); + dst->p_pixels[y * dst->i_pitch + x] = src->p_pixels[sy * src->i_pitch + sx]; + } } +} - 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; +#define PLANAR(f) \ + static void Planar##f(plane_t *dst, const plane_t *src) { Planar(dst, src, f); } + +PLANAR(HFlip) +PLANAR(VFlip) +PLANAR(R90) +PLANAR(R180) +PLANAR(R270) + +typedef struct { + char name[8]; + bool is_rotated; + convert_t convert; + convert_t iconvert; + void (*planar)(plane_t *dst, const plane_t *src); +} transform_description_t; + +static const transform_description_t descriptions[] = { + { "90", true, R90, R270, PlanarR90, }, + { "180", false, R180, R180, PlanarR180, }, + { "270", true, R270, R90, PlanarR270, }, + { "hflip", false, HFlip, HFlip, PlanarHFlip, }, + { "vflip", false, VFlip, VFlip, PlanarVFlip, }, + + { "", false, NULL, NULL, NULL, } +}; - /* Look what method was requested */ - psz_method = config_GetPsz( p_vout, "transform-type" ); +struct filter_sys_t { + const transform_description_t *dsc; + const vlc_chroma_description_t *chroma; +}; - if( psz_method == NULL ) - { - msg_Err( p_vout, "configuration variable %s empty", "transform-type" ); - msg_Err( p_vout, "no valid transform mode provided, using '90'" ); - p_vout->p_sys->i_mode = TRANSFORM_MODE_90; - p_vout->p_sys->b_rotation = 1; +static picture_t *Filter(filter_t *filter, picture_t *src) +{ + filter_sys_t *sys = filter->p_sys; + + picture_t *dst = filter_NewPicture(filter); + if (!dst) { + picture_Release(src); + return NULL; } - else - { - if( !strcmp( psz_method, "hflip" ) ) - { - p_vout->p_sys->i_mode = TRANSFORM_MODE_HFLIP; - p_vout->p_sys->b_rotation = 0; - } - else if( !strcmp( psz_method, "vflip" ) ) - { - p_vout->p_sys->i_mode = TRANSFORM_MODE_VFLIP; - p_vout->p_sys->b_rotation = 0; - } - else if( !strcmp( psz_method, "90" ) ) - { - p_vout->p_sys->i_mode = TRANSFORM_MODE_90; - p_vout->p_sys->b_rotation = 1; - } - else if( !strcmp( psz_method, "180" ) ) - { - p_vout->p_sys->i_mode = TRANSFORM_MODE_180; - p_vout->p_sys->b_rotation = 0; - } - else if( !strcmp( psz_method, "270" ) ) - { - p_vout->p_sys->i_mode = TRANSFORM_MODE_270; - p_vout->p_sys->b_rotation = 1; - } - else - { - msg_Err( p_vout, "no valid transform mode provided, using '90'" ); - p_vout->p_sys->i_mode = TRANSFORM_MODE_90; - p_vout->p_sys->b_rotation = 1; - } - free( psz_method ); + const vlc_chroma_description_t *chroma = sys->chroma; + if (chroma->plane_count < 3) { + /* TODO */ + } else { + for (unsigned i = 0; i < chroma->plane_count; i++) + sys->dsc->planar(&dst->p[i], &src->p[i]); } - return VLC_SUCCESS; + picture_CopyProperties(dst, src); + picture_Release(src); + return dst; } -/***************************************************************************** - * Init: initialize Transform video thread output method - *****************************************************************************/ -static int Init( vout_thread_t *p_vout ) +static int Mouse(filter_t *filter, vlc_mouse_t *mouse, + const vlc_mouse_t *mold, const vlc_mouse_t *mnew) { - int i_index; - picture_t *p_pic; - video_format_t fmt = {0}; + VLC_UNUSED( mold ); - I_OUTPUTPICTURES = 0; + const video_format_t *fmt = &filter->fmt_out.video; + const transform_description_t *dsc = filter->p_sys->dsc; - /* 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; + *mouse = *mnew; + dsc->convert(&mouse->i_x, &mouse->i_y, + fmt->i_visible_width, fmt->i_visible_height, mouse->i_x, mouse->i_y); + return VLC_SUCCESS; +} - /* Try to open the real video output */ - msg_Dbg( p_vout, "spawning the real video output" ); +static int Open(vlc_object_t *object) +{ + filter_t *filter = (filter_t *)object; + const video_format_t *src = &filter->fmt_in.video; + video_format_t *dst = &filter->fmt_out.video; + + const vlc_chroma_description_t *chroma = + vlc_fourcc_GetChromaDescription(src->i_chroma); + if (!chroma || chroma->plane_count < 3) { + msg_Err(filter, "Unsupported chroma (%4.4s)", (char*)&src->i_chroma); + /* TODO support packed and rgb */ + return VLC_EGENERIC; + } - if( p_vout->p_sys->b_rotation ) - { - fmt.i_width = p_vout->fmt_out.i_height; - fmt.i_visible_width = p_vout->fmt_out.i_visible_height; - fmt.i_x_offset = p_vout->fmt_out.i_y_offset; + filter_sys_t *sys = malloc(sizeof(*sys)); + if (!sys) + return VLC_ENOMEM; - fmt.i_height = p_vout->fmt_out.i_width; - fmt.i_visible_height = p_vout->fmt_out.i_visible_width; - fmt.i_y_offset = p_vout->fmt_out.i_x_offset; + sys->chroma = chroma; - fmt.i_aspect = VOUT_ASPECT_FACTOR * - (uint64_t)VOUT_ASPECT_FACTOR / fmt.i_aspect; + char *type_name = var_InheritString(filter, CFG_PREFIX"type"); - fmt.i_sar_num = p_vout->fmt_out.i_sar_den; - fmt.i_sar_den = p_vout->fmt_out.i_sar_num; + sys->dsc = NULL; + for (int i = 0; !sys->dsc && *descriptions[i].name; i++) { + if (type_name && *type_name && !strcmp(descriptions[i].name, type_name)) + sys->dsc = &descriptions[i]; } - - 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" ); - return VLC_EGENERIC; + if (!sys->dsc) { + sys->dsc = &descriptions[0]; + msg_Warn(filter, "No valid transform mode provided, using '%s'", sys->dsc->name); } - ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); + free(type_name); - ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); + if (sys->dsc->is_rotated) { + if (!filter->b_allow_fmt_out_change) { + msg_Err(filter, "Format change is not allowed"); + free(sys); + return VLC_EGENERIC; + } - ADD_PARENT_CALLBACKS( SendEventsToChild ); + dst->i_width = src->i_height; + dst->i_visible_width = src->i_visible_height; + dst->i_height = src->i_width; + dst->i_visible_height = src->i_visible_width; + dst->i_sar_num = src->i_sar_den; + dst->i_sar_den = src->i_sar_num; + } + + dst->i_x_offset = INT_MAX; + dst->i_y_offset = INT_MAX; + for (int i = 0; i < 2; i++) { + int tx, ty; + sys->dsc->iconvert(&tx, &ty, + src->i_width, src->i_height, + src->i_x_offset + i * (src->i_visible_width - 1), + src->i_y_offset + i * (src->i_visible_height - 1)); + dst->i_x_offset = __MIN(dst->i_x_offset, (unsigned)(1 + tx)); + dst->i_y_offset = __MIN(dst->i_y_offset, (unsigned)(1 + ty)); + } + filter->p_sys = sys; + filter->pf_video_filter = Filter; + filter->pf_video_mouse = Mouse; return VLC_SUCCESS; } -/***************************************************************************** - * End: terminate Transform video thread output method - *****************************************************************************/ -static void End( vout_thread_t *p_vout ) +static void Close(vlc_object_t *object) { - int i_index; + filter_t *filter = (filter_t *)object; + filter_sys_t *sys = filter->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 ); - } + free(sys); } -/***************************************************************************** - * Destroy: destroy Transform video thread output method - ***************************************************************************** - * Terminate an output method created by TransformCreateOutputMethod - *****************************************************************************/ -static void Destroy( vlc_object_t *p_this ) +#if 0 +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_this; - - if( p_vout->p_sys->p_vout ) + int i_index; + switch( p_vout->p_sys->i_mode ) { - 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 ); - } + 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; - DEL_PARENT_CALLBACKS( SendEventsToChild ); + 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; - free( p_vout->p_sys ); + 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; + + default: + break; + } } -/***************************************************************************** - * Render: displays previously rendered output - ***************************************************************************** - * This function send the currently rendered image to Transform image, waits - * until it is displayed and switch the two rendering buffers, preparing next - * frame. - *****************************************************************************/ -static void Render( vout_thread_t *p_vout, picture_t *p_pic ) +static void FilterYUYV( vout_thread_t *p_vout, + const picture_t *p_pic, picture_t *p_outpic ) { - 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; - /* 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 ) + switch( p_vout->p_sys->i_mode ) { - if( p_vout->b_die || p_vout->b_error ) - { + case TRANSFORM_MODE_VFLIP: + /* Fall back on the default implementation */ + FilterPlanar( p_vout, p_pic, p_outpic ); return; - } - msleep( VOUT_OUTMEM_SLEEP ); - } - - vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date ); - vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic ); - switch( p_vout->p_sys->i_mode ) - { case TRANSFORM_MODE_90: for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) { @@ -306,6 +434,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) 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; @@ -318,10 +448,21 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) for( ; p_in < p_line_end ; ) { p_line_end -= i_pitch; - *(--p_out_end) = *p_line_end; + 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++; + p_in += 2; + + { + int a = i_offset; + i_offset = i_offset2; + i_offset2 = a; + } } } break; @@ -344,7 +485,12 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) for( ; p_line_start < p_in_end ; ) { - *p_out++ = *(--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 @@ -365,65 +511,66 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) 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; + 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[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++; - } - } - break; + - p_outpic->p[i_index].i_visible_pitch; + p_in += 2; - 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; + { + int a = i_offset; + i_offset = i_offset2; + i_offset2 = a; + } } } 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; 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 ; ) { - *p_out++ = *(--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; + p_out += p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; } } break; @@ -431,79 +578,5 @@ 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 ) -{ - 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 ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - var_Set( p_vout->p_sys->p_vout, psz_var, newval ); - return VLC_SUCCESS; } +#endif