X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvisualization%2Fgoom.c;h=11f09a654e183ab06ef812175d26bb3b62d7a2d0;hb=3ec46dc7aeb95809134a680bc4b4c9ccb090976b;hp=08b1d6c0a65d2d5461a5cace957774b84fac1df4;hpb=52c18c4dec68158eedd655e0502820b7d7b6128f;p=vlc diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c index 08b1d6c0a6..11f09a654e 100644 --- a/modules/visualization/goom.c +++ b/modules/visualization/goom.c @@ -1,8 +1,7 @@ /***************************************************************************** * goom.c: based on libgoom (see http://ios.free.fr/?page=projet&quoi=1) ***************************************************************************** - * Copyright (C) 2003 the VideoLAN team - * $Id$ + * Copyright (C) 2003-2011 the VideoLAN team * * Authors: Laurent Aimar * Gildas Bazin @@ -25,7 +24,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" @@ -33,24 +31,10 @@ #include #include -#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 +#include /* aout_FormatNbChannels, AOUT_FMTS_SIMILAR */ +#include /* vout_*Picture, aout_filter_RequestVout */ + +#include /***************************************************************************** * Module descriptor @@ -75,11 +59,11 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_VISUAL ) set_capability( "visualization", 0 ) - add_integer( "goom-width", 320, NULL, + add_integer( "goom-width", 800, WIDTH_TEXT, RES_LONGTEXT, false ) - add_integer( "goom-height", 240, NULL, + add_integer( "goom-height", 500, HEIGHT_TEXT, RES_LONGTEXT, false ) - add_integer( "goom-speed", 6, NULL, + add_integer_with_range( "goom-speed", 6, 1, 10, SPEED_TEXT, SPEED_LONGTEXT, false ) set_callbacks( Open, Close ) add_shortcut( "goom" ) @@ -93,117 +77,100 @@ vlc_module_end () typedef struct { - VLC_COMMON_MEMBERS - vout_thread_t *p_vout; + vlc_thread_t thread; - char *psz_title; + int i_width; + int i_height; + vout_thread_t *p_vout; + int i_speed; vlc_mutex_t lock; vlc_cond_t wait; + bool b_exit; /* 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; -struct aout_filter_sys_t +struct filter_sys_t { goom_thread_t *p_thread; }; -static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, - aout_buffer_t * ); - -static void* Thread ( vlc_object_t * ); +static block_t *DoWork ( filter_t *, block_t * ); -static char *TitleGet( vlc_object_t * ); +static void *Thread( void * ); /***************************************************************************** * Open: open a scope effect plugin *****************************************************************************/ 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; - int width, height; - video_format_t fmt; - - - if( p_filter->input.i_format != VLC_CODEC_FL32 || - p_filter->output.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 ) ) - { - 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; + filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys; + goom_thread_t *p_thread; + video_format_t fmt; /* 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 ); + p_sys->p_thread = p_thread = calloc( 1, sizeof(*p_thread) ); - width = var_CreateGetInteger( p_thread, "goom-width" ); - height = var_CreateGetInteger( p_thread, "goom-height" ); + const int width = p_thread->i_width = var_InheritInteger( p_filter, "goom-width" ); + const int height = p_thread->i_height = var_InheritInteger( p_filter, "goom-height" ); memset( &fmt, 0, sizeof(video_format_t) ); fmt.i_width = fmt.i_visible_width = width; fmt.i_height = fmt.i_visible_height = height; fmt.i_chroma = VLC_CODEC_RGB32; - fmt.i_aspect = VOUT_ASPECT_FACTOR * width/height; fmt.i_sar_num = fmt.i_sar_den = 1; 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_release( p_thread ); + free( p_thread ); free( p_sys ); return VLC_EGENERIC; } + + p_thread->i_speed = MAX_SPEED - var_InheritInteger( p_filter, "goom-speed" ); + if( p_thread->i_speed < 0 ) + p_thread->i_speed = 0; + 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 ); - - p_thread->psz_title = TitleGet( VLC_OBJECT( p_filter ) ); + date_Init( &p_thread->date, p_filter->fmt_in.audio.i_rate, 1 ); + date_Set( &p_thread->date, 0 ); + p_thread->i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio ); - if( vlc_thread_create( p_thread, "Goom Update Thread", Thread, - VLC_THREAD_PRIORITY_LOW ) ) + if( vlc_clone( &p_thread->thread, + Thread, p_thread, VLC_THREAD_PRIORITY_LOW ) ) { msg_Err( p_filter, "cannot lauch goom thread" ); - vlc_object_release( p_thread->p_vout ); vlc_mutex_destroy( &p_thread->lock ); vlc_cond_destroy( &p_thread->wait ); - free( p_thread->psz_title ); - vlc_object_detach( p_thread ); - vlc_object_release( p_thread ); + aout_filter_RequestVout( p_filter, p_thread->p_vout, NULL ); + free( p_thread ); free( p_sys ); return VLC_EGENERIC; } + p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32; + p_filter->fmt_out.audio = p_filter->fmt_in.audio; + p_filter->pf_audio_filter = DoWork; return VLC_SUCCESS; } @@ -212,38 +179,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 ) { - VLC_UNUSED( p_aout ); - - 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 ); + p_block = block_Alloc( p_in_buf->i_buffer ); if( !p_block ) { vlc_mutex_unlock( &p_sys->p_thread->lock ); - return; + return p_in_buf; } - 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; + 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; } /***************************************************************************** @@ -263,7 +226,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; @@ -274,18 +237,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 ) { @@ -319,61 +282,66 @@ static int FillBuffer( int16_t *p_data, int *pi_data, /***************************************************************************** * Thread: *****************************************************************************/ -static void* Thread( vlc_object_t *p_this ) +static void *Thread( void *p_thread_data ) { - goom_thread_t *p_thread = (goom_thread_t*)p_this; - int width, height, speed; - audio_date_t i_pts; + goom_thread_t *p_thread = (goom_thread_t*)p_thread_data; + 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 (); - width = var_GetInteger( p_this, "goom-width" ); - height = var_GetInteger( p_this, "goom-height" ); - - speed = var_CreateGetInteger( p_thread, "goom-speed" ); - speed = MAX_SPEED - speed; - if( speed < 0 ) speed = 0; + p_plugin_info = goom_init( p_thread->i_width, p_thread->i_height ); - p_plugin_info = goom_init( width, height ); - - while( vlc_object_alive (p_thread) ) + for( ;; ) { uint32_t *plane; picture_t *p_pic; + /* FIXME the way the update is done is not really good. + * Supurious wake up from p_thread->wait will make it generates a frame + * without using new samples (probably rare as we should not be waiting + * samples). + * The frame rate at which the video is generated is not well controlled + * nor the time at which each frame is displayed (not smooth) + */ /* goom_update is damn slow, so just copy data and release the lock */ vlc_mutex_lock( &p_thread->lock ); - if( FillBuffer( (int16_t *)p_data, &i_data, &i_pts, - &p_thread->date, p_thread ) != VLC_SUCCESS ) + if( !p_thread->b_exit && + 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 ); + bool b_exit = p_thread->b_exit; vlc_mutex_unlock( &p_thread->lock ); + if( b_exit ) + break; + /* Speed selection */ - if( speed && (++i_count % (speed+1)) ) continue; + if( p_thread->i_speed && (++i_count % (p_thread->i_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 ); + NULL, NULL ); - free( p_thread->psz_title ); - p_thread->psz_title = NULL; - - while( !( p_pic = vout_CreatePicture( p_thread->p_vout, 0, 0, 0 ) ) && - vlc_object_alive (p_thread) ) + while( !( p_pic = vout_GetPicture( p_thread->p_vout ) ) ) { + vlc_mutex_lock( &p_thread->lock ); + bool b_exit = p_thread->b_exit; + vlc_mutex_unlock( &p_thread->lock ); + if( b_exit ) + break; msleep( VOUT_OUTMEM_SLEEP ); } if( p_pic == NULL ) break; - memcpy( p_pic->p[0].p_pixels, plane, width * height * 4 ); + memcpy( p_pic->p[0].p_pixels, plane, p_thread->i_width * p_thread->i_height * 4 ); - p_pic->date = aout_DateGet( &i_pts ) + GOOM_DELAY; - vout_DisplayPicture( p_thread->p_vout, p_pic ); + p_pic->date = date_Get( &i_pts ) + GOOM_DELAY; + vout_PutPicture( p_thread->p_vout, p_pic ); } goom_close( p_plugin_info ); @@ -386,65 +354,29 @@ 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 ); - vlc_mutex_lock( &p_sys->p_thread->lock ); + p_sys->p_thread->b_exit = true; vlc_cond_signal( &p_sys->p_thread->wait ); vlc_mutex_unlock( &p_sys->p_thread->lock ); - vlc_thread_join( p_sys->p_thread ); + vlc_join( p_sys->p_thread->thread, NULL ); /* Free data */ - aout_filter_RequestVout( p_filter, p_sys->p_thread->p_vout, 0 ); + aout_filter_RequestVout( p_filter, p_sys->p_thread->p_vout, NULL ); 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_release( p_sys->p_thread ); + free( 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 ); - - if( p_input ) - { - psz_title = input_item_GetTitle( input_GetItem( p_input ) ); - if( EMPTY_STR( psz_title ) ) - { - free( psz_title ); - char *psz_orig = input_item_GetURI( input_GetItem( p_input ) ); - char *psz = strrchr( psz_orig, '/' ); - - if( psz ) - { - psz++; - } - else - { - psz = psz_orig; - } - if( psz && *psz ) - { - psz_title = strdup( psz ); - } - free( psz_orig ); - } - vlc_object_release( p_input ); - } - - return psz_title; -}