#endif
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#include "filter_common.h"
#define OVERLAP 2350
#ifdef OVERLAP
#include <math.h>
- // OS CODE DEPENDANT to get display dimensions
+ // OS CODE DEPENDENT to get display dimensions
#ifdef SYS_MINGW32
#include <windows.h>
#else
vlc_module_begin();
set_description( N_("Panoramix: wall with overlap video filter") );
- set_shortname( _("Panoramix" ));
+ set_shortname( N_("Panoramix" ));
set_capability( "video filter", 0 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
set_callbacks( Create, Destroy );
vlc_module_end();
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"cols", "rows", "offset-x", "bz-length", "bz-height", "attenuate",
"bz-begin", "bz-middle", "bz-end", "bz-middle-pos", "bz-gamma-red",
"bz-gamma-green", "bz-gamma-blue", "bz-blackcrush-red",
p_vout->p_sys->i_col = var_CreateGetInteger( p_vout, CFG_PREFIX "cols" );
p_vout->p_sys->i_row = var_CreateGetInteger( p_vout, CFG_PREFIX "rows" );
-// OS dependant code : Autodetect number of displays in wall
+// OS dependent code : Autodetect number of displays in wall
#ifdef SYS_MINGW32
if ((p_vout->p_sys->i_col < 0) || (p_vout->p_sys->i_row < 0) )
{
double d_halfLength_calculated;
int i_offset = 0;
-// OS DEPENDANT CODE to get display dimensions
+// OS DEPENDENT CODE to get display dimensions
if (b_fullscreen)
{
#ifdef SYS_MINGW32
while( p_in < p_in_end )
{
#ifndef OVERLAP
- p_vout->p_libvlc->pf_memcpy( p_out , p_in, i_copy_pitch);
+ vlc_memcpy( p_out, p_in, i_copy_pitch);
#else
if (p_vout->p_sys->i_col > 2)
{
length /= 2;
if (i_col == 0)
- p_vout->p_libvlc->pf_memcpy( p_out + length , p_in, i_copy_pitch - length);
+ vlc_memcpy( p_out + length , p_in, i_copy_pitch - length);
else if (i_col + 1 == p_vout->p_sys->i_col)
- p_vout->p_libvlc->pf_memcpy( p_out, p_in - length, i_copy_pitch - length);
- else
- p_vout->p_libvlc->pf_memcpy( p_out, p_in - length, i_copy_pitch);
+ vlc_memcpy( p_out, p_in - length, i_copy_pitch - length);
+ else
+ vlc_memcpy( p_out, p_in - length, i_copy_pitch);
if ((i_col == 0))
// black bar
length *= 2;
}
else
- p_vout->p_libvlc->pf_memcpy( p_out , p_in, i_copy_pitch);
+ vlc_memcpy( p_out , p_in, i_copy_pitch);
if (p_vout->p_sys->b_attenuate)
{
while( p_in < p_in_end )
{
#ifndef OVERLAP
- p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch);
+ vlc_memcpy( p_out, p_in, i_copy_pitch );
#else
if (p_vout->p_sys->i_col > 2)
{
// vertical blend
length /= 2;
if (i_col == 0)
- p_vout->p_libvlc->pf_memcpy( p_out + length, p_in, i_copy_pitch - length);
+ vlc_memcpy( p_out + length, p_in, i_copy_pitch - length);
else if (i_col + 1 == p_vout->p_sys->i_col)
- p_vout->p_libvlc->pf_memcpy( p_out, p_in - length, i_copy_pitch - length);
- else
- p_vout->p_libvlc->pf_memcpy( p_out, p_in - length, i_copy_pitch);
+ vlc_memcpy( p_out, p_in - length, i_copy_pitch - length);
+ else
+ vlc_memcpy( p_out, p_in - length, i_copy_pitch);
if ((i_col == 0))
// black bar
length *= 2;
}
else
- p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch);
+ vlc_memcpy( p_out, p_in, i_copy_pitch);
// vertical blend
// first blended zone
while( p_in < p_in_end )
{
#ifndef OVERLAP
- p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch);
+ vlc_memcpy( p_out, p_in, i_copy_pitch);
#else
- p_vout->p_libvlc->pf_memcpy( p_out + i_col * length, p_in + i_col * length, i_copy_pitch - length);
+ vlc_memcpy( p_out + i_col * length, p_in + i_col * length, i_copy_pitch - length);
p_out += LeftOffset;
p_in += LeftOffset;
#ifndef GAMMA