/*****************************************************************************
* 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/decoder.h>
+#include <vlc_plugin.h>
+#include <vlc_vout.h>
#include "vlc_filter.h"
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("Wave video filter") );
+ set_description( N_("Wave video filter") );
set_shortname( N_( "Wave" ));
set_capability( "video filter2", 0 );
set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+ set_subcategory( SUBCAT_VIDEO_VFILTER );
add_shortcut( "wave" );
set_callbacks( Create, Destroy );
for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
{
- int i_line, i_num_lines, i_offset;
+ int i_line, i_num_lines, i_visible_pitch, i_pixel_pitch, i_offset,
+ i_visible_pixels;
uint8_t black_pixel;
uint8_t *p_in, *p_out;
p_out = p_outpic->p[i_index].p_pixels;
i_num_lines = p_pic->p[i_index].i_visible_lines;
+ i_visible_pitch = p_pic->p[i_index].i_visible_pitch;
+ i_pixel_pitch = p_pic->p[i_index].i_pixel_pitch;
+ i_visible_pixels = i_visible_pitch/i_pixel_pitch;
black_pixel = ( i_index == Y_PLANE ) ? 0x00 : 0x80;
for( i_line = 0 ; i_line < i_num_lines ; i_line++ )
{
/* Calculate today's offset, don't go above 1/20th of the screen */
- i_offset = (int)( (double)(p_pic->p[i_index].i_visible_pitch)
+ i_offset = (int)( (double)(i_visible_pixels)
* sin( f_angle + 10.0 * (double)i_line
/ (double)i_num_lines )
- / 20.0 );
+ / 20.0 )*i_pixel_pitch;
if( i_offset )
{
if( i_offset < 0 )
{
- p_filter->p_vlc->pf_memcpy( p_out, p_in - i_offset,
- p_pic->p[i_index].i_visible_pitch + i_offset );
+ vlc_memcpy( p_out, p_in - i_offset,
+ i_visible_pitch + i_offset );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
- memset( p_out + i_offset, black_pixel, -i_offset );
+ vlc_memset( p_out + i_offset, black_pixel, -i_offset );
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out + i_offset, p_in,
- p_pic->p[i_index].i_visible_pitch - i_offset );
- memset( p_out, black_pixel, i_offset );
+ vlc_memcpy( p_out + i_offset, p_in,
+ i_visible_pitch - i_offset );
+ vlc_memset( p_out, black_pixel, i_offset );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
}
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out, p_in,
- p_pic->p[i_index].i_visible_pitch );
+ vlc_memcpy( p_out, p_in, i_visible_pitch );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
}