From 21dfee9de8ebccda05a8c8d41182df41e505db20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 21 Feb 2015 12:18:43 +0200 Subject: [PATCH] sout: constify format parameter to sout_stream_t.pf_add --- include/vlc_sout.h | 13 +++++++++---- modules/stream_out/autodel.c | 5 +++-- modules/stream_out/bridge.c | 8 ++++---- modules/stream_out/chromaprint.c | 4 ++-- modules/stream_out/chromecast/cast.cpp | 2 +- modules/stream_out/cycle.c | 2 +- modules/stream_out/delay.c | 4 ++-- modules/stream_out/description.c | 4 ++-- modules/stream_out/display.c | 4 ++-- modules/stream_out/dummy.c | 4 ++-- modules/stream_out/duplicate.c | 8 ++++---- modules/stream_out/es.c | 4 ++-- modules/stream_out/gather.c | 4 ++-- modules/stream_out/langfromtelx.c | 20 +++++++++++--------- modules/stream_out/mosaic_bridge.c | 4 ++-- modules/stream_out/raop.c | 4 ++-- modules/stream_out/record.c | 4 ++-- modules/stream_out/rtp.c | 10 ++++++---- modules/stream_out/setid.c | 10 +++++----- modules/stream_out/smem.c | 17 +++++++++++------ modules/stream_out/standard.c | 2 +- modules/stream_out/stats.c | 4 ++-- modules/stream_out/transcode/transcode.c | 5 +++-- 23 files changed, 81 insertions(+), 65 deletions(-) diff --git a/include/vlc_sout.h b/include/vlc_sout.h index 467c4271e4..efc1e2ffbf 100644 --- a/include/vlc_sout.h +++ b/include/vlc_sout.h @@ -186,7 +186,7 @@ struct sout_stream_t sout_stream_t *p_next; /* add, remove a stream */ - sout_stream_id_sys_t *(*pf_add)( sout_stream_t *, es_format_t * ); + sout_stream_id_sys_t *(*pf_add)( sout_stream_t *, const es_format_t * ); void (*pf_del)( sout_stream_t *, sout_stream_id_sys_t * ); /* manage a packet */ int (*pf_send)( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -199,15 +199,20 @@ 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_sys_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt ) +static inline sout_stream_id_sys_t *sout_StreamIdAdd( sout_stream_t *s, + const es_format_t *fmt ) { return s->pf_add( s, fmt ); } -static inline void sout_StreamIdDel( sout_stream_t *s, sout_stream_id_sys_t *id ) + +static inline void sout_StreamIdDel( sout_stream_t *s, + sout_stream_id_sys_t *id ) { s->pf_del( s, id ); } -static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_sys_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 ); } diff --git a/modules/stream_out/autodel.c b/modules/stream_out/autodel.c index b7c03cd0e7..91f95e3bb8 100644 --- a/modules/stream_out/autodel.c +++ b/modules/stream_out/autodel.c @@ -54,7 +54,7 @@ vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send ( sout_stream_t *, sout_stream_id_sys_t *, block_t * ); @@ -111,7 +111,8 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, + const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; sout_stream_id_sys_t *p_es = malloc( sizeof(sout_stream_id_sys_t) ); diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c index 3999bae94a..6ee5448893 100644 --- a/modules/stream_out/bridge.c +++ b/modules/stream_out/bridge.c @@ -140,11 +140,11 @@ static const char *const ppsz_sout_options_in[] = { NULL }; -static sout_stream_id_sys_t *AddOut ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *AddOut( sout_stream_t *, const es_format_t * ); static void 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_sys_t *AddIn ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *AddIn( sout_stream_t *, const es_format_t * ); static void DelIn ( sout_stream_t *, sout_stream_id_sys_t * ); static int SendIn( sout_stream_t *, sout_stream_id_sys_t *, block_t * ); @@ -233,7 +233,7 @@ static void CloseOut( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * AddOut( sout_stream_t *p_stream, const 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; @@ -451,7 +451,7 @@ struct sout_stream_id_sys_t int i_cat; /* es category. Used for placeholder option */ }; -static sout_stream_id_sys_t * AddIn( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * AddIn( sout_stream_t *p_stream, const es_format_t *p_fmt ) { in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys; diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c index fc9e2fea5a..3a093a36ab 100644 --- a/modules/stream_out/chromaprint.c +++ b/modules/stream_out/chromaprint.c @@ -47,7 +47,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -160,7 +160,7 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_sys_t *id = NULL; diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp index 94e7fab804..f568150819 100644 --- a/modules/stream_out/chromecast/cast.cpp +++ b/modules/stream_out/chromecast/cast.cpp @@ -175,7 +175,7 @@ vlc_module_end () /***************************************************************************** * Sout callbacks *****************************************************************************/ -static sout_stream_id_sys_t *Add(sout_stream_t *p_stream, es_format_t *p_fmt) +static sout_stream_id_sys_t *Add(sout_stream_t *p_stream, const es_format_t *p_fmt) { sout_stream_sys_t *p_sys = p_stream->p_sys; return p_sys->p_out->pf_add(p_sys->p_out, p_fmt); diff --git a/modules/stream_out/cycle.c b/modules/stream_out/cycle.c index 50bc885741..9678bc5591 100644 --- a/modules/stream_out/cycle.c +++ b/modules/stream_out/cycle.c @@ -69,7 +69,7 @@ static mtime_t get_dts(const block_t *block) return block->i_dts; } -static sout_stream_id_sys_t *Add(sout_stream_t *stream, es_format_t *fmt) +static sout_stream_id_sys_t *Add(sout_stream_t *stream, const es_format_t *fmt) { sout_stream_sys_t *sys = stream->p_sys; sout_stream_id_sys_t *id = malloc(sizeof (*id)); diff --git a/modules/stream_out/delay.c b/modules/stream_out/delay.c index 5f1c4f1f83..340694a2c0 100644 --- a/modules/stream_out/delay.c +++ b/modules/stream_out/delay.c @@ -72,7 +72,7 @@ static const char *ppsz_sout_options[] = { "id", "delay", NULL }; -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send ( sout_stream_t *, sout_stream_id_sys_t *, block_t * ); @@ -128,7 +128,7 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c index 847bc648bc..bf77ba3a33 100644 --- a/modules/stream_out/description.c +++ b/modules/stream_out/description.c @@ -43,7 +43,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add ( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -104,7 +104,7 @@ static void Close( vlc_object_t *p_this ) free( p_sys ); } -static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; es_format_t *p_fmt_copy = malloc( sizeof( *p_fmt_copy ) ); diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c index c332a23251..246fd3ba8b 100644 --- a/modules/stream_out/display.c +++ b/modules/stream_out/display.c @@ -74,7 +74,7 @@ static const char *const ppsz_sout_options[] = { "audio", "video", "delay", NULL }; -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -136,7 +136,7 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c index 77b19d24a4..a4e105b978 100644 --- a/modules/stream_out/dummy.c +++ b/modules/stream_out/dummy.c @@ -39,7 +39,7 @@ *****************************************************************************/ static int Open ( vlc_object_t * ); -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -69,7 +69,7 @@ static int Open( vlc_object_t *p_this ) return VLC_SUCCESS; } -static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { VLC_UNUSED(p_stream); VLC_UNUSED(p_fmt); return malloc( 1 ); diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c index 9957fbface..a59d679c5b 100644 --- a/modules/stream_out/duplicate.c +++ b/modules/stream_out/duplicate.c @@ -53,7 +53,7 @@ vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -76,7 +76,7 @@ struct sout_stream_id_sys_t void **pp_ids; }; -static bool ESSelected( es_format_t *fmt, char *psz_select ); +static bool ESSelected( const es_format_t *fmt, char *psz_select ); /***************************************************************************** * Open: @@ -183,7 +183,7 @@ static void Close( vlc_object_t * p_this ) /***************************************************************************** * Add: *****************************************************************************/ -static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_sys_t *id; @@ -328,7 +328,7 @@ static bool NumInRange( const char *psz_range, int i_num ) return i_start <= i_num && i_num <= i_stop; } -static bool ESSelected( es_format_t *fmt, char *psz_select ) +static bool ESSelected( const es_format_t *fmt, char *psz_select ) { char *psz_dup; char *psz; diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c index 14a0165d7e..0eb79902bd 100644 --- a/modules/stream_out/es.c +++ b/modules/stream_out/es.c @@ -119,7 +119,7 @@ static const char *const ppsz_sout_options[] = { NULL }; -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -269,7 +269,7 @@ static char * es_print_url( const char *psz_fmt, vlc_fourcc_t i_fourcc, int i_co return( psz_dst ); } -static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_sys_t *id; diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c index 6d9dcb6080..2adfbab332 100644 --- a/modules/stream_out/gather.c +++ b/modules/stream_out/gather.c @@ -51,7 +51,7 @@ vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add ( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -121,7 +121,7 @@ static void Close( vlc_object_t * p_this ) /***************************************************************************** * Add: *****************************************************************************/ -static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_sys_t *id; diff --git a/modules/stream_out/langfromtelx.c b/modules/stream_out/langfromtelx.c index a24c16fd91..15b21ecfb0 100644 --- a/modules/stream_out/langfromtelx.c +++ b/modules/stream_out/langfromtelx.c @@ -146,9 +146,13 @@ static void Close( vlc_object_t * p_this ) 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_sys_t *id; + es_format_t fmt; if ( p_fmt->i_id == p_sys->i_id ) { + fmt = *p_fmt; + p_sys->psz_old_language = p_fmt->psz_language; msg_Dbg( p_stream, "changing language of ID %d (magazine %d page %x row %d)", @@ -159,18 +163,16 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) else strcpy( p_fmt->psz_language, "unk" ); p_fmt->psz_language[3] = '\0'; - - p_sys->p_id = p_stream->p_next->pf_add( p_stream->p_next, p_fmt ); - return p_sys->p_id; } - if ( p_fmt->i_codec == VLC_CODEC_TELETEXT ) - { - p_sys->p_telx = p_stream->p_next->pf_add( p_stream->p_next, p_fmt ); - return p_sys->p_telx; - } + id = sout_StreamIdAdd( p_stream->p_next, p_fmt ); + + if( p_fmt->i_id == p_sys->i_id ) + p_sys->p_id = id; + if( p_fmt->i_codec == VLC_CODEC_TELETEXT ) + p_sys->p_telx = id; - return p_stream->p_next->pf_add( p_stream->p_next, p_fmt ); + return id; } static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id ) diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index 034c6b5408..825de384b1 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -73,7 +73,7 @@ struct decoder_owner_sys_t *****************************************************************************/ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t * ); @@ -269,7 +269,7 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; bridge_t *p_bridge; diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c index 2260773b75..dca5fe3669 100644 --- a/modules/stream_out/raop.c +++ b/modules/stream_out/raop.c @@ -81,7 +81,7 @@ static const char psz_delim_semicolon[] = ";"; static int Open( vlc_object_t * ); static void Close( vlc_object_t * ); -static sout_stream_id_sys_t *Add( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -1560,7 +1560,7 @@ static void Close( vlc_object_t *p_this ) /***************************************************************************** * Add: *****************************************************************************/ -static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_sys_t *id = NULL; diff --git a/modules/stream_out/record.c b/modules/stream_out/record.c index 27147328ad..289092e9aa 100644 --- a/modules/stream_out/record.c +++ b/modules/stream_out/record.c @@ -75,7 +75,7 @@ static const char *const ppsz_sout_options[] = { }; /* */ -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -180,7 +180,7 @@ static void Close( vlc_object_t * p_this ) /***************************************************************************** * *****************************************************************************/ -static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_sys_t *id; diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 0d0e5e61fc..1c0b1c27fa 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -273,11 +273,11 @@ static const char *const ppsz_sout_options[] = { "mp4a-latm", NULL }; -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void 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_sys_t *MuxAdd ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *MuxAdd( sout_stream_t *, const es_format_t * ); static void MuxDel ( sout_stream_t *, sout_stream_id_sys_t * ); static int MuxSend( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -953,7 +953,8 @@ 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_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, + const es_format_t *p_fmt ) { /* NOTE: As a special case, if we use a non-RTP * mux (TS/PS), then p_fmt is NULL. */ @@ -1676,7 +1677,8 @@ size_t rtp_mtu (const sout_stream_id_sys_t *id) *****************************************************************************/ /** Add an ES to a non-RTP muxed stream */ -static sout_stream_id_sys_t *MuxAdd( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *MuxAdd( sout_stream_t *p_stream, + const es_format_t *p_fmt ) { sout_input_t *p_input; sout_mux_t *p_mux = p_stream->p_sys->p_mux; diff --git a/modules/stream_out/setid.c b/modules/stream_out/setid.c index e42640e605..e06d29879f 100644 --- a/modules/stream_out/setid.c +++ b/modules/stream_out/setid.c @@ -95,8 +95,8 @@ static const char *ppsz_sout_options_lang[] = { "id", "lang", NULL }; -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 sout_stream_id_sys_t *AddId ( sout_stream_t *, const es_format_t * ); +static sout_stream_id_sys_t *AddLang( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send ( sout_stream_t *, sout_stream_id_sys_t *, block_t * ); @@ -185,12 +185,12 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t * AddId( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * AddId( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; es_format_t fmt; - if ( p_fmt->i_id == p_sys->i_id ) + if( p_fmt->i_id == p_sys->i_id ) { msg_Dbg( p_stream, "turning ID %d to %d", p_sys->i_id, p_sys->i_new_id ); @@ -203,7 +203,7 @@ static sout_stream_id_sys_t * AddId( sout_stream_t *p_stream, es_format_t *p_fmt return sout_StreamIdAdd( p_stream->p_next, p_fmt ); } -static sout_stream_id_sys_t * AddLang( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * AddLang( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; es_format_t fmt; diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c index 7bf9755419..a5fb1ee9d5 100644 --- a/modules/stream_out/smem.c +++ b/modules/stream_out/smem.c @@ -125,12 +125,14 @@ static const char *const ppsz_sout_options[] = { "video-postrender-callback", "audio-postrender-callback", "video-data", "audio-data", "time-sync", NULL }; -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void 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_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 sout_stream_id_sys_t *AddVideo( sout_stream_t *p_stream, + const es_format_t *p_fmt ); +static sout_stream_id_sys_t *AddAudio( sout_stream_t *p_stream, + const es_format_t *p_fmt ); static int SendVideo( sout_stream_t *p_stream, sout_stream_id_sys_t *id, block_t *p_buffer ); @@ -206,7 +208,8 @@ static void Close( vlc_object_t * p_this ) free( p_stream->p_sys ); } -static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, + const es_format_t *p_fmt ) { sout_stream_id_sys_t *id = NULL; @@ -217,7 +220,8 @@ static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) return id; } -static sout_stream_id_sys_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *AddVideo( sout_stream_t *p_stream, + const es_format_t *p_fmt ) { char* psz_tmp; sout_stream_id_sys_t *id; @@ -266,7 +270,8 @@ static sout_stream_id_sys_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_f return id; } -static sout_stream_id_sys_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *AddAudio( sout_stream_t *p_stream, + const es_format_t *p_fmt ) { char* psz_tmp; sout_stream_id_sys_t* id; diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 5b8ce1023b..c86adf910d 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -128,7 +128,7 @@ struct sout_stream_sys_t session_descriptor_t *p_session; }; -static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { return (sout_stream_id_sys_t*)sout_MuxAddStream( p_stream->p_sys->p_mux, p_fmt ); } diff --git a/modules/stream_out/stats.c b/modules/stream_out/stats.c index 996f1eca1a..8d2ac27386 100644 --- a/modules/stream_out/stats.c +++ b/modules/stream_out/stats.c @@ -67,7 +67,7 @@ static const char *ppsz_sout_options[] = { "output", "prefix", NULL }; -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send ( sout_stream_t *, sout_stream_id_sys_t *, block_t * ); @@ -148,7 +148,7 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; sout_stream_id_sys_t *id; diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c index 95f7635a81..c75bdf5ecb 100644 --- a/modules/stream_out/transcode/transcode.c +++ b/modules/stream_out/transcode/transcode.c @@ -233,7 +233,7 @@ static const char *const ppsz_sout_options[] = { /***************************************************************************** * Exported prototypes *****************************************************************************/ -static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); @@ -504,7 +504,8 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, + const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_sys_t *id; -- 2.39.2