X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvisualization%2Fgoom.c;h=427bb75d02b8d4db7e58eb6fc7ea97dfeb370bd9;hb=c12acbd7d48431d7b5029d765e69e87378aca7a2;hp=1d9a859a1c4dd44b03c06c5322be01d5aeaf18c9;hpb=662ed774b9740eabf8b0203e53f51e6c35657e0d;p=vlc diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c index 1d9a859a1c..427bb75d02 100644 --- a/modules/visualization/goom.c +++ b/modules/visualization/goom.c @@ -25,15 +25,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include /* strdup() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include #include #include #include #include +#include +#include #ifdef USE_GOOM_TREE # ifdef OLD_GOOM @@ -66,21 +69,21 @@ static void Close ( vlc_object_t * ); #define MAX_SPEED 10 -vlc_module_begin(); - 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 ); +vlc_module_begin () + set_shortname( N_("Goom")) + set_description( N_("Goom effect") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_VISUAL ) + set_capability( "visualization2", 0 ) + add_integer( "goom-width", 800, NULL, + WIDTH_TEXT, RES_LONGTEXT, false ) + add_integer( "goom-height", 640, NULL, + HEIGHT_TEXT, RES_LONGTEXT, false ) add_integer( "goom-speed", 6, NULL, - SPEED_TEXT, SPEED_LONGTEXT, VLC_FALSE ); - set_callbacks( Open, Close ); - add_shortcut( "goom" ); -vlc_module_end(); + SPEED_TEXT, SPEED_LONGTEXT, false ) + set_callbacks( Open, Close ) + add_shortcut( "goom" ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -99,26 +102,25 @@ typedef struct vlc_cond_t wait; /* Audio properties */ - int i_channels; + unsigned i_channels; /* Audio samples queue */ block_t *pp_blocks[MAX_BLOCKS]; int i_blocks; - audio_date_t date; + date_t date; } goom_thread_t; -typedef struct aout_filter_sys_t +struct filter_sys_t { goom_thread_t *p_thread; -} aout_filter_sys_t; +}; -static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, - aout_buffer_t * ); +static block_t *DoWork ( filter_t *, block_t * ); -static void Thread ( vlc_object_t * ); +static void* Thread ( vlc_object_t * ); static char *TitleGet( vlc_object_t * ); @@ -127,78 +129,72 @@ static char *TitleGet( vlc_object_t * ); *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - aout_filter_t *p_filter = (aout_filter_t *)p_this; - aout_filter_sys_t *p_sys; - goom_thread_t *p_thread; - vlc_value_t width, height; - video_format_t fmt; + filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys; + goom_thread_t *p_thread; + int width, height; + video_format_t fmt; - if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) - || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') ) + if( p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 || + p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 ) { msg_Warn( p_filter, "bad input or output format" ); return VLC_EGENERIC; } - if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) + if( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) ) { msg_Warn( p_filter, "input and output formats are not similar" ); return VLC_EGENERIC; } - p_filter->pf_do_work = DoWork; - p_filter->b_in_place = 1; + p_filter->pf_audio_filter = DoWork; /* Allocate structure */ - p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) ); + p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); /* Create goom thread */ p_sys->p_thread = p_thread = vlc_object_create( p_filter, sizeof( goom_thread_t ) ); vlc_object_attach( p_thread, p_this ); - var_Create( p_thread, "goom-width", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Get( p_thread, "goom-width", &width ); - var_Create( p_thread, "goom-height", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Get( p_thread, "goom-height", &height ); + width = var_CreateGetInteger( p_thread, "goom-width" ); + height = var_CreateGetInteger( p_thread, "goom-height" ); memset( &fmt, 0, sizeof(video_format_t) ); - 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_width = fmt.i_visible_width = width; + fmt.i_height = fmt.i_visible_height = height; + fmt.i_chroma = VLC_CODEC_RGB32; fmt.i_sar_num = fmt.i_sar_den = 1; - p_thread->p_vout = vout_Request( p_filter, NULL, &fmt ); + p_thread->p_vout = aout_filter_RequestVout( p_filter, NULL, &fmt ); if( p_thread->p_vout == NULL ) { msg_Err( p_filter, "no suitable vout module" ); - vlc_object_detach( p_thread ); - vlc_object_destroy( p_thread ); + vlc_object_release( p_thread ); free( p_sys ); return VLC_EGENERIC; } - vlc_mutex_init( p_filter, &p_thread->lock ); - vlc_cond_init( p_filter, &p_thread->wait ); + vlc_mutex_init( &p_thread->lock ); + vlc_cond_init( &p_thread->wait ); 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 ); + date_Init( &p_thread->date, p_filter->fmt_out.audio.i_rate, 1 ); + date_Set( &p_thread->date, 0 ); + p_thread->i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio ); p_thread->psz_title = TitleGet( VLC_OBJECT( p_filter ) ); if( vlc_thread_create( p_thread, "Goom Update Thread", Thread, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_LOW ) ) { msg_Err( p_filter, "cannot lauch goom thread" ); - vout_Destroy( p_thread->p_vout ); + vlc_object_release( p_thread->p_vout ); vlc_mutex_destroy( &p_thread->lock ); vlc_cond_destroy( &p_thread->wait ); - if( p_thread->psz_title ) free( p_thread->psz_title ); - vlc_object_detach( p_thread ); - vlc_object_destroy( p_thread ); + free( p_thread->psz_title ); + vlc_object_release( p_thread ); free( p_sys ); return VLC_EGENERIC; } @@ -211,32 +207,34 @@ static int Open( vlc_object_t *p_this ) ***************************************************************************** * 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 ) +static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf ) { - aout_filter_sys_t *p_sys = p_filter->p_sys; + 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; + return p_in_buf; } - 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_block = block_New( p_sys->p_thread, p_in_buf->i_buffer ); + if( !p_block ) + { + vlc_mutex_unlock( &p_sys->p_thread->lock ); + return p_in_buf; + } + memcpy( p_block->p_buffer, p_in_buf->p_buffer, p_in_buf->i_buffer ); + p_block->i_pts = p_in_buf->i_pts; 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 ); + + return p_in_buf; } /***************************************************************************** @@ -256,7 +254,7 @@ static inline int16_t FloatToInt16( float f ) * Fill buffer *****************************************************************************/ static int FillBuffer( int16_t *p_data, int *pi_data, - audio_date_t *pi_date, audio_date_t *pi_date_end, + date_t *pi_date, date_t *pi_date_end, goom_thread_t *p_this ) { int i_samples = 0; @@ -267,18 +265,18 @@ static int FillBuffer( int16_t *p_data, int *pi_data, if( !p_this->i_blocks ) return VLC_EGENERIC; p_block = p_this->pp_blocks[0]; - i_samples = __MIN( 512 - *pi_data, p_block->i_buffer / - sizeof(float) / p_this->i_channels ); + i_samples = __MIN( (unsigned)(512 - *pi_data), + p_block->i_buffer / sizeof(float) / p_this->i_channels ); /* Date management */ - if( p_block->i_pts > 0 && - p_block->i_pts != aout_DateGet( pi_date_end ) ) + if( p_block->i_pts > VLC_TS_INVALID && + p_block->i_pts != date_Get( pi_date_end ) ) { - aout_DateSet( pi_date_end, p_block->i_pts ); + date_Set( pi_date_end, p_block->i_pts ); } - p_block->i_pts = 0; + p_block->i_pts = VLC_TS_INVALID; - aout_DateIncrement( pi_date_end, i_samples ); + date_Increment( pi_date_end, i_samples ); while( i_samples > 0 ) { @@ -312,26 +310,26 @@ static int FillBuffer( int16_t *p_data, int *pi_data, /***************************************************************************** * Thread: *****************************************************************************/ -static void Thread( vlc_object_t *p_this ) +static void* Thread( vlc_object_t *p_this ) { goom_thread_t *p_thread = (goom_thread_t*)p_this; - vlc_value_t width, height, speed; - audio_date_t i_pts; + int width, height, speed; + date_t i_pts; int16_t p_data[2][512]; int i_data = 0, i_count = 0; PluginInfo *p_plugin_info; + int canc = vlc_savecancel (); - var_Get( p_this, "goom-width", &width ); - var_Get( p_this, "goom-height", &height ); + width = var_GetInteger( p_this, "goom-width" ); + height = var_GetInteger( p_this, "goom-height" ); - 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; + speed = var_CreateGetInteger( p_thread, "goom-speed" ); + speed = MAX_SPEED - speed; + if( speed < 0 ) speed = 0; - p_plugin_info = goom_init( width.i_int, height.i_int ); + p_plugin_info = goom_init( width, height ); - while( !p_thread->b_die ) + while( vlc_object_alive (p_thread) ) { uint32_t *plane; picture_t *p_pic; @@ -344,35 +342,34 @@ static void Thread( vlc_object_t *p_this ) vlc_mutex_unlock( &p_thread->lock ); /* Speed selection */ - if( speed.i_int && (++i_count % (speed.i_int+1)) ) continue; + if( speed && (++i_count % (speed+1)) ) continue; /* Frame dropping if necessary */ - if( aout_DateGet( &i_pts ) + GOOM_DELAY <= mdate() ) continue; + if( date_Get( &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; - } + 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 ) + while( !( p_pic = vout_GetPicture( p_thread->p_vout ) ) && + vlc_object_alive (p_thread) ) { msleep( VOUT_OUTMEM_SLEEP ); } 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, - aout_DateGet( &i_pts ) + GOOM_DELAY ); - vout_DisplayPicture( p_thread->p_vout, p_pic ); + memcpy( p_pic->p[0].p_pixels, plane, width * height * 4 ); + + p_pic->date = date_Get( &i_pts ) + GOOM_DELAY; + vout_PutPicture( p_thread->p_vout, p_pic ); } goom_close( p_plugin_info ); + vlc_restorecancel (canc); + return NULL; } /***************************************************************************** @@ -380,8 +377,8 @@ static void Thread( vlc_object_t *p_this ) *****************************************************************************/ static void Close( vlc_object_t *p_this ) { - aout_filter_t *p_filter = (aout_filter_t *)p_this; - aout_filter_sys_t *p_sys = p_filter->p_sys; + filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys = p_filter->p_sys; /* Stop Goom Thread */ vlc_object_kill( p_sys->p_thread ); @@ -393,50 +390,41 @@ 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 ); + aout_filter_RequestVout( 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 ); + vlc_object_release( p_sys->p_thread ); free( p_sys ); } static char *TitleGet( vlc_object_t *p_this ) { - char *psz_title = NULL; - input_thread_t *p_input = - vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); + input_thread_t *p_input = playlist_CurrentInput( pl_Get( p_this ) ); + if( !p_input ) + return NULL; - if( p_input ) + char *psz_title = input_item_GetTitle( input_GetItem( p_input ) ); + if( EMPTY_STR( psz_title ) ) { - psz_title = strdup( input_item_GetTitle( input_GetItem( p_input ) ) ); - if( EMPTY_STR( psz_title ) ) + free( psz_title ); + + char *psz_uri = input_item_GetURI( input_GetItem( p_input ) ); + const char *psz = strrchr( psz_uri, '/' ); + if( psz ) { - free( psz_title ); - 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 ); - } + psz_title = strdup( psz + 1 ); + free( psz_uri ); } - vlc_object_release( p_input ); + else + psz_title = psz_uri; } - + vlc_object_release( p_input ); return psz_title; }