Changeset 62fffadfea2834f7ff57a6ec1b15f8be35e68916

Timestamp:

10/01/06 18:08:37 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1159718917 +0000

git-parent:

[bebdb9922f972484a3761024946e059c6320411b]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1159718917 +0000

Message:

Rename all sout_Cfg* stuff to config_Chain* (as it isn't really sout specific)

Files:

• include/configuration.h (modified) (1 diff)
• include/stream_output.h (modified) (5 diffs)
• include/video_output.h (modified) (1 diff)
• include/vlc_codec.h (modified) (1 diff)
• include/vlc_common.h (modified) (1 diff)
• include/vlc_filter.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (6 diffs)
• modules/access_output/file.c (modified) (1 diff)
• modules/access_output/http.c (modified) (1 diff)
• modules/access_output/shout.c (modified) (1 diff)
• modules/access_output/udp.c (modified) (1 diff)
• modules/codec/dirac.c (modified) (1 diff)
• modules/codec/dvbsub.c (modified) (1 diff)
• modules/codec/ffmpeg/encoder.c (modified) (1 diff)
• modules/codec/theora.c (modified) (1 diff)
• modules/codec/twolame.c (modified) (1 diff)
• modules/codec/vorbis.c (modified) (1 diff)
• modules/codec/x264.c (modified) (1 diff)
• modules/gui/wxwidgets/timer.cpp (modified) (1 diff)
• modules/mux/asf.c (modified) (1 diff)
• modules/mux/mp4.c (modified) (1 diff)
• modules/mux/mpeg/ps.c (modified) (1 diff)
• modules/mux/mpeg/ts.c (modified) (1 diff)
• modules/mux/mpjpeg.c (modified) (1 diff)
• modules/stream_out/bridge.c (modified) (2 diffs)
• modules/stream_out/display.c (modified) (1 diff)
• modules/stream_out/duplicate.c (modified) (1 diff)
• modules/stream_out/es.c (modified) (1 diff)
• modules/stream_out/mosaic_bridge.c (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (2 diffs)
• modules/stream_out/standard.c (modified) (1 diff)
• modules/stream_out/switcher.c (modified) (1 diff)
• modules/stream_out/transcode.c (modified) (18 diffs)
• modules/video_filter/adjust.c (modified) (1 diff)
• modules/video_filter/deinterlace.c (modified) (1 diff)
• modules/video_filter/gradient.c (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/misc/configuration_chain.c (added)
• src/stream_output/stream_output.c (modified) (8 diffs)
• src/video_output/video_output.c (modified) (3 diffs)

include/configuration.h

@@ -408 +408 @@
-#define change_autosave() \
-    p_config[i_config].b_autosave = VLC_TRUE;
+
+
+/****************************************************************************
+ * config_chain_t:
+ ****************************************************************************/
+struct config_chain_t
+{
+    config_chain_t *p_next;
+
+    char        *psz_name;
+    char        *psz_value;
+};
+
+#define config_ChainParse( a, b, c, d ) __config_ChainParse( VLC_OBJECT(a), b, c, d )
+VLC_EXPORT( void,   __config_ChainParse, ( vlc_object_t *, char *psz_prefix, const char **ppsz_options, config_chain_t * ) );
+VLC_EXPORT( char *, config_ChainCreate, ( char **, config_chain_t **, char * ) );
+VLC_EXPORT( void, config_ChainDestroy, ( config_chain_t * ) );
+
+static inline config_chain_t *config_chain_find( config_chain_t *p_cfg, char *psz_name )
+{
+    while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) )
+    {
+        p_cfg = p_cfg->p_next;
+    }
+
+    return p_cfg;
+}
+
+static inline char *config_chain_find_value( config_chain_t *p_cfg, char *psz_name )
+{
+    while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) )
+    {
+        p_cfg = p_cfg->p_next;
+    }
+
+    if( p_cfg && p_cfg->psz_value )
+    {
+        return( p_cfg->psz_value );
+    }
+
+    return NULL;
+}

include/stream_output.h

