X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvisualization%2Fgoom.c;h=08b1d6c0a65d2d5461a5cace957774b84fac1df4;hb=9d5e75a7a5643a2144dc561fc246a7a3ca7e5fb0;hp=e59f438df686612ecfeb7799972f4ecdec371756;hpb=cde22b4f79f11e0b4b4a4e15a1ddae567b8738a8;p=vlc diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c index e59f438df6..08b1d6c0a6 100644 --- a/modules/visualization/goom.c +++ b/modules/visualization/goom.c @@ -25,15 +25,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include /* strdup() */ #include -#include -#include -#include -#include -#include "aout_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#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 ); +vlc_module_begin () + set_shortname( N_("Goom")) + set_description( N_("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 ); + WIDTH_TEXT, RES_LONGTEXT, false ) add_integer( "goom-height", 240, NULL, - HEIGHT_TEXT, RES_LONGTEXT, VLC_FALSE ); + 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 @@ -109,16 +112,16 @@ typedef struct } goom_thread_t; -typedef struct aout_filter_sys_t +struct aout_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 void Thread ( vlc_object_t * ); +static void* Thread ( vlc_object_t * ); static char *TitleGet( vlc_object_t * ); @@ -130,16 +133,17 @@ 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 = {0}; + 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->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 ) ) + if( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) { msg_Warn( p_filter, "input and output formats are not similar" ); return VLC_EGENERIC; @@ -156,28 +160,28 @@ static int Open( vlc_object_t *p_this ) 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_aspect = VOUT_ASPECT_FACTOR * width/height; 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 ); @@ -187,15 +191,15 @@ static int Open( vlc_object_t *p_this ) 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 ); + free( p_thread->psz_title ); vlc_object_detach( p_thread ); - vlc_object_destroy( p_thread ); + vlc_object_release( p_thread ); free( p_sys ); return VLC_EGENERIC; } @@ -211,6 +215,8 @@ static int Open( vlc_object_t *p_this ) 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 ) { + VLC_UNUSED( p_aout ); + aout_filter_sys_t *p_sys = p_filter->p_sys; block_t *p_block; @@ -226,7 +232,11 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, } p_block = block_New( p_sys->p_thread, p_in_buf->i_nb_bytes ); - if( !p_block ) return; + if( !p_block ) + { + vlc_mutex_unlock( &p_sys->p_thread->lock ); + 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; @@ -309,26 +319,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; + int 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; + 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; @@ -341,7 +351,7 @@ 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; @@ -349,27 +359,26 @@ static void Thread( vlc_object_t *p_this ) 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 ) + 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 ); + memcpy( p_pic->p[0].p_pixels, plane, width * height * 4 ); + + p_pic->date = aout_DateGet( &i_pts ) + GOOM_DELAY; vout_DisplayPicture( p_thread->p_vout, p_pic ); } goom_close( p_plugin_info ); + vlc_restorecancel (canc); + return NULL; } /***************************************************************************** @@ -381,7 +390,7 @@ static void Close( vlc_object_t *p_this ) aout_filter_sys_t *p_sys = p_filter->p_sys; /* Stop Goom Thread */ - p_sys->p_thread->b_die = VLC_TRUE; + vlc_object_kill( p_sys->p_thread ); vlc_mutex_lock( &p_sys->p_thread->lock ); vlc_cond_signal( &p_sys->p_thread->wait ); @@ -390,7 +399,7 @@ 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 ); @@ -400,7 +409,7 @@ static void Close( vlc_object_t *p_this ) 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 ); } @@ -413,14 +422,12 @@ static char *TitleGet( vlc_object_t *p_this ) if( p_input ) { - if( p_input->input.p_item->p_meta->psz_title && - *p_input->input.p_item->p_meta->psz_title ) - { - psz_title = strdup( p_input->input.p_item->p_meta->psz_title ); - } - else + psz_title = input_item_GetTitle( input_GetItem( p_input ) ); + if( EMPTY_STR( psz_title ) ) { - char *psz = strrchr( p_input->input.p_item->psz_uri, '/' ); + free( psz_title ); + char *psz_orig = input_item_GetURI( input_GetItem( p_input ) ); + char *psz = strrchr( psz_orig, '/' ); if( psz ) { @@ -428,12 +435,13 @@ static char *TitleGet( vlc_object_t *p_this ) } else { - psz = p_input->input.p_item->psz_uri; + psz = psz_orig; } if( psz && *psz ) { psz_title = strdup( psz ); } + free( psz_orig ); } vlc_object_release( p_input ); }