/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
#include <math.h> /* sin(), cos() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_vout.h>
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
- add_integer_with_range( FILTER_PREFIX "angle", 0, 0, 359, NULL,
+ add_integer_with_range( FILTER_PREFIX "angle", 30, 0, 359, NULL,
ANGLE_TEXT, ANGLE_LONGTEXT, VLC_FALSE );
add_shortcut( "rotate" );
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')
+ )
+ {
+ /* 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) );
+ return VLC_EGENERIC;
+ }
+
+ if( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma )
+ {
+ msg_Err( p_filter, "Input and output chromas don't match" );
+ return VLC_EGENERIC;
+ }
+
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
p_sys->i_angle = var_CreateGetIntegerCommand( p_filter,
FILTER_PREFIX "angle" ) * 10;
- var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "deciangle" );
+ var_Create( p_filter, FILTER_PREFIX "deciangle",
+ VLC_VAR_INTEGER|VLC_VAR_ISCOMMAND );
var_AddCallback( p_filter, FILTER_PREFIX "angle", RotateCallback, p_sys );
- var_AddCallback( p_filter, FILTER_PREFIX "deciangle", PreciseRotateCallback, p_sys );
+ var_AddCallback( p_filter, FILTER_PREFIX "deciangle",
+ PreciseRotateCallback, p_sys );
cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
const int i_pitch = p_pic->p[i_plane].i_pitch;
const int i_hidden_pitch = i_pitch - i_visible_pitch;
+ const int i_aspect = ( i_visible_lines * p_pic->p[Y_PLANE].i_visible_pitch ) / ( p_pic->p[Y_PLANE].i_visible_lines * i_visible_pitch );
+ /* = 2 for U and V planes in YUV 4:2:2, = 1 otherwise */
+
const int i_line_center = i_visible_lines>>1;
const int i_col_center = i_visible_pitch>>1;
const uint8_t black_pixel = ( i_plane == Y_PLANE ) ? 0x00 : 0x80;
- const int i_line_next = i_cos-i_sin*i_visible_pitch;
- const int i_col_next = -i_sin-i_cos*i_visible_pitch;
- int i_line_orig0 = - i_cos * i_line_center
- - i_sin * i_col_center + (1<<11);
- int i_col_orig0 = i_sin * i_line_center
+ const int i_line_next = i_cos / i_aspect -i_sin*i_visible_pitch;
+ const int i_col_next = -i_sin / i_aspect -i_cos*i_visible_pitch;
+ int i_line_orig0 = ( - i_cos * i_line_center / i_aspect
+ - i_sin * i_col_center + (1<<11) );
+ int i_col_orig0 = i_sin * i_line_center / i_aspect
- i_cos * i_col_center + (1<<11);
for( ; p_outendline < p_outend;
p_out += i_hidden_pitch, p_outendline += i_pitch,
for( ; p_out < p_outendline;
p_out++, i_line_orig0 += i_sin, i_col_orig0 += i_cos )
{
- const int i_line_orig = (i_line_orig0>>12) + i_line_center;
+ const int i_line_orig = (i_line_orig0>>12)*i_aspect + i_line_center;
const int i_col_orig = (i_col_orig0>>12) + i_col_center;
- int i_line_percent = (i_line_orig0>>4) & 255;
- int i_col_percent = (i_col_orig0 >>4) & 255;
+ const uint8_t* p_orig_offset = p_in + i_line_orig * i_pitch
+ + i_col_orig;
+ const uint8_t i_line_percent = (i_line_orig0>>4) & 255;
+ const uint8_t i_col_percent = (i_col_orig0 >>4) & 255;
if( -1 <= i_line_orig && i_line_orig < i_visible_lines
&& -1 <= i_col_orig && i_col_orig < i_visible_pitch )
{
- uint8_t i_curpix = black_pixel;
- uint8_t i_colpix = black_pixel;
- uint8_t i_linpix = black_pixel;
- uint8_t i_nexpix = black_pixel;
- if( ( 0 <= i_line_orig ) && ( 0 <= i_col_orig ) )
- i_curpix = p_in[i_line_orig*i_pitch+i_col_orig];
- if( ( i_line_orig < i_visible_lines - 1)
- && ( i_col_orig >= 0 ) )
- {
- i_linpix=p_in[(i_line_orig+1)*i_pitch+i_col_orig];
-
- }
- if( ( i_col_orig < i_visible_pitch - 1)
- && ( i_line_orig >= 0 ) )
- {
- i_colpix=p_in[i_line_orig*i_pitch+i_col_orig+1];
- }
- if( ( i_line_orig < i_visible_lines - 1)
- && ( i_col_orig < i_visible_pitch - 1) )
- i_nexpix = p_in[(i_line_orig+1)*i_pitch+i_col_orig+1];
-
#define test 1
#undef test
#ifdef test
if( ( i_col_orig > i_visible_pitch/2 ) )
#endif
{
+ uint8_t i_curpix = black_pixel;
+ uint8_t i_colpix = black_pixel;
+ uint8_t i_linpix = black_pixel;
+ uint8_t i_nexpix = black_pixel;
+ if( ( 0 <= i_line_orig ) && ( 0 <= i_col_orig ) )
+ i_curpix = *p_orig_offset;
+ p_orig_offset++;
+
+ if( ( i_col_orig < i_visible_pitch - 1)
+ && ( i_line_orig >= 0 ) )
+ i_colpix = *p_orig_offset;
+
+ p_orig_offset+=i_pitch;
+ if( ( i_line_orig < i_visible_lines - 1)
+ && ( i_col_orig < i_visible_pitch - 1) )
+ i_nexpix = *p_orig_offset;
+
+ p_orig_offset--;
+ if( ( i_line_orig < i_visible_lines - 1)
+ && ( i_col_orig >= 0 ) )
+ i_linpix = *p_orig_offset;
+
unsigned int temp = 0;
temp+= i_curpix *
(256 - i_line_percent) * ( 256 - i_col_percent );
{ *p_out = black_pixel;
}
else
- *p_out = p_in[i_line_orig*i_pitch+i_col_orig];
+ *p_out = *p_orig_offset;
#endif
#undef test
}
}
/*****************************************************************************
- *
+ * Angle modification callbacks.
*****************************************************************************/
static int RotateCallback( 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(psz_var); VLC_UNUSED(oldval);
filter_sys_t *p_sys = (filter_sys_t *)p_data;
-
- if( !strcmp( psz_var, "rotate-angle" ) )
- {
- p_sys->i_angle = newval.i_int*10;
-
- cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
- }
+ p_sys->i_angle = newval.i_int*10;
+ cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
return VLC_SUCCESS;
}
+
static int PreciseRotateCallback( 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(psz_var); VLC_UNUSED(oldval);
filter_sys_t *p_sys = (filter_sys_t *)p_data;
-
- if( !strcmp( psz_var, "rotate-deciangle" ) )
- {
- p_sys->i_angle = newval.i_int;
- cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
- }
+ p_sys->i_angle = newval.i_int;
+ cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
return VLC_SUCCESS;
}
projects / vlc / blobdiff