@@ -54 +54 @@
-
-/****************************************************************************
- * sout_cfg_t:
- ****************************************************************************/
-struct sout_cfg_t
-{
-    sout_cfg_t  *p_next;
-
-    char        *psz_name;
-    char        *psz_value;
-};
-
-#define sout_CfgParse( a, b, c, d ) __sout_CfgParse( VLC_OBJECT(a), b, c, d )
-VLC_EXPORT( void,   __sout_CfgParse, ( vlc_object_t *, char *psz_prefix, const char **ppsz_options, sout_cfg_t * ) );
-VLC_EXPORT( char *, sout_CfgCreate, ( char **, sout_cfg_t **, char * ) );
-
-/****************************************************************************
- * sout_stream_id_t: opaque (private for all sout_stream_t)
- ****************************************************************************/
@@ -105 +90 @@
-
-    char                    *psz_access;
-sout_cfg
+config_chain
-
-    int                      i_writes;
@@ -135 +120 @@
-
-    char                *psz_mux;
-sout_cfg
+config_chain
-
-    sout_access_out_t   *p_access;
@@ -209 +194 @@
-
-    char              *psz_name;
-sout_cfg
+config_chain
-    char              *psz_next;
-
@@ -312 +297 @@
-
-/* End */
-
-
-static inline sout_cfg_t *sout_cfg_find( sout_cfg_t *p_cfg, char *psz_name )
-{
-    while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) )
-    {
-        p_cfg = p_cfg->p_next;
-    }
-
-    return p_cfg;
-}
-
-static inline char *sout_cfg_find_value( sout_cfg_t *p_cfg, char *psz_name )
-{
-    while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) )
-    {
-        p_cfg = p_cfg->p_next;
-    }
-
-    if( p_cfg && p_cfg->psz_value )
-    {
-        return( p_cfg->psz_value );
-    }
-
-    return NULL;
-}
-
-/* Announce system */

include/video_output.h

@@ -158 +158 @@
-     * XXX: we might need to merge the two chains (v1 and v2 filters) */
-    char       *psz_vfilters[MAX_VFILTERS];
-sout_cfg
+config_chain
-    int         i_vfilters_cfg;
-

include/vlc_codec.h

@@ -128 +128 @@
-
-    /* Encoder config */
-sout_cfg
+config_chain
-};
-

include/vlc_common.h

@@ -329 +329 @@
-typedef struct sout_stream_sys_t sout_stream_sys_t;
-
-sout_cfg_t       sout_cfg
+config_chain_t       config_chain
-typedef struct sap_session_t    sap_session_t;
-typedef struct sap_address_t sap_address_t;

include/vlc_filter.h

@@ -59 +59 @@
-
-    /* Filter configuration */
-sout_cfg
+config_chain
-
-    picture_t *         ( * pf_video_filter ) ( filter_t *, picture_t * );

include/vlc_symbols.h

@@ -110 +110 @@
-    void (*vout_OSDSlider_inner) (vlc_object_t *, int, int , short);
-    void (*vout_OSDIcon_inner) (vlc_object_t *, int, short);
-(*__sout_CfgParse_inner) (vlc_object_t *, char *psz_prefix, const char **ppsz_options, sout_cfg_t *)
-char * (*sout_CfgCreate_inner) (char **, sout_cfg_t **, char *)
+*__sout_CfgParse_deprecated
+void *sout_CfgCreate_deprecated
-    sout_instance_t * (*__sout_NewInstance_inner) (vlc_object_t *, char *);
-    void (*sout_DeleteInstance_inner) (sout_instance_t *);
@@ -551 +551 @@
-    int (*playlist_AskForArtEnqueue_inner) (playlist_t *, input_item_t *);
-    uint32_t (*input_CurrentMetaFlags_inner) (vlc_meta_t *p_meta);
+    void (*__config_ChainParse_inner) (vlc_object_t *, char *psz_prefix, const char **ppsz_options, config_chain_t *);
+    void (*config_ChainDestroy_inner) (config_chain_t *);
+    char * (*config_ChainCreate_inner) (char **, config_chain_t **, char *);
-};
-# if defined (__PLUGIN__)
@@ -642 +645 @@
-#  define vout_OSDSlider (p_symbols)->vout_OSDSlider_inner
-#  define vout_OSDIcon (p_symbols)->vout_OSDIcon_inner
-#  define __sout_CfgParse (p_symbols)->__sout_CfgParse_inner
-#  define sout_CfgCreate (p_symbols)->sout_CfgCreate_inner
-#  define __sout_NewInstance (p_symbols)->__sout_NewInstance_inner
-#  define sout_DeleteInstance (p_symbols)->sout_DeleteInstance_inner
@@ -1026 +1027 @@
-#  define playlist_AskForArtEnqueue (p_symbols)->playlist_AskForArtEnqueue_inner
-#  define input_CurrentMetaFlags (p_symbols)->input_CurrentMetaFlags_inner
+#  define __config_ChainParse (p_symbols)->__config_ChainParse_inner
+#  define config_ChainDestroy (p_symbols)->config_ChainDestroy_inner
+#  define config_ChainCreate (p_symbols)->config_ChainCreate_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1120 +1124 @@
-    ((p_symbols)->vout_OSDSlider_inner) = vout_OSDSlider; \
-    ((p_symbols)->vout_OSDIcon_inner) = vout_OSDIcon; \
-    ((p_symbols)->__sout_CfgParse_inner) = __sout_CfgParse; \
-    ((p_symbols)->sout_CfgCreate_inner) = sout_CfgCreate; \
-    ((p_symbols)->__sout_NewInstance_inner) = __sout_NewInstance; \
-    ((p_symbols)->sout_DeleteInstance_inner) = sout_DeleteInstance; \
@@ -1504 +1506 @@
-    ((p_symbols)->playlist_AskForArtEnqueue_inner) = playlist_AskForArtEnqueue; \
-    ((p_symbols)->input_CurrentMetaFlags_inner) = input_CurrentMetaFlags; \
+    ((p_symbols)->__config_ChainParse_inner) = __config_ChainParse; \
+    ((p_symbols)->config_ChainDestroy_inner) = config_ChainDestroy; \
+    ((p_symbols)->config_ChainCreate_inner) = config_ChainCreate; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
+    (p_symbols)->__sout_CfgParse_deprecated = NULL; \
+    (p_symbols)->sout_CfgCreate_deprecated = NULL; \
-    (p_symbols)->vlc_input_item_GetInfo_deprecated = NULL; \
-    (p_symbols)->vlc_input_item_AddInfo_deprecated = NULL; \

