Skip to content

V
vlc-2-2
Commit 6db05717 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

* src/audio_output/input.c: forgot to free something 

* modules/visualisation/visual/* :
	visualization system. It supports multi-effects.
At the moment:
	-dummy (guess what ? it does nothing)
	-scope (adapted and fixed from sam's one)
	-random (displays random plots)
Todo:
	- spectrum analyser
	- movement effects (rotations, scrolls,...)
	- blur effect ?
parent 84c6ecb2
Hide whitespace changes
Inline Side-by-side
Showing with 666 additions and 2 deletions
configure.ac
View file @ 6db05717
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.62 2003/08/17 20:58:44 alexis Exp $
dnl $Id: configure.ac,v 1.63 2003/08/19 21:20:00 zorglub Exp $
AC_INIT(vlc,0.6.3-cvs)
......@@ -2820,6 +2820,16 @@ then
fi
fi
dnl
dnl Visualisation plugin
dnl
AC_ARG_ENABLE(visual,
[ --enable-visual visualisation plugin (default enabled)])
if test "${enable_visual}" != "no"
then
AX_ADD_PLUGINS([visual])
fi
dnl
dnl SLP access plugin
dnl
......@@ -3272,6 +3282,7 @@ AC_OUTPUT([
modules/visualization/Makefile
modules/visualization/scope/Makefile
modules/visualization/xosd/Makefile
modules/visualization/visual/Makefile
],[
chmod 0755 vlc-config
])
......
modules/visualization/visual/Modules.am 0 → 100644
View file @ 6db05717
SOURCES_visual = visual.c \
effects.c
modules/visualization/visual/effects.c 0 → 100644
View file @ 6db05717
/*****************************************************************************
* effects.c : Effects for the visualization system
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: effects.c,v 1.1 2003/08/19 21:20:00 zorglub Exp $
*
* Authors: Clment Stenac <zorglub@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include "visual.h"
#include <math.h>
/*****************************************************************************
* Argument list parsers *
*****************************************************************************/
int args_getint(char *psz_parse, char * name,const int defaut)
{
char *psz_eof;
int i_value;
if( psz_parse != NULL )
{
if(!strncmp( psz_parse, name, strlen(name) ) )
{
psz_parse += strlen( name );
psz_eof = strchr( psz_parse , ',' );
if( !psz_eof)
psz_eof = psz_parse + strlen(psz_parse);
if( psz_eof )
{
*psz_eof = '\0' ;
}
i_value = atoi(++psz_parse);
psz_parse= psz_eof;
psz_parse++;
return i_value;
}
}
return defaut;
}
char * args_getpsz(char *psz_parse, char * name,const char * defaut)
{
char *psz_eof;
char *psz_value;
if( psz_parse != NULL )
{
if(!strncmp( psz_parse, name, strlen(name) ) )
{
psz_parse += strlen( name );
psz_eof = strchr( psz_parse , ',' );
if( !psz_eof)
psz_eof = psz_parse + strlen(psz_parse);
if( psz_eof )
{
*psz_eof = '\0' ;
}
psz_value = strdup(++psz_parse);
psz_parse= psz_eof;
psz_parse++;
return psz_value;
}
}
return strdup(defaut);
}
/*****************************************************************************
* dummy_Run
*****************************************************************************/
int dummy_Run( visual_effect_t * p_effect, aout_instance_t *p_aout,
aout_buffer_t * p_buffer , picture_t * p_picture)
{
return 0;
}
/*****************************************************************************
* spectrum_Run: spectrum analyser
*****************************************************************************/
int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
aout_buffer_t * p_buffer , picture_t * p_picture)
{
return 0;
}
/*****************************************************************************
* scope_Run: scope effect
*****************************************************************************/
int scope_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
aout_buffer_t * p_buffer , picture_t * p_picture)
{
int i_index;
float *p_sample ;
u8 *ppp_area[2][3];
for( i_index = 0 ; i_index < 2 ; i_index++ )
{
int j;
for( j = 0 ; j < 3 ; j++ )
{
ppp_area[i_index][j] =
p_picture->p[j].p_pixels + i_index * p_picture->p[j].i_lines
/ 2 * p_picture->p[j].i_pitch;
}
}
for( i_index = 0, p_sample = (float *)p_buffer->p_buffer;
i_index < p_effect->i_width;
i_index++ )
{
u8 i_value;
/* Left channel */
i_value = (*p_sample++ +1) * 127;
*(ppp_area[0][0]
+ p_picture->p[0].i_pitch * i_index / p_effect->i_width
+ p_picture->p[0].i_lines * i_value / 512
* p_picture->p[0].i_pitch) = 0xbf;
*(ppp_area[0][1]
+ p_picture->p[1].i_pitch * i_index / p_effect->i_width
+ p_picture->p[1].i_lines * i_value / 512
* p_picture->p[1].i_pitch) = 0xff;
/* Right channel */
i_value = ( *p_sample++ +1 ) * 127;
*(ppp_area[1][0]
+ p_picture->p[0].i_pitch * i_index / p_effect->i_width
+ p_picture->p[0].i_lines * i_value / 512
* p_picture->p[0].i_pitch) = 0x9f;
*(ppp_area[1][2]
+ p_picture->p[2].i_pitch * i_index / p_effect->i_width
+ p_picture->p[2].i_lines * i_value / 512
* p_picture->p[2].i_pitch) = 0xdd;
}
return 0;
}
/*****************************************************************************
* random_Run: random plots display effect
*****************************************************************************/
int random_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
aout_buffer_t * p_buffer , picture_t * p_picture)
{
int i_nb_plots;
char *psz_parse= NULL;
int i , i_y , i_u , i_v;
int i_position;
srand((unsigned int)mdate());
if( p_effect->psz_args )
{
psz_parse = strdup( p_effect->psz_args );
while(1)
{
i_nb_plots = args_getint ( psz_parse , "nb" , 200 );
if(i_nb_plots) break;
if( *psz_parse )
psz_parse ++;
else
break;
}
}
else
{
i_nb_plots = 200;
}
for( i = 0 ; i < i_nb_plots ; i++ )
{
i_position = rand() % (p_effect->i_width * p_effect->i_height );
i_y = rand() % 256;
i_u = rand() % 256;
i_v = rand() % 256;
*(p_picture->p[0].p_pixels + i_position )= i_u;
}
return 0;
}
modules/visualization/visual/visual.c 0 → 100644
View file @ 6db05717
/*****************************************************************************
* visual.c : Visualisation system
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: visual.c,v 1.1 2003/08/19 21:20:00 zorglub Exp $
*
* Authors: Clment Stenac <zorglub@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include "visual.h"
#include <vlc/vlc.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
aout_buffer_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define ELIST_TEXT N_( "Effects list" )
#define ELIST_LONGTEXT N_( \
"A list of visual effect, separated by semi-commas." \
"Arguments may be passed to effects using syntax " \
" effect={arg=val,arg=val};effect={arg=val,arg=val},..." )
#define WIDTH_TEXT N_( "Video width" )
#define HEIGHT_LONGTEXT N_( \
"The width of the effects video window, in pixels." )
#define HEIGHT_TEXT N_( "Video width" )
#define WIDTH_LONGTEXT N_( \
"The width of the effects video window, in pixels." )
vlc_module_begin();
add_category_hint( N_("visualizer") , NULL , VLC_FALSE);
set_description( _("visualizer filter") );
add_string("effect-list", "dummy", NULL,
ELIST_TEXT, ELIST_LONGTEXT, VLC_TRUE );
add_integer("effect-width",VOUT_WIDTH,NULL,
WIDTH_TEXT, WIDTH_LONGTEXT, VLC_FALSE );
add_integer("effect-height" , VOUT_HEIGHT , NULL,
HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_FALSE );
set_capability( "audio filter", 0 );
set_callbacks( Open, Close );
add_shortcut( "visualizer");
vlc_module_end();
/*****************************************************************************
* Open: open the visualizer
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
aout_filter_t *p_filter = (aout_filter_t *)p_this;
char *psz_effects;
char *psz_eof; /* Used to parse effect list */
char *psz_eoa, *psz_boa; /* Used to parse arg lists */
vlc_bool_t b_end = VLC_FALSE;
visual_effect_t *p_current_effect = NULL;
if( (p_filter->input.i_format != VLC_FOURCC('f','l','3','2')
&& p_filter->input.i_format != VLC_FOURCC('f','i','3','2')) )
{
return -1;
}
p_filter->p_sys = malloc(sizeof(struct aout_filter_sys_t));
if ( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return -1;
}
p_filter->p_sys->i_height = config_GetInt( p_filter , "effect-height");
p_filter->p_sys->i_width = config_GetInt( p_filter , "effect-width");
/* Parse the effect list */
psz_effects = config_GetPsz( p_filter, "effect-list" );
msg_Dbg( p_filter , "Building list of effects" );
p_filter->p_sys->p_first_effect =
(visual_effect_t *)malloc( sizeof( visual_effect_t ) );
if( !p_filter->p_sys->p_first_effect )
{
msg_Err( p_filter, "Out of memory" );
return -1;
}
p_current_effect = p_filter->p_sys->p_first_effect;
p_current_effect->p_next = NULL;
#define SEARCH(name , function ) \
if(!strncmp( psz_effects , name, strlen(name) ) ) \
{ \
p_current_effect->p_next = \
(visual_effect_t *)malloc( sizeof( visual_effect_t ) ); \
if( !p_current_effect ) \
{ \
msg_Err( p_filter, "Out of memory" ); \
} \
p_current_effect = p_current_effect -> p_next; \
p_current_effect->pf_run = NULL; \
p_current_effect->p_next = NULL; \
p_current_effect->i_width = p_filter->p_sys->i_width; \
p_current_effect->i_height = p_filter->p_sys->i_height; \
p_current_effect->pf_run = function ; \
p_current_effect->psz_args = NULL; \
psz_boa = strchr( psz_effects, '{' ); \
if( psz_boa ) \
{ \
psz_eoa = strchr( psz_effects, '}'); \
if( ! psz_eoa ) \
{ \
msg_Err( p_filter, "Unable to parse effect list. Aborting"); \
return -1; \
} \
*psz_eoa = '\0'; \
p_current_effect->psz_args = strdup(++psz_boa); \
psz_effects = psz_eoa; \
} \
msg_Dbg(p_filter, "Adding filter: %s ( %s )",name, \
p_current_effect->psz_args); \
}
while(1)
{
psz_eof = strchr( psz_effects , ';' );
if( !psz_eof )
{
b_end = VLC_TRUE;
psz_eof = strchr( psz_effects,'\0');
}
if( psz_eof )
{
*psz_eof = '\0';
}
SEARCH("dummy",dummy_Run);
SEARCH("scope",scope_Run);
SEARCH("random",random_Run);
SEARCH("spectrum",spectrum_Run);
psz_effects = psz_eof;
psz_effects ++;
if( !* psz_effects || b_end == VLC_TRUE )
break;
}
p_filter->pf_do_work = DoWork;
p_filter->b_in_place= 0;
/* Open the video output */
p_filter->p_sys->p_vout =
vout_Create( p_filter, p_filter->p_sys->i_width,
p_filter->p_sys->i_height,
VLC_FOURCC('I','4','2','0'),
VOUT_ASPECT_FACTOR * p_filter->p_sys->i_width/
p_filter->p_sys->i_height );
if( p_filter->p_sys->p_vout == NULL )
{
msg_Err( p_filter, "no suitable vout module" );
if(p_filter->p_sys)
free( p_filter->p_sys );
return -1;
}
msg_Dbg(p_filter,"Visualizer initialized");
return 0 ;
}
/******************************************************************************
* SparseCopy: trivially downmix or upmix a buffer
******************************************************************************
* Pasted from trivial.c *
*****************************************************************************/
static void SparseCopy( s32 * p_dest, const s32 * p_src, size_t i_len,
int i_output_stride, int i_input_stride )
{
int i;
for ( i = i_len; i--; )
{
int j;
for ( j = 0; j < i_output_stride; j++ )
{
p_dest[j] = p_src[j % i_input_stride];
}
p_src += i_input_stride;
p_dest += i_output_stride;
}
}
/*****************************************************************************
* DoWork: convert a buffer
*****************************************************************************
* Audio part pasted from trivial.c
****************************************************************************/
static void DoWork( aout_instance_t *p_aout, aout_filter_t *p_filter,
aout_buffer_t *p_in_buf, aout_buffer_t *p_out_buf )
{
picture_t *p_outpic;
visual_effect_t *p_current_effect;
int i_input_nb = aout_FormatNbChannels( &p_filter->input );
int i_output_nb = aout_FormatNbChannels( &p_filter->output );
s32 * p_dest = (s32 *)p_out_buf->p_buffer;
s32 * p_src = (s32 *)p_in_buf->p_buffer;
int i_index;
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes * i_output_nb / i_input_nb;
/* First, output the sound */
if ( (p_filter->output.i_original_channels & AOUT_CHAN_PHYSMASK)
!= (p_filter->input.i_original_channels & AOUT_CHAN_PHYSMASK)
&& (p_filter->input.i_original_channels & AOUT_CHAN_PHYSMASK)
== (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
{
int i;
/* This is a bit special. */
if ( !(p_filter->output.i_original_channels & AOUT_CHAN_LEFT) )
{
p_src++;
}
if ( p_filter->output.i_physical_channels == AOUT_CHAN_CENTER )
{
/* Mono mode */
for ( i = p_in_buf->i_nb_samples; i--; )
{
*p_dest = *p_src;
p_dest++;
p_src += 2;
}
}
else
{
/* Fake-stereo mode */
for ( i = p_in_buf->i_nb_samples; i--; )
{
*p_dest = *p_src;
p_dest++;
*p_dest = *p_src;
p_dest++;
p_src += 2;
}
}
}
else if ( p_filter->output.i_original_channels
& AOUT_CHAN_REVERSESTEREO )
{
/* Reverse-stereo mode */
int i;
for ( i = p_in_buf->i_nb_samples; i--; )
{
*p_dest = p_src[1];
p_dest++;
*p_dest = p_src[0];
p_dest++;
p_src += 2;
}
}
else
{
SparseCopy( p_dest, p_src, p_in_buf->i_nb_samples, i_output_nb,
i_input_nb );
}
/* Ok, the sound is gone, we can think about our effects */
/* First, get a new picture */
while( ( p_outpic = vout_CreatePicture( p_filter->p_sys->p_vout,
VLC_FALSE, VLC_FALSE, 3 ) ) == NULL )
{
if(p_aout->b_die )
return;
msleep( VOUT_OUTMEM_SLEEP );
}
/* Blank the picture */
for( i_index = 0 ; i_index < p_outpic->i_planes ; i_index++ )
{
memset( p_outpic->p[i_index].p_pixels, i_index ? 0x80 : 0x00,
p_outpic->p[i_index].i_lines * p_outpic->p[i_index].i_pitch );
}
/* We can now call our visualization effects */
p_current_effect = p_filter->p_sys->p_first_effect;
while( p_current_effect )
{
/* FIXME: Find why it segfaults when we directly call
* p_current_effect->pf_run(....)
* (segfault in errno() ) */
if( p_current_effect->pf_run == dummy_Run )
{
dummy_Run(p_current_effect, p_aout, p_out_buf , p_outpic );
}
else if (p_current_effect->pf_run == scope_Run )
{
scope_Run(p_current_effect, p_aout, p_out_buf , p_outpic );
}
else if (p_current_effect->pf_run == random_Run )
{
random_Run(p_current_effect, p_aout, p_out_buf , p_outpic );
}
else if (p_current_effect->pf_run == spectrum_Run )
{
spectrum_Run(p_current_effect, p_aout, p_out_buf , p_outpic );
}
p_current_effect = p_current_effect->p_next;
}
vout_DatePicture ( p_filter->p_sys->p_vout, p_outpic,p_in_buf->start_date);
vout_DisplayPicture ( p_filter->p_sys->p_vout, p_outpic );
}
/*****************************************************************************
* Close: close the plugin
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
aout_filter_t * p_filter = (aout_filter_t *)p_this;
if( p_filter->p_sys->p_vout )
{
vlc_object_detach( p_filter->p_sys->p_vout) ;
vout_Destroy( p_filter->p_sys->p_vout );
}
if( p_filter->p_sys != NULL )
free( p_filter->p_sys);
}
modules/visualization/visual/visual.h 0 → 100644
View file @ 6db05717
/*****************************************************************************
* visual.h : Header for the visualisation system
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: visual.h,v 1.1 2003/08/19 21:20:00 zorglub Exp $
*
* Authors: Clment Stenac <zorglub@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */
#include <errno.h>
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include "audio_output.h"
#include "aout_internal.h"
/*****************************************************************************
* aout_filter_sys_t: visualizer audio filter method descriptor
*****************************************************************************
* This structure is part of the audio filter descriptor.
* It describes some visualizer specific variables.
*****************************************************************************/
typedef struct visual_effect_t
{
int (*pf_run)
(struct visual_effect_t * , aout_instance_t *,
aout_buffer_t *, picture_t *);
void * p_data; /* The effect stores whatever it wants here */
struct visual_effect_t * p_next;
int i_width;
int i_height;
char * psz_args;
} visual_effect_t ;
struct aout_filter_sys_t
{
vout_thread_t *p_vout;
visual_effect_t *p_first_effect;
int i_width;
int i_height;
};
/* Prototypes */
int scope_Run
(visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
int dummy_Run
(visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
int random_Run
(visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
int spectrum_Run
(visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
/* Default vout size */
#define VOUT_WIDTH 320
#define VOUT_HEIGHT 240
src/audio_output/input.c
View file @ 6db05717
......@@ -2,7 +2,7 @@
* input.c : internal management of input streams for the audio output
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: input.c,v 1.35 2003/08/18 13:16:43 zorglub Exp $
* $Id: input.c,v 1.36 2003/08/19 21:20:00 zorglub Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -272,6 +272,16 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
}
}
/* Free the list */
p_current_filter = p_first_filter;
while (p_current_filter)
{
user_filter_t * p_old_filter = p_current_filter;
p_current_filter = p_current_filter->p_next;
free(p_old_filter);
}
#if 0
/* Headphone filter add-ons. */
if ( b_use_headphone_filter == VLC_TRUE )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment