# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
#include "../video_filter/mosaic.h"
+#include <assert.h>
+
/*****************************************************************************
* Local structures
*****************************************************************************/
int i_chroma; /* force image format chroma */
- filter_t **pp_vfilters;
- int i_vfilters;
+ filter_chain_t *p_vf2;
};
#define PICTURE_RING_SIZE 4
typedef void (* pf_release_t)( picture_t * );
static void ReleasePicture( picture_t *p_pic )
{
- p_pic->i_refcount--;
+ assert( p_pic );
+
+ if( --p_pic->i_refcount > 0 )
+ return;
- if ( p_pic->i_refcount <= 0 )
+ assert( p_pic->p_sys );
+ if( p_pic->p_sys )
{
- if ( p_pic->p_sys != NULL )
- {
- pf_release_t pf_release = (pf_release_t)p_pic->p_sys;
- p_pic->p_sys = NULL;
- pf_release( p_pic );
- }
- else
- {
- if( p_pic )
- {
- free( p_pic->p_data_orig );
- free( p_pic );
- }
- }
+ pf_release_t pf_release = (pf_release_t)p_pic->p_sys;
+ p_pic->p_sys = NULL;
+ pf_release( p_pic );
+ }
+ else
+ {
+ free( p_pic->p_data_orig );
+ free( p_pic );
}
}
#define CFG_PREFIX "sout-mosaic-bridge-"
vlc_module_begin();
- set_shortname( _( "Mosaic bridge" ) );
- set_description(_("Mosaic bridge stream output") );
+ set_shortname( N_( "Mosaic bridge" ) );
+ set_description(N_("Mosaic bridge stream output") );
set_capability( "sout stream", 0 );
add_shortcut( "mosaic-bridge" );
set_callbacks( Open, Close );
vlc_module_end();
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
"id", "width", "height", "sar", "vfilter", "chroma", "alpha", "x", "y", NULL
};
free( p_sys );
}
+static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data )
+{
+ p_filter->pf_vout_buffer_new = video_new_buffer_filter;
+ p_filter->pf_vout_buffer_del = video_del_buffer_filter;
+ p_filter->p_owner = p_data;
+ return VLC_SUCCESS;
+}
+
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
bridge_t *p_bridge;
bridged_es_t *p_es;
- char *psz_chain, *psz_parser;
+ char *psz_chain;
int i;
if ( p_sys->b_inited )
/* Create decoder object */
p_sys->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
+ if( !p_sys->p_decoder )
+ return NULL;
vlc_object_attach( p_sys->p_decoder, p_stream );
p_sys->p_decoder->p_module = NULL;
p_sys->p_decoder->fmt_in = *p_fmt;
p_sys->p_decoder->pf_picture_link = video_link_picture_decoder;
p_sys->p_decoder->pf_picture_unlink = video_unlink_picture_decoder;
p_sys->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
+ if( !p_sys->p_decoder->p_owner )
+ {
+ vlc_object_detach( p_sys->p_decoder );
+ vlc_object_release( p_sys->p_decoder );
+ return NULL;
+ }
+
for( i = 0; i < PICTURE_RING_SIZE; i++ )
- p_sys->p_decoder->p_owner->pp_pics[i] = 0;
+ p_sys->p_decoder->p_owner->pp_pics[i] = NULL;
p_sys->p_decoder->p_owner->video = p_fmt->video;
//p_sys->p_decoder->p_cfg = p_sys->p_video_cfg;
/* Create user specified video filters */
psz_chain = var_GetNonEmptyString( p_stream, CFG_PREFIX "vfilter" );
msg_Dbg( p_stream, "psz_chain: %s\n", psz_chain );
+ if( psz_chain )
{
- config_chain_t *p_cfg;
- for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
- {
- msg_Dbg( p_stream, " - %s\n", p_cfg->psz_value );
- }
- }
- p_sys->i_vfilters = 0;
- p_sys->pp_vfilters = NULL;
- psz_parser = psz_chain;
- while( psz_parser && *psz_parser )
- {
- config_chain_t *p_cfg;
- char *psz_name;
- filter_t **pp_vfilter;
- psz_parser = config_ChainCreate( &psz_name, &p_cfg, psz_parser );
- p_sys->i_vfilters++;
- p_sys->pp_vfilters =
- (filter_t **)realloc( p_sys->pp_vfilters,
- p_sys->i_vfilters * sizeof(filter_t *) );
- pp_vfilter = p_sys->pp_vfilters+(p_sys->i_vfilters - 1);
- *pp_vfilter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
- vlc_object_attach( *pp_vfilter, p_stream );
- (*pp_vfilter)->pf_vout_buffer_new = video_new_buffer_filter;
- (*pp_vfilter)->pf_vout_buffer_del = video_del_buffer_filter;
- (*pp_vfilter)->fmt_in = p_sys->p_decoder->fmt_out;
+ p_sys->p_vf2 = filter_chain_New( p_stream, "video filter2", false,
+ video_filter_buffer_allocation_init,
+ NULL, p_sys->p_decoder->p_owner );
+ es_format_t fmt;
+ es_format_Copy( &fmt, &p_sys->p_decoder->fmt_out );
if( p_sys->i_chroma )
- (*pp_vfilter)->fmt_in.video.i_chroma = p_sys->i_chroma;
- (*pp_vfilter)->fmt_out = (*pp_vfilter)->fmt_in;
- (*pp_vfilter)->p_cfg = p_cfg;
- (*pp_vfilter)->p_module =
- module_Need( *pp_vfilter, "video filter2", psz_name, true );
- if( (*pp_vfilter)->p_module )
- {
- /* It worked! */
- (*pp_vfilter)->p_owner = (filter_owner_sys_t *)
- p_sys->p_decoder->p_owner;
- msg_Err( p_stream, "Added video filter %s to the chain",
- psz_name );
- }
- else
- {
- /* Crap ... we didn't find a filter */
- msg_Warn( p_stream,
- "no video filter matching name \"%s\" found",
- psz_name );
- vlc_object_detach( *pp_vfilter );
- vlc_object_release( *pp_vfilter );
- p_sys->i_vfilters--;
- }
+ fmt.video.i_chroma = p_sys->i_chroma;
+ filter_chain_Reset( p_sys->p_vf2, &fmt, &fmt );
+ filter_chain_AppendFromString( p_sys->p_vf2, psz_chain );
+ free( psz_chain );
}
- free( psz_chain );
return (sout_stream_id_t *)p_sys;
}
bridge_t *p_bridge;
bridged_es_t *p_es;
bool b_last_es = true;
- filter_t **pp_vfilter, **pp_end;
int i;
if ( !p_sys->b_inited )
}
/* Destroy user specified video filters */
- pp_vfilter = p_sys->pp_vfilters;
- pp_end = pp_vfilter + p_sys->i_vfilters;
- for( ; pp_vfilter < pp_end; pp_vfilter++ )
- {
- vlc_object_detach( *pp_vfilter );
- if( (*pp_vfilter)->p_module )
- module_Unneed( *pp_vfilter, (*pp_vfilter)->p_module );
- vlc_object_release( *pp_vfilter );
- }
- free( p_sys->pp_vfilters );
+ filter_chain_Delete( p_sys->p_vf2 );
vlc_mutex_lock( p_sys->p_lock );
if ( p_new_pic == NULL )
{
msg_Err( p_stream, "image conversion failed" );
+ p_pic->pf_release( p_pic );
continue;
}
}
p_sys->p_decoder->fmt_out.video.i_aspect )
!= VLC_SUCCESS )
{
+ p_pic->pf_release( p_pic );
free( p_new_pic );
msg_Err( p_stream, "image allocation failed" );
continue;
p_new_pic->date = p_pic->date;
p_pic->pf_release( p_pic );
- if( p_sys->pp_vfilters )
- {
- /* Apply user specified video filters */
- filter_t **pp_vfilter = p_sys->pp_vfilters;
- filter_t **pp_end = pp_vfilter + p_sys->i_vfilters;
- for( ; pp_vfilter < pp_end; pp_vfilter++ )
- {
- (*pp_vfilter)->fmt_in.i_codec = p_new_pic->format.i_chroma;
- (*pp_vfilter)->fmt_out.i_codec = p_new_pic->format.i_chroma;
- (*pp_vfilter)->fmt_in.video = p_new_pic->format;
- (*pp_vfilter)->fmt_out.video = p_new_pic->format;
- p_new_pic = (*pp_vfilter)->pf_video_filter( *pp_vfilter,
- p_new_pic );
- if( !p_new_pic )
- {
- msg_Err( p_stream, "video filter failed" );
- break;
- }
- }
- if( !p_new_pic ) continue;
- }
+ if( p_sys->p_vf2 )
+ p_new_pic = filter_chain_VideoFilter( p_sys->p_vf2, p_new_pic );
PushPicture( p_stream, p_new_pic );
}
static void video_release_buffer_decoder( picture_t *p_pic )
{
- if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
- {
- video_del_buffer_decoder( (decoder_t *)p_pic->p_sys->p_owner, p_pic );
- }
- else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
+ assert( p_pic && p_pic->p_sys );
+
+ if( --p_pic->i_refcount > 0 )
+ return;
+
+ video_del_buffer_decoder( (decoder_t *)p_pic->p_sys->p_owner, p_pic );
}
static void video_release_buffer_filter( picture_t *p_pic )
{
- if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
- {
- video_del_buffer_filter( (filter_t *)p_pic->p_sys->p_owner, p_pic );
- }
- else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
+ assert( p_pic );
+
+ if( --p_pic->i_refcount > 0 )
+ return;
+
+ assert( p_pic->p_sys );
+
+ video_del_buffer_filter( (filter_t *)p_pic->p_sys->p_owner, p_pic );
}
inline static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
if( pp_ring[i] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE )
{
pp_ring[i]->i_status = RESERVED_PICTURE;
+ pp_ring[i]->i_refcount = 1;
return pp_ring[i];
}
}
for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
+ pp_ring[i]->p_sys->b_dead = true;
pp_ring[i]->pf_release( pp_ring[i] );
+ pp_ring[i] = NULL;
}
i = 0;
p_pic = malloc( sizeof(picture_t) );
if( !p_pic ) return NULL;
fmt_out->video.i_chroma = fmt_out->i_codec;
- vout_AllocatePicture( p_this, p_pic,
+ if( vout_AllocatePicture( p_this, p_pic,
fmt_out->video.i_chroma,
fmt_out->video.i_width,
fmt_out->video.i_height,
- fmt_out->video.i_aspect );
+ fmt_out->video.i_aspect ) != VLC_SUCCESS )
+ {
+ free( p_pic );
+ return NULL;
+ }
if( !p_pic->i_planes )
{
}
p_pic->pf_release = pf_release;
+ p_pic->i_refcount = 1;
p_pic->p_sys = malloc( sizeof(picture_sys_t) );
p_pic->p_sys->p_owner = p_this;
p_pic->p_sys->b_dead = false;
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
- VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
sout_stream_t *p_stream = (sout_stream_t *)p_data;
sout_stream_sys_t *p_sys = p_stream->p_sys;
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
- VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
sout_stream_t *p_stream = (sout_stream_t *)p_data;
sout_stream_sys_t *p_sys = p_stream->p_sys;
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
- VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
sout_stream_t *p_stream = (sout_stream_t *)p_data;
sout_stream_sys_t *p_sys = p_stream->p_sys;
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
- VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
sout_stream_t *p_stream = (sout_stream_t *)p_data;
sout_stream_sys_t *p_sys = p_stream->p_sys;
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
- VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
sout_stream_t *p_stream = (sout_stream_t *)p_data;
sout_stream_sys_t *p_sys = p_stream->p_sys;
projects / vlc / blobdiff