modules/access_output/file.c

@@ -102 +102 @@
-    vlc_value_t         val;
-
-sout_Cfg
+config_Chain
-
-    if( !p_access->psz_name )

modules/access_output/http.c

@@ -173 +173 @@
-    }
-
-sout_Cfg
+config_Chain
-
-    /* p_access->psz_name = "hostname:port/filename" */

modules/access_output/shout.c

@@ -178 +178 @@
-    char *psz_url = NULL;
-
-sout_Cfg
+config_Chain
-
-    psz_accessname = psz_parser = strdup( p_access->psz_name );

modules/access_output/udp.c

@@ -183 +183 @@
-    vlc_value_t         val;
-
-sout_Cfg
+config_Chain
-                   ppsz_sout_options, p_access->p_cfg );
-

modules/codec/dirac.c

@@ -351 +351 @@
-    p_enc->fmt_out.i_codec = VLC_FOURCC('d','r','a','c');
-
-sout_Cfg
+config_Chain
-
-    /* Initialse the encoder context with the presets for SD576 - Standard

modules/codec/dvbsub.c

@@ -1527 +1527 @@
-    p_enc->fmt_out.subs.dvb.i_id  = 1 << 16 | 1;
-
-sout_Cfg
+config_Chain
-
-    p_sys->i_page_ver = 0;

modules/codec/ffmpeg/encoder.c

@@ -290 +290 @@
-    }
-
-sout_Cfg
+config_Chain
-
-    var_Get( p_enc, ENC_CFG_PREFIX "keyint", &val );

modules/codec/theora.c

@@ -620 +620 @@
-    p_enc->fmt_out.i_codec = VLC_FOURCC('t','h','e','o');
-
-sout_Cfg
+config_Chain
-
-    var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );

modules/codec/twolame.c

@@ -166 +166 @@
-    p_enc->fmt_out.i_codec = VLC_FOURCC('m','p','g','a');
-
-sout_Cfg
+config_Chain
-
-    p_sys->p_twolame = twolame_init();

modules/codec/vorbis.c

@@ -793 +793 @@
-    p_enc->fmt_out.i_codec = VLC_FOURCC('v','o','r','b');
-
-sout_Cfg
+config_Chain
-
-    var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );

modules/codec/x264.c

@@ -577 +577 @@
-#endif
-
-sout_Cfg
+config_Chain
-
-    p_enc->fmt_out.i_codec = VLC_FOURCC( 'h', '2', '6', '4' );

modules/gui/wxwidgets/timer.cpp

@@ -105 +105 @@
-    {
-        p_main_interface->Raise();
+        p_main_interface->Show();
-        p_intf->p_sys->b_intf_show = VLC_FALSE;
-    }

modules/mux/asf.c

@@ -183 +183 @@
-
-    msg_Dbg( p_mux, "asf muxer opened" );
-sout_Cfg
+config_Chain
-
-    p_mux->pf_control   = Control;

modules/mux/mp4.c

@@ -197 +197 @@
-
-    msg_Dbg( p_mux, "Mp4 muxer opend" );
-sout_Cfg
+config_Chain
-
-    p_mux->pf_control   = Control;

modules/mux/mpeg/ps.c

@@ -150 +150 @@
-
-    msg_Info( p_mux, "Open" );
-sout_Cfg
+config_Chain
-
-    p_mux->pf_control   = Control;

modules/mux/mpeg/ts.c

@@ -480 +480 @@
-    int i;
-
-sout_Cfg
+config_Chain
-
-    p_sys = malloc( sizeof( sout_mux_sys_t ) );

modules/mux/mpjpeg.c

@@ -85 +85 @@
-
-    msg_Dbg( p_mux, "Multipart jpeg muxer opened" );
-sout_Cfg
+config_Chain
-
-    p_sys = p_mux->p_sys = malloc( sizeof(sout_mux_sys_t) );

modules/stream_out/bridge.c

@@ -165 +165 @@
-    vlc_value_t val;
-
-sout_Cfg
+config_Chain
-                   p_stream->p_cfg );
-
@@ -352 +352 @@
-    }
-
-sout_Cfg
+config_Chain
-                   p_stream->p_cfg );
-

modules/stream_out/display.c

@@ -94 +94 @@
-    vlc_value_t val;
-
-sout_Cfg
+config_Chain
-                   p_stream->p_cfg );
-

modules/stream_out/duplicate.c

@@ -80 +80 @@
-    sout_stream_t     *p_stream = (sout_stream_t*)p_this;
-    sout_stream_sys_t *p_sys;
-sout_cfg
+config_chain
-
-    msg_Dbg( p_stream, "creating 'duplicate'" );

modules/stream_out/es.c

@@ -146 +146 @@
-    vlc_value_t         val;
-
-sout_Cfg
+config_Chain
-    p_sys                   = malloc( sizeof( sout_stream_sys_t ) );
-

modules/stream_out/mosaic_bridge.c

@@ -151 +151 @@
-    vlc_value_t val;
-
-sout_Cfg
+config_Chain
-                   p_stream->p_cfg );
-

modules/stream_out/rtp.c

@@ -297 +297 @@
-    sout_instance_t     *p_sout = p_stream->p_sout;
-    sout_stream_sys_t   *p_sys = NULL;
-sout_cfg_t    
+config_chain_t
-    vlc_value_t         val;
-    vlc_bool_t          b_rtsp = VLC_FALSE;
-
-
+
+
-
-    p_sys = malloc( sizeof( sout_stream_sys_t ) );
@@ -591 +592 @@
-    if( *val.psz_string )
-    {
-sout_cfg
+config_chain
-
-        SDPHandleUrl( p_stream, val.psz_string );

modules/stream_out/standard.c

@@ -134 +134 @@
-    char                *psz_mux_byext = NULL;
-
-sout_Cfg
+config_Chain
-                   p_stream->p_cfg );
-

modules/stream_out/switcher.c

@@ -190 +190 @@
-    }
-
-sout_Cfg
+config_Chain
-                   p_stream->p_cfg );
-

modules/stream_out/transcode.c

@@ -373 +373 @@
-    vlc_fourcc_t    i_acodec;   /* codec audio (0 if not transcode) */
-    char            *psz_aenc;
-sout_cfg_t    
+config_chain_t
-    int             i_sample_rate;
-    int             i_channels;
-    int             i_abitrate;
-    char            *psz_afilters[TRANSCODE_FILTERS];
-sout_cfg_t    
+config_chain_t
-    int             i_afilters;
-
@@ -384 +384 @@
-    vlc_fourcc_t    i_vcodec;   /* codec video (0 if not transcode) */
-    char            *psz_venc;
-sout_cfg_t    
+config_chain_t
-    int             i_vbitrate;
-    double          f_scale;
@@ -392 +392 @@
-    vlc_bool_t      b_deinterlace;
-    char            *psz_deinterlace;
-sout_cfg_t    
+config_chain_t
-    int             i_threads;
-    vlc_bool_t      b_high_priority;
-    vlc_bool_t      b_hurry_up;
-    char            *psz_vfilters[TRANSCODE_FILTERS];
-sout_cfg_t    
+config_chain_t
-    int             i_vfilters;
-
@@ -429 +429 @@
-    char            *psz_senc;
-    vlc_bool_t      b_soverlay;
-sout_cfg_t    
+config_chain_t
-    spu_t           *p_spu;
-
@@ -436 +436 @@
-    vlc_fourcc_t    i_osdcodec; /* codec osd menu (0 if not transcode) */
-    char            *psz_osdenc;
-sout_cfg_t    
+config_chain_t
-    vlc_bool_t      b_es_osd;      /* VLC_TRUE when osd es is registered */
-    vlc_bool_t      b_sout_osd;
@@ -477 +477 @@
-    p_sys->i_master_drift = 0;
-
-sout_Cfg
+config_Chain
-                   p_stream->p_cfg );
-
@@ -487 +487 @@
-    {
-        char *psz_next;
-sout_Cfg
-
+config_Chain
+    
-        if( psz_next ) free( psz_next );
-    }
@@ -536 +536 @@
-                && (p_sys->i_afilters < TRANSCODE_FILTERS) )
-        {
-sout_Cfg
+config_Chain
-                                   &p_sys->psz_afilters[p_sys->i_afilters],
-                                   &p_sys->p_afilters_cfg[p_sys->i_afilters],
@@ -558 +558 @@
-    {
-        char *psz_next;
-sout_Cfg
+config_Chain
-                                   val.psz_string );
-        if( psz_next ) free( psz_next );
@@ -608 +608 @@
-                && (p_sys->i_vfilters < TRANSCODE_FILTERS) )
-        {
-sout_Cfg
+config_Chain
-                                   &p_sys->psz_vfilters[p_sys->i_vfilters],
-                                   &p_sys->p_vfilters_cfg[p_sys->i_vfilters],
@@ -632 +632 @@
-    {
-        char *psz_next;
-sout_Cfg
+config_Chain
-                                   &p_sys->p_deinterlace_cfg,
-                                   val.psz_string );
@@ -700 +700 @@
-    {
-        char *psz_next;
-sout_Cfg
+config_Chain
-                                   val.psz_string );
-        if( psz_next ) free( psz_next );
@@ -746 +746 @@
-        char *psz_next;
-
-sout_Cfg
+config_Chain
-                                   &p_sys->p_osd_cfg, strdup( "dvbsub") );
-        if( psz_next ) free( psz_next );
@@ -796 +796 @@
-    while( p_sys->p_audio_cfg != NULL )
-    {
-sout_cfg
+config_chain
-
-        if( p_sys->p_audio_cfg->psz_name )
@@ -810 +810 @@
-    while( p_sys->p_video_cfg != NULL )
-    {
-sout_cfg
+config_chain
-
-        if( p_sys->p_video_cfg->psz_name )
@@ -824 +824 @@
-    while( p_sys->p_deinterlace_cfg != NULL )
-    {
-sout_cfg
+config_chain
-
-        if( p_sys->p_deinterlace_cfg->psz_name )
@@ -838 +838 @@
-    while( p_sys->p_spu_cfg != NULL )
-    {
-sout_cfg
+config_chain
-
-        if( p_sys->p_spu_cfg->psz_name )
@@ -854 +854 @@
-    while( p_sys->p_osd_cfg != NULL )
-    {
-sout_cfg
+config_chain
-
-        if( p_sys->p_osd_cfg->psz_name )

modules/video_filter/adjust.c

@@ -168 +168 @@
-    /* needed to get options passed in transcode using the
-     * adjust{name=value} syntax */
-sout_Cfg
+config_Chain
-                   p_filter->p_cfg );
-

modules/video_filter/deinterlace.c

@@ -2206 +2206 @@
-    p_vout->render.i_chroma = p_filter->fmt_in.video.i_chroma;
-
-sout_Cfg
+config_Chain
-                   p_filter->p_cfg );
-    var_Get( p_filter, FILTER_CFG_PREFIX "mode", &val );

modules/video_filter/gradient.c

@@ -138 +138 @@
-    p_filter->p_sys->p_pre_hough = NULL;
-
-sout_Cfg
+config_Chain
-                   p_filter->p_cfg );
-

src/Makefile.am

@@ -325 +325 @@
-    misc/cpu.c \
-    misc/configuration.c \
+    misc/configuration_chain.c \
-    misc/image.c \
-    misc/iso_lang.c \

src/stream_output/stream_output.c

@@ -43 +43 @@
- * Local prototypes
- *****************************************************************************/
-static void sout_CfgDestroy( sout_cfg_t * );
-
-#define sout_stream_url_to_chain( p, s ) \
-    _sout_stream_url_to_chain( VLC_OBJECT(p), s )
@@ -287 +285 @@
-    }
-
-sout_Cfg
-
+config_Chain
+   
-    if( psz_next )
-    {
@@ -332 +330 @@
-    free( p_access->psz_access );
-
-sout_Cfg
+config_Chain
-
-    free( p_access->psz_name );
@@ -402 +400 @@
-
-    p_mux->p_sout = p_sout;
-sout_Cfg
+config_Chain
-    if( psz_next ) free( psz_next );
-
@@ -487 +485 @@
-    free( p_mux->psz_mux );
-