/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
#include <errno.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/aout.h>
-#include <vlc/vout.h>
-#include "aout_internal.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
+#include <vlc_block.h>
+#include <vlc_input.h>
#ifdef USE_GOOM_TREE
# ifdef OLD_GOOM
#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
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 * );
aout_filter_sys_t *p_sys;
goom_thread_t *p_thread;
vlc_value_t width, height;
- video_format_t fmt = {0};
+ 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') )
var_Create( p_thread, "goom-height", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
var_Get( p_thread, "goom-height", &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_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 );
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, false ) )
{
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;
}
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;
}
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;
/*****************************************************************************
* 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;
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 );
p_plugin_info = goom_init( width.i_int, height.i_int );
- while( !p_thread->b_die )
+ while( vlc_object_alive (p_thread) )
{
uint32_t *plane;
picture_t *p_pic;
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 );
+
+ 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;
}
/*****************************************************************************
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 );
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 );
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 );
}
if( p_input )
{
- char *psz = strrchr( p_input->input.p_item->psz_uri, '/' );
-
- if( psz )
- {
- psz++;
- }
- else
- {
- psz = p_input->input.p_item->psz_uri;
- }
- if( psz && *psz )
+ psz_title = input_item_GetTitle( input_GetItem( p_input ) );
+ if( EMPTY_STR( psz_title ) )
{
- psz_title = strdup( psz );
+ 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 );
}