X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvisualization%2Fgoom.c;h=3d7070c906cf5f8fb2931b726b8a9f704e2326d3;hb=4551908a0ac5e7a83ce237a5d1e6637ffff394cd;hp=62495b27f5f4e2404da39c50d584cbbdf9e1746d;hpb=b442a2d053b40abbe70ad942c4870c33f502659e;p=vlc diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c index 62495b27f5..3d7070c906 100644 --- a/modules/visualization/goom.c +++ b/modules/visualization/goom.c @@ -1,10 +1,11 @@ /***************************************************************************** * goom.c: based on libgoom (see http://ios.free.fr/?page=projet&quoi=1) ***************************************************************************** - * Copyright (C) 2003 VideoLAN + * Copyright (C) 2003 the VideoLAN team * $Id$ * - * Authors: Laurent Aimar + * Authors: Laurent Aimar + * Gildas Bazin * * 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 @@ -18,7 +19,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -29,12 +30,24 @@ #include #include -#include -#include -#include -#include "aout_internal.h" - -#include "goom_core.h" +#include +#include +#include +#include + +#ifdef USE_GOOM_TREE +# ifdef OLD_GOOM +# include "goom_core.h" +# define PluginInfo void +# define goom_update(a,b,c,d,e,f) goom_update(b,c,d,e,f) +# define goom_close(a) goom_close() +# define goom_init(a,b) NULL; goom_init(a,b,0); goom_set_font(0,0,0) +# else +# include "goom.h" +# endif +#else +# include +#endif /***************************************************************************** * Module descriptor @@ -44,16 +57,27 @@ static void Close ( vlc_object_t * ); #define WIDTH_TEXT N_("Goom display width") #define HEIGHT_TEXT N_("Goom display height") -#define RES_LONGTEXT N_("Allows you to change the resolution of the " \ - "goom display (bigger resolution will be prettier but more CPU intensive)") +#define RES_LONGTEXT N_("This allows you to set the resolution of the " \ + "Goom display (bigger resolution will be prettier but more CPU intensive).") + +#define SPEED_TEXT N_("Goom animation speed") +#define SPEED_LONGTEXT N_("This allows you to set the animation speed " \ + "(between 1 and 10, defaults to 6).") + +#define MAX_SPEED 10 vlc_module_begin(); - set_description( _("goom effect") ); - set_capability( "audio filter", 0 ); + set_shortname( _("Goom")); + set_description( _("Goom effect") ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_VISUAL ); + set_capability( "visualization", 0 ); add_integer( "goom-width", 320, NULL, WIDTH_TEXT, RES_LONGTEXT, VLC_FALSE ); add_integer( "goom-height", 240, NULL, HEIGHT_TEXT, RES_LONGTEXT, VLC_FALSE ); + add_integer( "goom-speed", 6, NULL, + SPEED_TEXT, SPEED_LONGTEXT, VLC_FALSE ); set_callbacks( Open, Close ); add_shortcut( "goom" ); vlc_module_end(); @@ -61,6 +85,8 @@ vlc_module_end(); /***************************************************************************** * Local prototypes *****************************************************************************/ +#define MAX_BLOCKS 100 +#define GOOM_DELAY 400000 typedef struct { @@ -72,9 +98,15 @@ typedef struct vlc_mutex_t lock; vlc_cond_t wait; - mtime_t i_pts; - int i_samples; - int16_t samples[2][512]; + /* Audio properties */ + int i_channels; + + /* Audio samples queue */ + block_t *pp_blocks[MAX_BLOCKS]; + int i_blocks; + + audio_date_t date; + } goom_thread_t; typedef struct aout_filter_sys_t @@ -99,11 +131,12 @@ static int Open( vlc_object_t *p_this ) aout_filter_sys_t *p_sys; goom_thread_t *p_thread; vlc_value_t width, height; + video_format_t fmt = {0}; if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') ) { - msg_Warn( p_filter, "Bad input or output format" ); + msg_Warn( p_filter, "bad input or output format" ); return VLC_EGENERIC; } if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) @@ -128,10 +161,13 @@ static int Open( vlc_object_t *p_this ) var_Create( p_thread, "goom-height", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); var_Get( p_thread, "goom-height", &height ); - p_thread->p_vout = - vout_Request( p_filter, NULL, width.i_int, height.i_int, - VLC_FOURCC('R','V','3','2'), - VOUT_ASPECT_FACTOR * width.i_int/height.i_int ); + fmt.i_width = fmt.i_visible_width = width.i_int; + fmt.i_height = fmt.i_visible_height = height.i_int; + fmt.i_chroma = VLC_FOURCC('R','V','3','2'); + fmt.i_aspect = VOUT_ASPECT_FACTOR * width.i_int/height.i_int; + fmt.i_sar_num = fmt.i_sar_den = 1; + + p_thread->p_vout = vout_Request( p_filter, NULL, &fmt ); if( p_thread->p_vout == NULL ) { msg_Err( p_filter, "no suitable vout module" ); @@ -143,8 +179,11 @@ static int Open( vlc_object_t *p_this ) vlc_mutex_init( p_filter, &p_thread->lock ); vlc_cond_init( p_filter, &p_thread->wait ); - p_thread->i_samples = 0; - memset( &p_thread->samples, 0, 512*2*2 ); + p_thread->i_blocks = 0; + aout_DateInit( &p_thread->date, p_filter->output.i_rate ); + aout_DateSet( &p_thread->date, 0 ); + p_thread->i_channels = aout_FormatNbChannels( &p_filter->input ); + p_thread->psz_title = TitleGet( VLC_OBJECT( p_filter ) ); if( vlc_thread_create( p_thread, "Goom Update Thread", Thread, @@ -165,9 +204,40 @@ static int Open( vlc_object_t *p_this ) } /***************************************************************************** - * Play: play a sound samples buffer + * DoWork: process samples buffer ***************************************************************************** - * This function writes a buffer of i_length bytes in the socket + * This function queues the audio buffer to be processed by the goom thread + *****************************************************************************/ +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 ) +{ + aout_filter_sys_t *p_sys = p_filter->p_sys; + block_t *p_block; + + p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; + p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes; + + /* Queue sample */ + vlc_mutex_lock( &p_sys->p_thread->lock ); + if( p_sys->p_thread->i_blocks == MAX_BLOCKS ) + { + vlc_mutex_unlock( &p_sys->p_thread->lock ); + return; + } + + p_block = block_New( p_sys->p_thread, p_in_buf->i_nb_bytes ); + if( !p_block ) return; + memcpy( p_block->p_buffer, p_in_buf->p_buffer, p_in_buf->i_nb_bytes ); + p_block->i_pts = p_in_buf->start_date; + + p_sys->p_thread->pp_blocks[p_sys->p_thread->i_blocks++] = p_block; + + vlc_cond_signal( &p_sys->p_thread->wait ); + vlc_mutex_unlock( &p_sys->p_thread->lock ); +} + +/***************************************************************************** + * float to s16 conversion *****************************************************************************/ static inline int16_t FloatToInt16( float f ) { @@ -179,108 +249,129 @@ static inline int16_t FloatToInt16( float f ) return (int16_t)( f * 32768.0 ); } -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 ) +/***************************************************************************** + * Fill buffer + *****************************************************************************/ +static int FillBuffer( int16_t *p_data, int *pi_data, + audio_date_t *pi_date, audio_date_t *pi_date_end, + goom_thread_t *p_this ) { - aout_filter_sys_t *p_sys = p_filter->p_sys; - - int16_t *p_isample; - float *p_fsample = (float*)p_in_buf->p_buffer; - int i_samples = 0; - int i_channels = aout_FormatNbChannels( &p_filter->input ); + int i_samples = 0; + block_t *p_block; - p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; - p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes; - - /* copy samples */ - vlc_mutex_lock( &p_sys->p_thread->lock ); - p_sys->p_thread->i_pts = p_in_buf->start_date; - if( p_sys->p_thread->i_samples >= 512 ) + while( *pi_data < 512 ) { - p_sys->p_thread->i_samples = 0; - } - p_isample = &p_sys->p_thread->samples[0][p_sys->p_thread->i_samples]; + if( !p_this->i_blocks ) return VLC_EGENERIC; - i_samples = __MIN( 512 - p_sys->p_thread->i_samples, - (int)p_out_buf->i_nb_samples ); - p_sys->p_thread->i_samples += i_samples; + p_block = p_this->pp_blocks[0]; + i_samples = __MIN( 512 - *pi_data, p_block->i_buffer / + sizeof(float) / p_this->i_channels ); - while( i_samples > 0 ) - { - p_isample[0] = FloatToInt16( p_fsample[0] ); - if( i_channels > 1 ) + /* Date management */ + if( p_block->i_pts > 0 && + p_block->i_pts != aout_DateGet( pi_date_end ) ) { - p_isample[512] = FloatToInt16( p_fsample[1] ); + aout_DateSet( pi_date_end, p_block->i_pts ); } + p_block->i_pts = 0; - p_isample++; - p_fsample += i_channels; + aout_DateIncrement( pi_date_end, i_samples ); - i_samples--; - } - if( p_sys->p_thread->i_samples == 512 ) - { - vlc_cond_signal( &p_sys->p_thread->wait ); + while( i_samples > 0 ) + { + float *p_float = (float *)p_block->p_buffer; + + p_data[*pi_data] = FloatToInt16( p_float[0] ); + if( p_this->i_channels > 1 ) + p_data[512 + *pi_data] = FloatToInt16( p_float[1] ); + + (*pi_data)++; + p_block->p_buffer += (sizeof(float) * p_this->i_channels); + p_block->i_buffer -= (sizeof(float) * p_this->i_channels); + i_samples--; + } + + if( !p_block->i_buffer ) + { + block_Release( p_block ); + p_this->i_blocks--; + if( p_this->i_blocks ) + memmove( p_this->pp_blocks, p_this->pp_blocks + 1, + p_this->i_blocks * sizeof(block_t *) ); + } } - vlc_mutex_unlock( &p_sys->p_thread->lock ); + *pi_date = *pi_date_end; + *pi_data = 0; + return VLC_SUCCESS; } + /***************************************************************************** * Thread: *****************************************************************************/ static void Thread( vlc_object_t *p_this ) { goom_thread_t *p_thread = (goom_thread_t*)p_this; - vlc_value_t width, height; + vlc_value_t width, height, speed; + audio_date_t i_pts; + int16_t p_data[2][512]; + int i_data = 0, i_count = 0; + PluginInfo *p_plugin_info; var_Get( p_this, "goom-width", &width ); var_Get( p_this, "goom-height", &height ); - goom_init( width.i_int, height.i_int, 0 ); - goom_set_font( NULL, NULL, NULL ); + var_Create( p_thread, "goom-speed", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Get( p_thread, "goom-speed", &speed ); + speed.i_int = MAX_SPEED - speed.i_int; + if( speed.i_int < 0 ) speed.i_int = 0; + + p_plugin_info = goom_init( width.i_int, height.i_int ); while( !p_thread->b_die ) { - mtime_t i_pts; - int16_t data[2][512]; uint32_t *plane; picture_t *p_pic; /* goom_update is damn slow, so just copy data and release the lock */ vlc_mutex_lock( &p_thread->lock ); - vlc_cond_wait( &p_thread->wait, &p_thread->lock ); - i_pts = p_thread->i_pts; - memcpy( data, p_thread->samples, 512 * 2 * 2 ); + if( FillBuffer( (int16_t *)p_data, &i_data, &i_pts, + &p_thread->date, p_thread ) != VLC_SUCCESS ) + vlc_cond_wait( &p_thread->wait, &p_thread->lock ); vlc_mutex_unlock( &p_thread->lock ); - plane = goom_update( data, 0, 0.0, p_thread->psz_title, NULL ); + /* Speed selection */ + if( speed.i_int && (++i_count % (speed.i_int+1)) ) continue; + + /* Frame dropping if necessary */ + if( aout_DateGet( &i_pts ) + GOOM_DELAY <= mdate() ) continue; + + plane = goom_update( p_plugin_info, p_data, 0, 0.0, + p_thread->psz_title, NULL ); if( p_thread->psz_title ) { free( p_thread->psz_title ); p_thread->psz_title = NULL; } + while( !( p_pic = vout_CreatePicture( p_thread->p_vout, 0, 0, 0 ) ) && !p_thread->b_die ) { msleep( VOUT_OUTMEM_SLEEP ); } - if( p_pic == NULL ) - { - break; - } + if( p_pic == NULL ) break; memcpy( p_pic->p[0].p_pixels, plane, width.i_int * height.i_int * 4 ); - vout_DatePicture( p_thread->p_vout, p_pic, i_pts ); + vout_DatePicture( p_thread->p_vout, p_pic, + aout_DateGet( &i_pts ) + GOOM_DELAY ); vout_DisplayPicture( p_thread->p_vout, p_pic ); - } - goom_close(); + goom_close( p_plugin_info ); } - /***************************************************************************** * Close: close the plugin *****************************************************************************/ @@ -299,16 +390,21 @@ static void Close( vlc_object_t *p_this ) vlc_thread_join( p_sys->p_thread ); /* Free data */ - vout_Request( p_filter, p_sys->p_thread->p_vout, 0, 0, 0, 0 ); + vout_Request( p_filter, p_sys->p_thread->p_vout, 0 ); vlc_mutex_destroy( &p_sys->p_thread->lock ); vlc_cond_destroy( &p_sys->p_thread->wait ); vlc_object_detach( p_sys->p_thread ); + + while( p_sys->p_thread->i_blocks-- ) + { + block_Release( p_sys->p_thread->pp_blocks[p_sys->p_thread->i_blocks] ); + } + vlc_object_destroy( p_sys->p_thread ); free( p_sys ); } - static char *TitleGet( vlc_object_t *p_this ) { char *psz_title = NULL; @@ -317,19 +413,27 @@ static char *TitleGet( vlc_object_t *p_this ) if( p_input ) { - char *psz = strrchr( p_input->psz_source, '/' ); - - if( psz ) + if( input_GetItem(p_input)->p_meta->psz_title && + *input_GetItem(p_input)->p_meta->psz_title ) { - psz++; + psz_title = strdup( input_GetItem(p_input)->p_meta->psz_title ); } else { - psz = p_input->psz_source; - } - if( psz && *psz ) - { - psz_title = strdup( psz ); + char *psz = strrchr( input_GetItem(p_input)->psz_uri, '/' ); + + if( psz ) + { + psz++; + } + else + { + psz = input_GetItem(p_input)->psz_uri; + } + if( psz && *psz ) + { + psz_title = strdup( psz ); + } } vlc_object_release( p_input ); }