X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Frotate.c;h=55b7c9fbb88f805cd1d85427e0996dfa742f2b07;hb=bf6e5c38d03322a50de112f53ed8ac0349951f3f;hp=d3c11697516297aa4fea818f3498f4d6bb9fb6f3;hpb=5e15258c9ef28558fe2abc941fc1527e02b04c21;p=vlc diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c index d3c1169751..55b7c9fbb8 100644 --- a/modules/video_filter/rotate.c +++ b/modules/video_filter/rotate.c @@ -1,7 +1,7 @@ /***************************************************************************** * rotate.c : video rotation filter ***************************************************************************** - * Copyright (C) 2000-2006 the VideoLAN team + * Copyright (C) 2000-2008 the VideoLAN team * $Id$ * * Authors: Antoine Cellerier @@ -25,17 +25,18 @@ * Preamble *****************************************************************************/ -#include /* sin(), cos() */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include /* sin(), cos() */ + +#include #include #include #include "vlc_filter.h" +#include "filter_picture.h" /***************************************************************************** * Local prototypes @@ -44,6 +45,7 @@ static int Create ( vlc_object_t * ); static void Destroy ( vlc_object_t * ); static picture_t *Filter( filter_t *, picture_t * ); +static picture_t *FilterPacked( filter_t *, picture_t * ); static int RotateCallback( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, @@ -104,34 +106,32 @@ static int Create( vlc_object_t *p_this ) filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys; - if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','Y','U','V') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','0') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2') - - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','2') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','2') - ) + if( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma ) { - /* We only want planar YUV 4:2:0 or 4:2:2 */ - msg_Err( p_filter, "Unsupported input chroma (%4s)", - (char*)&(p_filter->fmt_in.video.i_chroma) ); + msg_Err( p_filter, "Input and output chromas don't match" ); return VLC_EGENERIC; } - if( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma ) + switch( p_filter->fmt_in.video.i_chroma ) { - msg_Err( p_filter, "Input and output chromas don't match" ); - return VLC_EGENERIC; + CASE_PLANAR_YUV + p_filter->pf_video_filter = Filter; + break; + + CASE_PACKED_YUV_422 + p_filter->pf_video_filter = FilterPacked; + break; + + default: + msg_Err( p_filter, "Unsupported input chroma (%4s)", + (char*)&(p_filter->fmt_in.video.i_chroma) ); + return VLC_EGENERIC; } /* Allocate structure */ p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_filter->p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; - } p_sys = p_filter->p_sys; config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options, @@ -147,8 +147,6 @@ static int Create( vlc_object_t *p_this ) cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos ); - p_filter->pf_video_filter = Filter; - return VLC_SUCCESS; } @@ -174,12 +172,10 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) if( !p_pic ) return NULL; - p_outpic = p_filter->pf_vout_buffer_new( p_filter ); + p_outpic = filter_NewPicture( p_filter ); if( !p_outpic ) { - msg_Warn( p_filter, "can't get output picture" ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } @@ -282,16 +278,106 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } } - p_outpic->date = p_pic->date; - p_outpic->b_force = p_pic->b_force; - p_outpic->i_nb_fields = p_pic->i_nb_fields; - p_outpic->b_progressive = p_pic->b_progressive; - p_outpic->b_top_field_first = p_pic->b_top_field_first; + return CopyInfoAndRelease( p_outpic, p_pic ); +} - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); +/***************************************************************************** + * + *****************************************************************************/ +static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) +{ + picture_t *p_outpic; + filter_sys_t *p_sys = p_filter->p_sys; + const int i_sin = p_sys->i_sin, i_cos = p_sys->i_cos; + + if( !p_pic ) return NULL; + + int i_u_offset, i_v_offset, i_y_offset; + + if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset, + &i_u_offset, &i_v_offset ) != VLC_SUCCESS ) + { + msg_Warn( p_filter, "Unsupported input chroma (%4s)", + (char*)&(p_pic->format.i_chroma) ); + picture_Release( p_pic ); + return NULL; + } + + p_outpic = filter_NewPicture( p_filter ); + if( !p_outpic ) + { + picture_Release( p_pic ); + return NULL; + } + + const uint8_t *p_in = p_pic->p->p_pixels+i_y_offset; + const uint8_t *p_in_u = p_pic->p->p_pixels+i_u_offset; + const uint8_t *p_in_v = p_pic->p->p_pixels+i_v_offset; + + const int i_pitch = p_pic->p->i_pitch; + const int i_visible_pitch = p_pic->p->i_visible_pitch>>1; /* In fact it's i_visible_pixels */ + const int i_visible_lines = p_pic->p->i_visible_lines; + + uint8_t *p_out = p_outpic->p->p_pixels+i_y_offset; + uint8_t *p_out_u = p_outpic->p->p_pixels+i_u_offset; + uint8_t *p_out_v = p_outpic->p->p_pixels+i_v_offset; + + const int i_line_center = i_visible_lines>>1; + const int i_col_center = i_visible_pitch>>1; + + int i_col, i_line; + for( i_line = 0; i_line < i_visible_lines; i_line++ ) + { + for( i_col = 0; i_col < i_visible_pitch; i_col++ ) + { + int i_line_orig; + int i_col_orig; + /* Handle "1st Y", U and V */ + i_line_orig = i_line_center + + ( ( i_sin * ( i_col - i_col_center ) + + i_cos * ( i_line - i_line_center ) )>>12 ); + i_col_orig = i_col_center + + ( ( i_cos * ( i_col - i_col_center ) + - i_sin * ( i_line - i_line_center ) )>>12 ); + if( 0 <= i_col_orig && i_col_orig < i_visible_pitch + && 0 <= i_line_orig && i_line_orig < i_visible_lines ) + { + p_out[i_line*i_pitch+2*i_col] = p_in[i_line_orig*i_pitch+2*i_col_orig]; + i_col_orig /= 2; + p_out_u[i_line*i_pitch+2*i_col] = p_in_u[i_line_orig*i_pitch+4*i_col_orig]; + p_out_v[i_line*i_pitch+2*i_col] = p_in_v[i_line_orig*i_pitch+4*i_col_orig]; + } + else + { + p_out[i_line*i_pitch+2*i_col] = 0x00; + p_out_u[i_line*i_pitch+2*i_col] = 0x80; + p_out_v[i_line*i_pitch+2*i_col] = 0x80; + } + + /* Handle "2nd Y" */ + i_col++; + if( i_col >= i_visible_pitch ) + break; + + i_line_orig = i_line_center + + ( ( i_sin * ( i_col - i_col_center ) + + i_cos * ( i_line - i_line_center ) )>>12 ); + i_col_orig = i_col_center + + ( ( i_cos * ( i_col - i_col_center ) + - i_sin * ( i_line - i_line_center ) )>>12 ); + if( 0 <= i_col_orig && i_col_orig < i_visible_pitch + && 0 <= i_line_orig && i_line_orig < i_visible_lines ) + { + p_out[i_line*i_pitch+2*i_col] = p_in[i_line_orig*i_pitch+2*i_col_orig]; + } + else + { + p_out[i_line*i_pitch+2*i_col] = 0x00; + } + } + } - return p_outpic; + return CopyInfoAndRelease( p_outpic, p_pic ); } /*****************************************************************************