* Preamble
*****************************************************************************/
-#include <math.h> /* sin(), cos() */
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <math.h> /* sin(), cos() */
+
+#include <vlc_common.h>
#include <vlc_plugin.h>
-#include "vlc_filter.h"
-#include "vlc_image.h"
+#include <vlc_filter.h>
+#include <vlc_image.h>
+#include "filter_picture.h"
/*****************************************************************************
* Local prototypes
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( N_("Psychedelic video filter") );
- set_shortname( N_( "Psychedelic" ));
- set_capability( "video filter2", 0 );
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+ set_description( N_("Psychedelic video filter") )
+ set_shortname( N_( "Psychedelic" ))
+ set_capability( "video filter2", 0 )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VFILTER )
- add_shortcut( "psychedelic" );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+ add_shortcut( "psychedelic" )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
/*****************************************************************************
- * vout_sys_t: Distort video output method descriptor
+ * filter_sys_t: Distort video output method descriptor
*****************************************************************************
* This structure is part of the video output thread descriptor.
* It describes the Distort specific properties of an output thread.
/* 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_filter->pf_video_filter = Filter;
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;
}
}
/* luminance */
- vlc_memcpy( p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels,
- p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch );
+ plane_CopyPixels( &p_outpic->p[Y_PLANE], &p_pic->p[Y_PLANE] );
/* image visualization */
fmt_out = p_filter->fmt_out.video;
if( p_converted )
{
#define copyimage( plane, b ) \
- for( y=0; y<p_converted->p[plane].i_visible_lines; y++) { \
- for( x=0; x<p_converted->p[plane].i_visible_pitch; x++) { \
- int nx, ny; \
- if( p_filter->p_sys->yinc == 1 ) \
- ny= y; \
- else \
- ny = p_converted->p[plane].i_visible_lines-y; \
- if( p_filter->p_sys->xinc == 1 ) \
- nx = x; \
- else \
- nx = p_converted->p[plane].i_visible_pitch-x; \
- p_outpic->p[plane].p_pixels[(p_filter->p_sys->x*b+nx)+(ny+p_filter->p_sys->y*b)*p_outpic->p[plane].i_pitch ] = p_converted->p[plane].p_pixels[y*p_converted->p[plane].i_pitch+x]; \
- } }
- copyimage( Y_PLANE, 2 );
- copyimage( U_PLANE, 1 );
- copyimage( V_PLANE, 1 );
+ for( y=0; y<p_converted->p[plane].i_visible_lines; y++) { \
+ for( x=0; x<p_converted->p[plane].i_visible_pitch; x++) { \
+ int nx, ny; \
+ if( p_filter->p_sys->yinc == 1 ) \
+ ny= y; \
+ else \
+ ny = p_converted->p[plane].i_visible_lines-y; \
+ if( p_filter->p_sys->xinc == 1 ) \
+ nx = x; \
+ else \
+ nx = p_converted->p[plane].i_visible_pitch-x; \
+ p_outpic->p[plane].p_pixels[(p_filter->p_sys->x*b+nx)+(ny+p_filter->p_sys->y*b)*p_outpic->p[plane].i_pitch ] = p_converted->p[plane].p_pixels[y*p_converted->p[plane].i_pitch+x]; \
+ } }
+ copyimage( Y_PLANE, 2 );
+ copyimage( U_PLANE, 1 );
+ copyimage( V_PLANE, 1 );
#undef copyimage
- p_converted->pf_release( p_converted );
+ picture_Release( p_converted );
}
else
{
p_filter->p_sys->v += 1;
}
- 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;
-
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
-
- return p_outpic;
+ return CopyInfoAndRelease( p_outpic, p_pic );
}