Skip to content

V
vlc
Commit 5069e3d7 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 333 additions and 333 deletions
include/vlc_sout.h
View file @ 5069e3d7
......@@ -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 );
}
......
modules/stream_out/autodel.c
View file @ 5069e3d7
......@@ -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;
......
modules/stream_out/bridge.c
View file @ 5069e3d7
......@@ -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 )
......
modules/stream_out/chromaprint.c
View file @ 5069e3d7
......@@ -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;
......
modules/stream_out/delay.c
View file @ 5069e3d7
......@@ -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;
......
modules/stream_out/description.c
View file @ 5069e3d7
......@@ -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);
......
modules/stream_out/display.c
View file @ 5069e3d7
......@@ -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;
......
modules/stream_out/dummy.c
View file @ 5069e3d7
......@@ -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;
......
modules/stream_out/duplicate.c
View file @ 5069e3d7
......@@ -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;
......
modules/stream_out/es.c
View file @ 5069e3d7
......@@ -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);
......
modules/stream_out/gather.c
View file @ 5069e3d7
......@@ -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 );
}
modules/stream_out/langfromtelx.c
View file @ 5069e3d7
......@@ -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;
......
modules/stream_out/mosaic_bridge.c
View file @ 5069e3d7
......@@ -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;
bridge_t *p_bridge;
......@@ -416,10 +416,10 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
p_sys->p_vf2 = NULL;
}
return (sout_stream_id_t *)p_sys;
return (sout_stream_id_sys_t *)p_sys;
}
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(id);
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -510,7 +510,7 @@ static void PushPicture( sout_stream_t *p_stream, picture_t *p_picture )
vlc_global_unlock( VLC_MOSAIC_MUTEX );
}
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;
......
modules/stream_out/raop.c
View file @ 5069e3d7
......@@ -81,9 +81,9 @@ static const char psz_delim_semicolon[] = ";";
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* );
static int VolumeCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval,
......@@ -104,7 +104,7 @@ struct sout_stream_sys_t
int i_volume;
/* Plugin status */
sout_stream_id_t *p_audio_stream;
sout_stream_id_sys_t *p_audio_stream;
bool b_alac_warning;
bool b_volume_callback;
......@@ -133,7 +133,7 @@ struct sout_stream_sys_t
uint8_t *p_sendbuf;
};
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
es_format_t fmt;
};
......@@ -211,7 +211,7 @@ static void FreeSys( vlc_object_t *p_this, sout_stream_sys_t *p_sys )
free( p_sys );
}
static void FreeId( sout_stream_id_t *id )
static void FreeId( sout_stream_id_sys_t *id )
{
free( id );
}
......@@ -1563,10 +1563,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 = NULL;
sout_stream_id_sys_t *id = NULL;
id = calloc( 1, sizeof( *id ) );
if ( id == NULL )
......@@ -1624,7 +1624,7 @@ error:
/*****************************************************************************
* 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_err = VLC_SUCCESS;
......@@ -1641,7 +1641,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;
......
modules/stream_out/record.c
View file @ 5069e3d7
......@@ -75,19 +75,19 @@ static const char *const ppsz_sout_options[] = {
};
/* */
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
{
es_format_t fmt;
block_t *p_first;
block_t **pp_last;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
bool b_wait_key;
bool b_wait_start;
......@@ -108,12 +108,12 @@ struct sout_stream_sys_t
bool b_drop;
int i_id;
sout_stream_id_t **id;
sout_stream_id_sys_t **id;
mtime_t i_dts_start;
};
static void OutputStart( sout_stream_t *p_stream );
static void OutputSend( sout_stream_t *p_stream, sout_stream_id_t *id, block_t * );
static void OutputSend( sout_stream_t *p_stream, sout_stream_id_sys_t *id, block_t * );
/*****************************************************************************
* Open:
......@@ -180,10 +180,10 @@ static void Close( vlc_object_t * 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 )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
id = malloc( sizeof(*id) );
if( !id )
......@@ -201,7 +201,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 )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -230,7 +230,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 )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -349,7 +349,7 @@ static int OutputNew( sout_stream_t *p_stream,
i_count = 0;
for( int 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];
id->id = sout_StreamIdAdd( p_sys->p_out, &id->fmt );
if( id->id )
......@@ -466,7 +466,7 @@ static void OutputStart( sout_stream_t *p_stream )
/* */
for( int 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];
if( id->id )
sout_StreamIdDel( p_sys->p_out, id->id );
......@@ -506,7 +506,7 @@ static void OutputStart( sout_stream_t *p_stream )
p_sys->i_dts_start = 0;
for( int 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];
block_t *p_block;
if( !id->id || !id->p_first )
......@@ -529,7 +529,7 @@ static void OutputStart( sout_stream_t *p_stream )
/* Send buffered data */
for( int 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];
if( !id->id )
continue;
......@@ -551,7 +551,7 @@ static void OutputStart( sout_stream_t *p_stream )
}
}
static void OutputSend( sout_stream_t *p_stream, sout_stream_id_t *id, block_t *p_block )
static void OutputSend( sout_stream_t *p_stream, sout_stream_id_sys_t *id, block_t *p_block )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
modules/stream_out/rtp.c
View file @ 5069e3d7
......@@ -273,13 +273,13 @@ static const char *const ppsz_sout_options[] = {
"mp4a-latm", 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 *,
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* );
static sout_stream_id_t *MuxAdd ( sout_stream_t *, es_format_t * );
static int MuxDel ( sout_stream_t *, sout_stream_id_t * );
static int MuxSend( sout_stream_t *, sout_stream_id_t *,
static sout_stream_id_sys_t *MuxAdd ( sout_stream_t *, es_format_t * );
static int MuxDel ( sout_stream_t *, sout_stream_id_sys_t * );
static int MuxSend( sout_stream_t *, sout_stream_id_sys_t *,
block_t* );
static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout );
......@@ -342,7 +342,7 @@ struct sout_stream_sys_t
/* */
vlc_mutex_t lock_es;
int i_es;
sout_stream_id_t **es;
sout_stream_id_sys_t **es;
};
typedef struct rtp_sink_t
......@@ -351,7 +351,7 @@ typedef struct rtp_sink_t
rtcp_sender_t *rtcp;
} rtp_sink_t;
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
sout_stream_t *p_stream;
/* rtp field */
......@@ -630,7 +630,7 @@ static int Open( vlc_object_t *p_this )
if( p_sys->p_mux != NULL )
{
sout_stream_id_t *id = Add( p_stream, NULL );
sout_stream_id_sys_t *id = Add( p_stream, NULL );
if( id == NULL )
{
Close( p_this );
......@@ -866,7 +866,7 @@ char *SDPGenerate( sout_stream_t *p_stream, const char *rtsp_url )
for( i = 0; i < p_sys->i_es; i++ )
{
sout_stream_id_t *id = p_sys->es[i];
sout_stream_id_sys_t *id = p_sys->es[i];
rtp_format_t *rtp_fmt = &id->rtp_fmt;
const char *mime_major; /* major MIME type */
......@@ -926,7 +926,7 @@ out:
* Shrink the MTU down to a fixed packetization time (for audio).
*/
static void
rtp_set_ptime (sout_stream_id_t *id, unsigned ptime_ms, size_t bytes)
rtp_set_ptime (sout_stream_id_sys_t *id, unsigned ptime_ms, size_t bytes)
{
/* Samples per second */
size_t spl = (id->rtp_fmt.clock_rate - 1) * ptime_ms / 1000 + 1;
......@@ -952,14 +952,14 @@ uint32_t rtp_compute_ts( unsigned i_clock_rate, int64_t i_pts )
}
/** Add an ES as a new RTP stream */
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 )
{
/* NOTE: As a special case, if we use a non-RTP
* mux (TS/PS), then p_fmt is NULL. */
sout_stream_sys_t *p_sys = p_stream->p_sys;
char *psz_sdp;
sout_stream_id_t *id = malloc( sizeof( *id ) );
sout_stream_id_sys_t *id = malloc( sizeof( *id ) );
if( unlikely(id == NULL) )
return NULL;
id->p_stream = p_stream;
......@@ -1216,7 +1216,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;
......@@ -1262,7 +1262,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 )
{
block_t *p_next;
......@@ -1401,7 +1401,7 @@ static void* ThreadSend( void *data )
# define EAGAIN WSAEWOULDBLOCK
# define EWOULDBLOCK WSAEWOULDBLOCK
#endif
sout_stream_id_t *id = data;
sout_stream_id_sys_t *id = data;
unsigned i_caching = id->i_caching;
for (;;)
......@@ -1486,7 +1486,7 @@ static void* ThreadSend( void *data )
/* This thread dequeues incoming connections (DCCP streaming) */
static void *rtp_listen_thread( void *data )
{
sout_stream_id_t *id = data;
sout_stream_id_sys_t *id = data;
assert( id->listen.fd != NULL );
......@@ -1504,7 +1504,7 @@ static void *rtp_listen_thread( void *data )
}
int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux, uint16_t *seq )
int rtp_add_sink( sout_stream_id_sys_t *id, int fd, bool rtcp_mux, uint16_t *seq )
{
rtp_sink_t sink = { fd, NULL };
sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP,
......@@ -1520,7 +1520,7 @@ int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux, uint16_t *seq )
return VLC_SUCCESS;
}
void rtp_del_sink( sout_stream_id_t *id, int fd )
void rtp_del_sink( sout_stream_id_sys_t *id, int fd )
{
rtp_sink_t sink = { fd, NULL };
......@@ -1541,7 +1541,7 @@ void rtp_del_sink( sout_stream_id_t *id, int fd )
net_Close( sink.rtp_fd );
}
uint16_t rtp_get_seq( sout_stream_id_t *id )
uint16_t rtp_get_seq( sout_stream_id_sys_t *id )
{
/* This will return values for the next packet. */
uint16_t seq;
......@@ -1580,7 +1580,7 @@ static int64_t rtp_init_ts( const vod_media_t *p_media,
* Also return the NPT corresponding to this timestamp. If the stream
* output is not started, the initial timestamp that will be used with
* the first packets for NPT=0 is returned instead. */
int64_t rtp_get_ts( const sout_stream_t *p_stream, const sout_stream_id_t *id,
int64_t rtp_get_ts( const sout_stream_t *p_stream, const sout_stream_id_sys_t *id,
const vod_media_t *p_media, const char *psz_vod_session,
int64_t *p_npt )
{
......@@ -1613,7 +1613,7 @@ int64_t rtp_get_ts( const sout_stream_t *p_stream, const sout_stream_id_t *id,
return p_sys->i_pts_zero + npt;
}
void rtp_packetize_common( sout_stream_id_t *id, block_t *out,
void rtp_packetize_common( sout_stream_id_sys_t *id, block_t *out,
int b_marker, int64_t i_pts )
{
if( !id->b_ts_init )
......@@ -1655,7 +1655,7 @@ void rtp_packetize_common( sout_stream_id_t *id, block_t *out,
id->i_sequence++;
}
void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
void rtp_packetize_send( sout_stream_id_sys_t *id, block_t *out )
{
block_FifoPut( id->p_fifo, out );
}
......@@ -1664,7 +1664,7 @@ void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
* @return configured max RTP payload size (including payload type-specific
* headers, excluding RTP and transport headers)
*/
size_t rtp_mtu (const sout_stream_id_t *id)
size_t rtp_mtu (const sout_stream_id_sys_t *id)
{
return id->i_mtu - 12;
}
......@@ -1674,7 +1674,7 @@ size_t rtp_mtu (const sout_stream_id_t *id)
*****************************************************************************/
/** Add an ES to a non-RTP muxed stream */
static sout_stream_id_t *MuxAdd( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t *MuxAdd( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_input_t *p_input;
sout_mux_t *p_mux = p_stream->p_sys->p_mux;
......@@ -1687,11 +1687,11 @@ static sout_stream_id_t *MuxAdd( sout_stream_t *p_stream, es_format_t *p_fmt )
return NULL;
}
return (sout_stream_id_t *)p_input;
return (sout_stream_id_sys_t *)p_input;
}
static int MuxSend( sout_stream_t *p_stream, sout_stream_id_t *id,
static int MuxSend( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
sout_mux_t *p_mux = p_stream->p_sys->p_mux;
......@@ -1703,7 +1703,7 @@ static int MuxSend( sout_stream_t *p_stream, sout_stream_id_t *id,
/** Remove an ES from a non-RTP muxed stream */
static int MuxDel( sout_stream_t *p_stream, sout_stream_id_t *id )
static int MuxDel( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
sout_mux_t *p_mux = p_stream->p_sys->p_mux;
assert( p_mux != NULL );
......@@ -1717,7 +1717,7 @@ static ssize_t AccessOutGrabberWriteBuffer( sout_stream_t *p_stream,
const block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id = p_sys->es[0];
sout_stream_id_sys_t *id = p_sys->es[0];
int64_t i_dts = p_buffer->i_dts;
......
modules/stream_out/rtp.h
View file @ 5069e3d7
......@@ -29,7 +29,7 @@ rtsp_stream_t *RtspSetup( vlc_object_t *owner, vod_media_t *media,
const char *path );
void RtspUnsetup( rtsp_stream_t *rtsp );
rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_sys_t *sid,
uint32_t ssrc, unsigned clock_rate,
int mcast_fd );
void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t * );
......@@ -37,29 +37,29 @@ void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t * );
char *RtspAppendTrackPath( rtsp_stream_id_t *id, const char *base );
int RtspTrackAttach( rtsp_stream_t *rtsp, const char *name,
rtsp_stream_id_t *id, sout_stream_id_t *sout_id,
rtsp_stream_id_t *id, sout_stream_id_sys_t *sout_id,
uint32_t *ssrc, uint16_t *seq_init );
void RtspTrackDetach( rtsp_stream_t *rtsp, const char *name,
sout_stream_id_t *sout_id);
sout_stream_id_sys_t *sout_id);
char *SDPGenerate( sout_stream_t *p_stream, const char *rtsp_url );
char *SDPGenerateVoD( const vod_media_t *p_media, const char *rtsp_url );
uint32_t rtp_compute_ts( unsigned i_clock_rate, int64_t i_pts );
int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux, uint16_t *seq );
void rtp_del_sink( sout_stream_id_t *id, int fd );
uint16_t rtp_get_seq( sout_stream_id_t *id );
int64_t rtp_get_ts( const sout_stream_t *p_stream, const sout_stream_id_t *id,
int rtp_add_sink( sout_stream_id_sys_t *id, int fd, bool rtcp_mux, uint16_t *seq );
void rtp_del_sink( sout_stream_id_sys_t *id, int fd );
uint16_t rtp_get_seq( sout_stream_id_sys_t *id );
int64_t rtp_get_ts( const sout_stream_t *p_stream, const sout_stream_id_sys_t *id,
const vod_media_t *p_media, const char *psz_vod_session,
int64_t *p_npt );
/* RTP packetization */
void rtp_packetize_common (sout_stream_id_t *id, block_t *out,
void rtp_packetize_common (sout_stream_id_sys_t *id, block_t *out,
int b_marker, int64_t i_pts);
void rtp_packetize_send (sout_stream_id_t *id, block_t *out);
size_t rtp_mtu (const sout_stream_id_t *id);
void rtp_packetize_send (sout_stream_id_sys_t *id, block_t *out);
size_t rtp_mtu (const sout_stream_id_sys_t *id);
int rtp_packetize_xiph_config( sout_stream_id_t *id, const char *fmtp,
int rtp_packetize_xiph_config( sout_stream_id_sys_t *id, const char *fmtp,
int64_t i_pts );
/* RTCP */
......@@ -69,7 +69,7 @@ rtcp_sender_t *OpenRTCP (vlc_object_t *obj, int rtp_fd, int proto,
void CloseRTCP (rtcp_sender_t *rtcp);
void SendRTCP (rtcp_sender_t *restrict rtcp, const block_t *rtp);
typedef int (*pf_rtp_packetizer_t)( sout_stream_id_t *, block_t * );
typedef int (*pf_rtp_packetizer_t)( sout_stream_id_sys_t *, block_t * );
typedef struct rtp_format_t
{
......@@ -102,8 +102,8 @@ void vod_stop(vod_media_t *p_media, const char *psz_session);
const char *vod_get_mux(const vod_media_t *p_media);
int vod_init_id(vod_media_t *p_media, const char *psz_session, int es_id,
sout_stream_id_t *sout_id, rtp_format_t *rtp_fmt,
sout_stream_id_sys_t *sout_id, rtp_format_t *rtp_fmt,
uint32_t *ssrc, uint16_t *seq_init);
void vod_detach_id(vod_media_t *p_media, const char *psz_session,
sout_stream_id_t *sout_id);
sout_stream_id_sys_t *sout_id);
modules/stream_out/rtpfmt.c
View file @ 5069e3d7
This diff is collapsed.
modules/stream_out/rtsp.c
View file @ 5069e3d7
......@@ -170,7 +170,7 @@ void RtspUnsetup( rtsp_stream_t *rtsp )
struct rtsp_stream_id_t
{
rtsp_stream_t *stream;
sout_stream_id_t *sout_id;
sout_stream_id_sys_t *sout_id;
httpd_url_t *url;
unsigned track_id;
uint32_t ssrc;
......@@ -198,7 +198,7 @@ struct rtsp_session_t
struct rtsp_strack_t
{
rtsp_stream_id_t *id;
sout_stream_id_t *sout_id;
sout_stream_id_sys_t *sout_id;
int setup_fd; /* socket created by the SETUP request */
int rtp_fd; /* socket used by the RTP output, when playing */
uint32_t ssrc;
......@@ -221,7 +221,7 @@ char *RtspAppendTrackPath( rtsp_stream_id_t *id, const char *base )
}
rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_sys_t *sid,
uint32_t ssrc, unsigned clock_rate,
int mcast_fd)
{
......@@ -436,7 +436,7 @@ static int dup_socket(int oldfd)
/* Attach a starting VoD RTP id to its RTSP track, and let it
* initialize with the parameters of the SETUP request */
int RtspTrackAttach( rtsp_stream_t *rtsp, const char *name,
rtsp_stream_id_t *id, sout_stream_id_t *sout_id,
rtsp_stream_id_t *id, sout_stream_id_sys_t *sout_id,
uint32_t *ssrc, uint16_t *seq_init )
{
int val = VLC_EGENERIC;
......@@ -498,7 +498,7 @@ out:
/* Remove references to the RTP id when it is stopped */
void RtspTrackDetach( rtsp_stream_t *rtsp, const char *name,
sout_stream_id_t *sout_id )
sout_stream_id_sys_t *sout_id )
{
rtsp_session_t *session;
......@@ -989,7 +989,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
size_t infolen = 0;
RtspClientAlive(ses);
sout_stream_id_t *sout_id = NULL;
sout_stream_id_sys_t *sout_id = NULL;
if (vod)
{
/* We don't keep a reference to the sout_stream_t,
......
modules/stream_out/setid.c
View file @ 5069e3d7
......@@ -95,10 +95,10 @@ static const char *ppsz_sout_options_lang[] = {
"id", "lang", NULL
};
static sout_stream_id_t *AddId ( sout_stream_t *, es_format_t * );
static sout_stream_id_t *AddLang ( 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 *AddId ( sout_stream_t *, es_format_t * );
static sout_stream_id_sys_t *AddLang ( 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
{
......@@ -185,7 +185,7 @@ static void Close( vlc_object_t * p_this )
free( p_sys );
}
static sout_stream_id_t * AddId( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * AddId( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......@@ -199,7 +199,7 @@ static sout_stream_id_t * AddId( sout_stream_t *p_stream, es_format_t *p_fmt )
return p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
}
static sout_stream_id_t * AddLang( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t * AddLang( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......@@ -214,12 +214,12 @@ static sout_stream_id_t * AddLang( 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 )
{
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 )
{
return p_stream->p_next->pf_send( p_stream->p_next, id, p_buffer );
......
modules/stream_out/smem.c
View file @ 5069e3d7
......@@ -125,19 +125,19 @@ static const char *const ppsz_sout_options[] = {
"video-postrender-callback", "audio-postrender-callback", "video-data", "audio-data", "time-sync", 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* );
static sout_stream_id_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt );
static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt );
static sout_stream_id_sys_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt );
static sout_stream_id_sys_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt );
static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id,
static int SendVideo( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer );
static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
static int SendAudio( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer );
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
es_format_t* format;
void *p_data;
......@@ -206,9 +206,9 @@ static void Close( vlc_object_t * p_this )
free( p_stream->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_id_t *id = NULL;
sout_stream_id_sys_t *id = NULL;
if ( p_fmt->i_cat == VIDEO_ES )
id = AddVideo( p_stream, p_fmt );
......@@ -217,10 +217,10 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
return id;
}
static sout_stream_id_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt )
{
char* psz_tmp;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
int i_bits_per_pixel;
switch( p_fmt->i_codec )
......@@ -253,7 +253,7 @@ static sout_stream_id_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt )
break;
}
id = calloc( 1, sizeof( sout_stream_id_t ) );
id = calloc( 1, sizeof( sout_stream_id_sys_t ) );
if( !id )
return NULL;
......@@ -266,10 +266,10 @@ static sout_stream_id_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt )
return id;
}
static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_sys_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt )
{
char* psz_tmp;
sout_stream_id_t* id;
sout_stream_id_sys_t* id;
int i_bits_per_sample = aout_BitsPerSample( p_fmt->i_codec );
if( !i_bits_per_sample )
......@@ -278,7 +278,7 @@ static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt )
return NULL;
}
id = calloc( 1, sizeof( sout_stream_id_t ) );
id = calloc( 1, sizeof( sout_stream_id_sys_t ) );
if( !id )
return NULL;
......@@ -291,14 +291,14 @@ static sout_stream_id_t *AddAudio( 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 );
free( 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 )
{
if ( id->format->i_cat == VIDEO_ES )
......@@ -308,7 +308,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
return VLC_SUCCESS;
}
static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id,
static int SendVideo( 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;
......@@ -362,7 +362,7 @@ static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id,
return VLC_SUCCESS;
}
static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
static int SendAudio( 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;
......
modules/stream_out/standard.c
View file @ 5069e3d7
......@@ -128,22 +128,22 @@ struct sout_stream_sys_t
session_descriptor_t *p_session;
};
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
};
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 )
{
return (sout_stream_id_t*)sout_MuxAddStream( p_stream->p_sys->p_mux, p_fmt );
return (sout_stream_id_sys_t*)sout_MuxAddStream( p_stream->p_sys->p_mux, 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_MuxDeleteStream( p_stream->p_sys->p_mux, (sout_input_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_MuxSendBuffer( p_stream->p_sys->p_mux, (sout_input_t*)id, p_buffer );
......
modules/stream_out/stats.c
View file @ 5069e3d7
......@@ -67,9 +67,9 @@ static const char *ppsz_sout_options[] = {
"output", "prefix", 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
{
......@@ -77,7 +77,7 @@ struct sout_stream_sys_t
char *prefix;
};
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
int id;
uint64_t segment_number;
......@@ -146,12 +146,12 @@ 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 *id;
sout_stream_id_sys_t *id;
id = malloc( sizeof( sout_stream_id_t ) );
id = malloc( sizeof( sout_stream_id_sys_t ) );
if( unlikely( !id ) )
return NULL;
......@@ -184,7 +184,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 )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......@@ -206,7 +206,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 )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
......
modules/stream_out/transcode/audio.c
View file @ 5069e3d7
......@@ -52,7 +52,7 @@ static int audio_update_format( decoder_t *p_dec )
return 0;
}
static int transcode_audio_initialize_filters( sout_stream_t *p_stream, sout_stream_id_t *id,
static int transcode_audio_initialize_filters( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
sout_stream_sys_t *p_sys, audio_sample_format_t *fmt_last )
{
/* Load user specified audio filters */
......@@ -79,7 +79,7 @@ static int transcode_audio_initialize_filters( sout_stream_t *p_stream, sout_str
return VLC_SUCCESS;
}
static int transcode_audio_initialize_encoder( sout_stream_id_t *id, sout_stream_t *p_stream )
static int transcode_audio_initialize_encoder( sout_stream_id_sys_t *id, sout_stream_t *p_stream )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
/* Initialization of encoder format structures */
......@@ -125,7 +125,7 @@ static int transcode_audio_initialize_encoder( sout_stream_id_t *id, sout_stream
}
int transcode_audio_new( sout_stream_t *p_stream,
sout_stream_id_t *id )
sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
audio_sample_format_t fmt_last;
......@@ -171,7 +171,7 @@ int transcode_audio_new( sout_stream_t *p_stream,
return VLC_SUCCESS;
}
void transcode_audio_close( sout_stream_id_t *id )
void transcode_audio_close( sout_stream_id_sys_t *id )
{
/* Close decoder */
if( id->p_decoder->p_module )
......@@ -193,7 +193,7 @@ void transcode_audio_close( sout_stream_id_t *id )
}
int transcode_audio_process( sout_stream_t *p_stream,
sout_stream_id_t *id,
sout_stream_id_sys_t *id,
block_t *in, block_t **out )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -308,7 +308,7 @@ int transcode_audio_process( sout_stream_t *p_stream,
}
bool transcode_audio_add( sout_stream_t *p_stream, es_format_t *p_fmt,
sout_stream_id_t *id )
sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
modules/stream_out/transcode/osd.c
View file @ 5069e3d7
......@@ -36,7 +36,7 @@
/*
* OSD menu
*/
int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -97,7 +97,7 @@ int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
return VLC_EGENERIC;
}
void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_sys_t *id)
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -110,7 +110,7 @@ void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
p_sys->b_osd = false;
}
int transcode_osd_process( sout_stream_t *p_stream, sout_stream_id_t *id,
int transcode_osd_process( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *in, block_t **out )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -154,7 +154,7 @@ int transcode_osd_process( sout_stream_t *p_stream, sout_stream_id_t *id,
}
bool transcode_osd_add( sout_stream_t *p_stream, es_format_t *p_fmt,
sout_stream_id_t *id)
sout_stream_id_sys_t *id)
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
modules/stream_out/transcode/spu.c
View file @ 5069e3d7
......@@ -49,7 +49,7 @@ static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
VLC_UNUSED( p_dec );
subpicture_Delete( p_subpic );
}
int transcode_spu_new( sout_stream_t *p_stream, sout_stream_id_t *id )
int transcode_spu_new( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -99,7 +99,7 @@ int transcode_spu_new( sout_stream_t *p_stream, sout_stream_id_t *id )
return VLC_SUCCESS;
}
void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_sys_t *id)
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
/* Close decoder */
......@@ -120,7 +120,7 @@ void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
}
int transcode_spu_process( sout_stream_t *p_stream,
sout_stream_id_t *id,
sout_stream_id_sys_t *id,
block_t *in, block_t **out )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -158,7 +158,7 @@ int transcode_spu_process( sout_stream_t *p_stream,
}
bool transcode_spu_add( sout_stream_t *p_stream, es_format_t *p_fmt,
sout_stream_id_t *id )
sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
modules/stream_out/transcode/transcode.c
View file @ 5069e3d7
......@@ -241,9 +241,9 @@ static const char *const ppsz_sout_options[] = {
/*****************************************************************************
* 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* );
/*****************************************************************************
* Open:
......@@ -511,12 +511,12 @@ 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;
id = calloc( 1, sizeof( sout_stream_id_t ) );
id = calloc( 1, sizeof( sout_stream_id_sys_t ) );
if( !id )
goto error;
......@@ -595,7 +595,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;
......@@ -639,7 +639,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 )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
modules/stream_out/transcode/transcode.h
View file @ 5069e3d7
......@@ -16,7 +16,7 @@
struct sout_stream_sys_t
{
sout_stream_id_t *id_video;
sout_stream_id_sys_t *id_video;
block_t *p_buffers;
vlc_mutex_t lock_out;
vlc_cond_t cond;
......@@ -77,7 +77,7 @@ struct sout_stream_sys_t
struct aout_filters;
struct sout_stream_id_t
struct sout_stream_id_sys_t
{
bool b_transcode;
......@@ -109,34 +109,34 @@ struct sout_stream_id_t
/* OSD */
int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id );
void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id);
int transcode_osd_process( sout_stream_t *p_stream, sout_stream_id_t *id,
int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_sys_t *id );
void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_sys_t *id);
int transcode_osd_process( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *in, block_t **out );
bool transcode_osd_add ( sout_stream_t *, es_format_t *, sout_stream_id_t *);
bool transcode_osd_add ( sout_stream_t *, es_format_t *, sout_stream_id_sys_t *);
/* SPU */
int transcode_spu_new ( sout_stream_t *, sout_stream_id_t * );
void transcode_spu_close ( sout_stream_t *, sout_stream_id_t * );
int transcode_spu_process( sout_stream_t *, sout_stream_id_t *,
int transcode_spu_new ( sout_stream_t *, sout_stream_id_sys_t * );
void transcode_spu_close ( sout_stream_t *, sout_stream_id_sys_t * );
int transcode_spu_process( sout_stream_t *, sout_stream_id_sys_t *,
block_t *, block_t ** );
bool transcode_spu_add ( sout_stream_t *, es_format_t *, sout_stream_id_t *);
bool transcode_spu_add ( sout_stream_t *, es_format_t *, sout_stream_id_sys_t *);
/* AUDIO */
int transcode_audio_new ( sout_stream_t *, sout_stream_id_t * );
void transcode_audio_close ( sout_stream_id_t * );
int transcode_audio_process( sout_stream_t *, sout_stream_id_t *,
int transcode_audio_new ( sout_stream_t *, sout_stream_id_sys_t * );
void transcode_audio_close ( sout_stream_id_sys_t * );
int transcode_audio_process( sout_stream_t *, sout_stream_id_sys_t *,
block_t *, block_t ** );
bool transcode_audio_add ( sout_stream_t *, es_format_t *,
sout_stream_id_t *);
sout_stream_id_sys_t *);
/* VIDEO */
int transcode_video_new ( sout_stream_t *, sout_stream_id_t * );
void transcode_video_close ( sout_stream_t *, sout_stream_id_t * );
int transcode_video_process( sout_stream_t *, sout_stream_id_t *,
int transcode_video_new ( sout_stream_t *, sout_stream_id_sys_t * );
void transcode_video_close ( sout_stream_t *, sout_stream_id_sys_t * );
int transcode_video_process( sout_stream_t *, sout_stream_id_sys_t *,
block_t *, block_t ** );
bool transcode_video_add ( sout_stream_t *, es_format_t *,
sout_stream_id_t *);
sout_stream_id_sys_t *);
modules/stream_out/transcode/video.c
View file @ 5069e3d7
......@@ -100,7 +100,7 @@ static void transcode_video_filter_allocation_clear( filter_t *p_filter )
static void* EncoderThread( void *obj )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t*)obj;
sout_stream_id_t *id = p_sys->id_video;
sout_stream_id_sys_t *id = p_sys->id_video;
picture_t *p_pic = NULL;
int canc = vlc_savecancel ();
block_t *p_block = NULL;
......@@ -164,7 +164,7 @@ static void* EncoderThread( void *obj )
return NULL;
}
int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -298,7 +298,7 @@ int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
}
static void transcode_video_filter_init( sout_stream_t *p_stream,
sout_stream_id_t *id )
sout_stream_id_sys_t *id )
{
es_format_t *p_fmt_out = &id->p_decoder->fmt_out;
id->p_encoder->fmt_in.video.i_chroma = id->p_encoder->fmt_in.i_codec;
......@@ -360,7 +360,7 @@ static void transcode_video_filter_init( sout_stream_t *p_stream,
}
/* Take care of the scaling and chroma conversions. */
static void conversion_video_filter_append( sout_stream_id_t *id )
static void conversion_video_filter_append( sout_stream_id_sys_t *id )
{
const es_format_t *p_fmt_out = &id->p_decoder->fmt_out;
if( id->p_f_chain )
......@@ -381,7 +381,7 @@ static void conversion_video_filter_append( sout_stream_id_t *id )
}
static void transcode_video_encoder_init( sout_stream_t *p_stream,
sout_stream_id_t *id )
sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -585,7 +585,7 @@ static void transcode_video_encoder_init( sout_stream_t *p_stream,
}
static int transcode_video_encoder_open( sout_stream_t *p_stream,
sout_stream_id_t *id )
sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -621,7 +621,7 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream,
}
void transcode_video_close( sout_stream_t *p_stream,
sout_stream_id_t *id )
sout_stream_id_sys_t *id )
{
if( p_stream->p_sys->i_threads >= 1 )
{
......@@ -658,7 +658,7 @@ void transcode_video_close( sout_stream_t *p_stream,
filter_chain_Delete( id->p_uf_chain );
}
static void OutputFrame( sout_stream_sys_t *p_sys, picture_t *p_pic, sout_stream_t *p_stream, sout_stream_id_t *id, block_t **out )
static void OutputFrame( sout_stream_sys_t *p_sys, picture_t *p_pic, sout_stream_t *p_stream, sout_stream_id_sys_t *id, block_t **out )
{
picture_t *p_pic2 = NULL;
......@@ -792,7 +792,7 @@ static void OutputFrame( sout_stream_sys_t *p_sys, picture_t *p_pic, sout_stream
picture_Release( p_pic );
}
int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,
int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *in, block_t **out )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......@@ -967,7 +967,7 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,
}
bool transcode_video_add( sout_stream_t *p_stream, es_format_t *p_fmt,
sout_stream_id_t *id )
sout_stream_id_sys_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
modules/stream_out/vod.c
View file @ 5069e3d7
......@@ -505,7 +505,7 @@ const char *vod_get_mux(const vod_media_t *p_media)
/* Match an RTP id to a VoD media ES and RTSP track to initialize it
* with the data that was already set up */
int vod_init_id(vod_media_t *p_media, const char *psz_session, int es_id,
sout_stream_id_t *sout_id, rtp_format_t *rtp_fmt,
sout_stream_id_sys_t *sout_id, rtp_format_t *rtp_fmt,
uint32_t *ssrc, uint16_t *seq_init)
{
media_es_t *p_es;
......@@ -541,7 +541,7 @@ int vod_init_id(vod_media_t *p_media, const char *psz_session, int es_id,
/* Remove references to the RTP id from its RTSP track */
void vod_detach_id(vod_media_t *p_media, const char *psz_session,
sout_stream_id_t *sout_id)
sout_stream_id_sys_t *sout_id)
{
RtspTrackDetach(p_media->rtsp, psz_session, sout_id);
}
......
src/stream_output/stream_output.h
View file @ 5069e3d7
......@@ -39,7 +39,7 @@ struct sout_packetizer_input_t
es_format_t *p_fmt;
sout_stream_id_t *id;
sout_stream_id_sys_t *id;
};
sout_instance_t *sout_NewInstance( vlc_object_t *, const char * );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment