Commit 5069e3d7 authored by Rafaël Carré's avatar Rafaël Carré

s/sout_stream_id_t/sout_stream_id_sys_t/

All our private context end in sys_t
Do the same for elementary stream specific context inside sout modules
parent 630ccbb6
......@@ -56,9 +56,9 @@ struct sout_instance_t
};
/****************************************************************************
* sout_stream_id_t: opaque (private for all sout_stream_t)
* sout_stream_id_sys_t: opaque (private for all sout_stream_t)
****************************************************************************/
typedef struct sout_stream_id_t sout_stream_id_t;
typedef struct sout_stream_id_sys_t sout_stream_id_sys_t;
/** Stream output access_output */
struct sout_access_out_t
......@@ -186,10 +186,10 @@ struct sout_stream_t
sout_stream_t *p_next;
/* add, remove a stream */
sout_stream_id_t *(*pf_add)( sout_stream_t *, es_format_t * );
int (*pf_del)( sout_stream_t *, sout_stream_id_t * );
sout_stream_id_sys_t *(*pf_add)( sout_stream_t *, es_format_t * );
int (*pf_del)( sout_stream_t *, sout_stream_id_sys_t * );
/* manage a packet */
int (*pf_send)( sout_stream_t *, sout_stream_id_t *, block_t* );
int (*pf_send)( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
sout_stream_sys_t *p_sys;
bool pace_nocontrol;
......@@ -199,15 +199,15 @@ VLC_API void sout_StreamChainDelete(sout_stream_t *p_first, sout_stream_t *p_las
VLC_API sout_stream_t *sout_StreamChainNew(sout_instance_t *p_sout,
char *psz_chain, sout_stream_t *p_next, sout_stream_t **p_last) VLC_USED;
static inline sout_stream_id_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt )
static inline sout_stream_id_sys_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt )
{
return s->pf_add( s, fmt );
}
static inline int sout_StreamIdDel( sout_stream_t *s, sout_stream_id_t *id )
static inline int sout_StreamIdDel( sout_stream_t *s, sout_stream_id_sys_t *id )
{
return s->pf_del( s, id );
}
static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, block_t *b )
static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_sys_t *id, block_t *b )
{
return s->pf_send( s, id, b );
}
......
......@@ -54,13 +54,13 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send ( sout_stream_t *, sout_stream_id_t *, block_t * );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send ( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
es_format_t fmt;
mtime_t i_last;
bool b_error;
......@@ -68,7 +68,7 @@ struct sout_stream_id_t
struct sout_stream_sys_t
{
sout_stream_id_t **pp_es;
sout_stream_id_sys_t **pp_es;
int i_es_num;
};
......@@ -111,10 +111,10 @@ static void Close( vlc_object_t * p_this )
free( p_sys );
}
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
sout_stream_id_t *p_es = malloc( sizeof(sout_stream_id_t) );
sout_stream_id_sys_t *p_es = malloc( sizeof(sout_stream_id_sys_t) );
p_es->fmt = *p_fmt;
p_es->id = NULL;
......@@ -125,10 +125,10 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
return p_es;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *p_es )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *p_es )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
sout_stream_id_t *id = p_es->id;
sout_stream_id_sys_t *id = p_es->id;
TAB_REMOVE( p_sys->i_es_num, p_sys->pp_es, p_es );
free( p_es );
......@@ -139,7 +139,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *p_es )
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *p_es,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *p_es,
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......
......@@ -140,13 +140,13 @@ static const char *const ppsz_sout_options_in[] = {
NULL
};
static sout_stream_id_t *AddOut ( sout_stream_t *, es_format_t * );
static int DelOut ( sout_stream_t *, sout_stream_id_t * );
static int SendOut( sout_stream_t *, sout_stream_id_t *, block_t * );
static sout_stream_id_sys_t *AddOut ( sout_stream_t *, es_format_t * );
static int DelOut ( sout_stream_t *, sout_stream_id_sys_t * );
static int SendOut( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
static sout_stream_id_t *AddIn ( sout_stream_t *, es_format_t * );
static int DelIn ( sout_stream_t *, sout_stream_id_t * );
static int SendIn( sout_stream_t *, sout_stream_id_t *, block_t * );
static sout_stream_id_sys_t *AddIn ( sout_stream_t *, es_format_t * );
static int DelIn ( sout_stream_t *, sout_stream_id_sys_t * );
static int SendIn( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
typedef struct bridged_es_t
{
......@@ -156,7 +156,7 @@ typedef struct bridged_es_t
bool b_empty;
/* bridge in part */
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
mtime_t i_last;
bool b_changed;
} bridged_es_t;
......@@ -233,7 +233,7 @@ static void CloseOut( vlc_object_t * p_this )
free( p_sys );
}
static sout_stream_id_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt )
{
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
bridge_t *p_bridge;
......@@ -292,10 +292,10 @@ static sout_stream_id_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt )
vlc_mutex_unlock( &lock );
return (sout_stream_id_t *)p_sys;
return (sout_stream_id_sys_t *)p_sys;
}
static int DelOut( sout_stream_t *p_stream, sout_stream_id_t *id )
static int DelOut( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
VLC_UNUSED(id);
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
......@@ -322,7 +322,7 @@ static int DelOut( sout_stream_t *p_stream, sout_stream_id_t *id )
return VLC_SUCCESS;
}
static int SendOut( sout_stream_t *p_stream, sout_stream_id_t *id,
static int SendOut( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
......@@ -365,9 +365,9 @@ typedef struct in_sout_stream_sys_t
bool b_switch_on_iframe;
int i_state;
mtime_t i_placeholder_delay;
sout_stream_id_t *id_video;
sout_stream_id_sys_t *id_video;
mtime_t i_last_video;
sout_stream_id_t *id_audio;
sout_stream_id_sys_t *id_audio;
mtime_t i_last_audio;
} in_sout_stream_sys_t;
......@@ -449,17 +449,17 @@ static void CloseIn( vlc_object_t * p_this )
free( p_sys );
}
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
int i_cat; /* es category. Used for placeholder option */
};
static sout_stream_id_t * AddIn( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * AddIn( sout_stream_t *p_stream, es_format_t *p_fmt )
{
in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
sout_stream_id_t *id = malloc( sizeof( sout_stream_id_t ) );
sout_stream_id_sys_t *id = malloc( sizeof( sout_stream_id_sys_t ) );
if( !id ) return NULL;
id->id = p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
......@@ -490,7 +490,7 @@ static sout_stream_id_t * AddIn( sout_stream_t *p_stream, es_format_t *p_fmt )
return id;
}
static int DelIn( sout_stream_t *p_stream, sout_stream_id_t *id )
static int DelIn( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
......@@ -503,7 +503,7 @@ static int DelIn( sout_stream_t *p_stream, sout_stream_id_t *id )
return ret;
}
static int SendIn( sout_stream_t *p_stream, sout_stream_id_t *id,
static int SendIn( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
......@@ -608,7 +608,7 @@ static int SendIn( sout_stream_t *p_stream, sout_stream_id_t *id,
p_block->i_dts += p_sys->i_delay;
p_block = p_block->p_next;
}
sout_stream_id_t *newid = NULL;
sout_stream_id_sys_t *newid = NULL;
if( p_sys->b_placeholder )
{
switch( p_bridge->pp_es[i]->fmt.i_cat )
......
......@@ -47,9 +47,9 @@
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
/*****************************************************************************
* Module descriptor
......@@ -73,11 +73,11 @@ struct sout_stream_sys_t
bool b_finished;
bool b_done;
ChromaprintContext *p_chromaprint_ctx;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
chromaprint_fingerprint_t *p_data;
};
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
int i_samples;
unsigned int i_channels;
......@@ -160,10 +160,10 @@ static void Close( vlc_object_t * p_this )
free( p_sys );
}
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id = NULL;
sout_stream_id_sys_t *id = NULL;
if ( p_fmt->i_cat == AUDIO_ES && !p_sys->id )
{
......@@ -173,7 +173,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
goto error;
}
id = malloc( sizeof( sout_stream_id_t ) );
id = malloc( sizeof( sout_stream_id_sys_t ) );
if ( !id ) goto error;
id->i_channels = p_fmt->audio.i_channels;
......@@ -200,7 +200,7 @@ error:
return NULL;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
Finish( p_stream );
......@@ -210,7 +210,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buf )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
......@@ -72,13 +72,13 @@ static const char *ppsz_sout_options[] = {
"id", "delay", NULL
};
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send ( sout_stream_t *, sout_stream_id_t *, block_t * );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send ( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
struct sout_stream_sys_t
{
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
int i_id;
mtime_t i_delay;
};
......@@ -128,7 +128,7 @@ static void Close( vlc_object_t * p_this )
free( p_sys );
}
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......@@ -143,7 +143,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
return p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......@@ -153,7 +153,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
return p_stream->p_next->pf_del( p_stream->p_next, id );
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......
......@@ -43,9 +43,9 @@
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
/*****************************************************************************
* Module descriptor
......@@ -63,7 +63,7 @@ struct sout_stream_sys_t
mtime_t i_stream_start;
};
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
};
......@@ -106,10 +106,10 @@ static void Close( vlc_object_t *p_this )
free( p_sys );
}
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
es_format_t *p_fmt_copy;
msg_Dbg( p_stream, "Adding a stream" );
......@@ -122,11 +122,11 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
if( p_sys->i_stream_start <= 0 )
p_sys->i_stream_start = mdate();
id = malloc( sizeof( sout_stream_id_t ) );
id = malloc( sizeof( sout_stream_id_sys_t ) );
return id;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
msg_Dbg( p_stream, "Removing a stream" );
......@@ -134,7 +134,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
VLC_UNUSED(id);
......
......@@ -74,9 +74,9 @@ static const char *const ppsz_sout_options[] = {
"audio", "video", "delay", NULL
};
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
struct sout_stream_sys_t
{
......@@ -136,7 +136,7 @@ static void Close( vlc_object_t * p_this )
free( p_sys );
}
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -154,17 +154,17 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
(char*)&p_fmt->i_codec );
return NULL;
}
return (sout_stream_id_t *)p_dec;
return (sout_stream_id_sys_t *)p_dec;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
(void) p_stream;
input_DecoderDelete( (decoder_t *)id );
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
......@@ -40,9 +40,9 @@
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
/*****************************************************************************
* Module descriptor
......@@ -78,13 +78,13 @@ static void Close( vlc_object_t * p_this )
(void)p_this;
}
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
VLC_UNUSED(p_stream); VLC_UNUSED(p_fmt);
return malloc( 1 );
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
VLC_UNUSED(p_stream);
free( id );
......@@ -92,7 +92,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
(void)p_stream; (void)id;
......
......@@ -53,9 +53,9 @@ vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *,
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send( sout_stream_t *, sout_stream_id_sys_t *,
block_t* );
struct sout_stream_sys_t
......@@ -70,7 +70,7 @@ struct sout_stream_sys_t
char **ppsz_select;
};
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
int i_nb_ids;
void **pp_ids;
......@@ -183,13 +183,13 @@ static void Close( vlc_object_t * p_this )
/*****************************************************************************
* Add:
*****************************************************************************/
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
int i_stream, i_valid_streams = 0;
id = malloc( sizeof( sout_stream_id_t ) );
id = malloc( sizeof( sout_stream_id_sys_t ) );
if( !id )
return NULL;
......@@ -239,7 +239,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
/*****************************************************************************
* Del:
*****************************************************************************/
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
int i_stream;
......@@ -261,7 +261,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
/*****************************************************************************
* Send:
*****************************************************************************/
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
......@@ -119,9 +119,9 @@ static const char *const ppsz_sout_options[] = {
NULL
};
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
struct sout_stream_sys_t
{
......@@ -202,7 +202,7 @@ static void Close( vlc_object_t * p_this )
free( p_sys );
}
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
sout_input_t *p_input;
sout_mux_t *p_mux;
......@@ -269,10 +269,10 @@ static char * es_print_url( const char *psz_fmt, vlc_fourcc_t i_fourcc, int i_co
return( psz_dst );
}
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
const char *psz_access;
const char *psz_mux;
......@@ -384,7 +384,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
}
free( psz_dst );
id = malloc( sizeof( sout_stream_id_t ) );
id = malloc( sizeof( sout_stream_id_sys_t ) );
if( !id )
{
sout_MuxDelete( p_mux );
......@@ -408,7 +408,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
return id;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
VLC_UNUSED(p_stream);
sout_access_out_t *p_access = id->p_mux->p_access;
......@@ -423,7 +423,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
VLC_UNUSED(p_stream);
......
......@@ -50,11 +50,11 @@ vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
bool b_used;
......@@ -65,7 +65,7 @@ struct sout_stream_id_t
struct sout_stream_sys_t
{
int i_id;
sout_stream_id_t **id;
sout_stream_id_sys_t **id;
};
/*****************************************************************************
......@@ -105,7 +105,7 @@ static void Close( vlc_object_t * p_this )
for( i = 0; i < p_sys->i_id; i++ )
{
sout_stream_id_t *id = p_sys->id[i];
sout_stream_id_sys_t *id = p_sys->id[i];
sout_StreamIdDel( p_stream->p_next, id->id );
es_format_Clean( &id->fmt );
......@@ -119,10 +119,10 @@ static void Close( vlc_object_t * p_this )
/*****************************************************************************
* Add:
*****************************************************************************/
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
int i;
/* search a compatible output */
......@@ -174,7 +174,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
}
msg_Dbg( p_stream, "creating new output" );
id = malloc( sizeof( sout_stream_id_t ) );
id = malloc( sizeof( sout_stream_id_sys_t ) );
if( id == NULL )
return NULL;
es_format_Copy( &id->fmt, p_fmt );
......@@ -193,7 +193,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
/*****************************************************************************
* Del:
*****************************************************************************/
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
VLC_UNUSED(p_stream);
id->b_used = false;
......@@ -204,7 +204,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
* Send:
*****************************************************************************/
static int Send( sout_stream_t *p_stream,
sout_stream_id_t *id, block_t *p_buffer )
sout_stream_id_sys_t *id, block_t *p_buffer )
{
return sout_StreamIdSend( p_stream->p_next, id->id, p_buffer );
}
......@@ -84,15 +84,15 @@ static const char *ppsz_sout_options[] = {
"id", "magazine", "page", "row", NULL
};
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send ( sout_stream_t *, sout_stream_id_t *, block_t * );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send ( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
struct sout_stream_sys_t
{
int i_id, i_magazine, i_page, i_row;
char *psz_language, *psz_old_language;
sout_stream_id_t *p_id, *p_telx;
sout_stream_id_sys_t *p_id, *p_telx;
int i_current_page;
};
......@@ -143,7 +143,7 @@ static void Close( vlc_object_t * p_this )
free( p_sys );
}
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......@@ -173,7 +173,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
return p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......@@ -303,7 +303,7 @@ static void HandleTelx( sout_stream_t *p_stream, block_t *p_block )
/*****************************************************************************
* Send:
*****************************************************************************/
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......
......@@ -73,9 +73,9 @@ struct decoder_owner_sys_t
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t * );
static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_sys_t * );
static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
inline static void video_del_buffer_decoder( decoder_t *, picture_t * );
inline static void video_del_buffer_filter( filter_t *, picture_t * );
......@@ -282,7 +282,7 @@ static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data
return VLC_SUCCESS;
}
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;