[vlc-devel] commit: Dead code ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Jul 5 19:32:02 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jul  5 20:34:05 2008 +0300| [b0d34dd091e493f5c1cc4940ece339d4dda775bb]

Dead code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0d34dd091e493f5c1cc4940ece339d4dda775bb
---

 include/vlc_streaming.h |  279 -----------------------------------------------
 1 files changed, 0 insertions(+), 279 deletions(-)

diff --git a/include/vlc_streaming.h b/include/vlc_streaming.h
deleted file mode 100644
index 7446fed..0000000
--- a/include/vlc_streaming.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*****************************************************************************
- * vlc_streaming.h: Methods and descriptions for Streaming profiles
- *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
- * $Id$
- *
- * Authors: Clément Stenac <zorglub at videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef _VLC_STREAMING_H_
-#define _VLC_STREAMING_H_
-
-/***********************************************************************
- * Predefined lists of streaming data
- ***********************************************************************/
-
-#ifdef WIN32
-#define VCODECS_NUMBER 13
-#else
-#define VCODECS_NUMBER 12
-#endif
-
-#define ACODECS_NUMBER 9
-
-/// Keep this up to date !
-#define MUXERS_NUMBER 10
-enum
-{
-    MUX_PS, MUX_TS, MUX_MPEG, MUX_OGG, MUX_RAW,
-    MUX_ASF, MUX_AVI, MUX_MP4, MUX_MOV, MUX_WAV,
-};
-
-enum { ACCESS_HTTP, ACCESS_UDP, ACCESS_MMS, ACCESS_RTP, ACCESS_FILE };
-
-struct codec_desc_t {
-    char *psz_display;
-    char *psz_codec;
-    char *psz_descr;
-    int muxers[MUXERS_NUMBER];
-};
-//extern const struct codec vcodecs_array[];
-//extern const struct codec acodecs_array[];
-
-struct method_desc_t {
-    char *psz_access;
-    char *psz_method;
-    char *psz_descr;
-    char *psz_address;
-    int   muxers[MUXERS_NUMBER];
-};
-//xtern const struct method methods_array[];
-
-struct mux_desc_t {
-    int   id;
-    char *psz_mux;
-    char *psz_encap;
-    char *psz_descr;
-};
-//extern const struct mux_desc_t muxers_array[];
-
-
-/* Standard bitrates arrays */
-//static const char * vbitrates_array[] =
-//{ "3072", "2048", "1024", "768", "512", "384", "256", "192", "128", "96",
-//  "64" };
-
-//static const char *abitrates_array[] =
-//{ "512", "256", "192", "128", "96", "64", "32", "16" } ;
-//
-
-
-/***********************************************************************
- * Streaming profiles
- ***********************************************************************/
-
-/****************** Parameters handling *********************/
-struct sout_param_t
-{
-    int i_type;
-    int i_element;
-    char *psz_id;
-    char *psz_string;
-    vlc_value_t value;
-};
-
-struct sout_pcat_t
-{
-    char *psz_name;
-    int i_params;
-    sout_param_t **pp_params;
-};
-
-void streaming_ParameterApply( sout_param_t *p_param, char **ppsz_dest,
-                           int *pi_dest, float *pf_dest, bool *pb_dest );
-
-
-/******** Module types definitions and parametrable elements ***************/
-
-/* Transcode */
-enum { I_VB, I_AB, I_CHANNELS, F_SCALE, B_SOVERLAY, PSZ_VC, PSZ_AC, PSZ_SC,
-       PSZ_VE, PSZ_AE };
-struct sout_transcode_t
-{
-    int32_t i_vb;
-    int32_t i_ab;
-    int32_t i_channels;
-    float f_scale;
-    bool b_soverlay;
-    char *psz_vcodec;
-    char *psz_acodec;
-    char *psz_scodec;
-    char *psz_venc;
-    char *psz_aenc;
-    char *psz_additional;
-
-    int32_t i_params;
-    sout_param_t **pp_params;
-};
-void streaming_TranscodeParametersApply( sout_transcode_t *p_module );
-
-/* Standard */
-enum { PSZ_MUX, PSZ_ACCESS, PSZ_URL, PSZ_NAME, PSZ_GROUP };
-struct sout_std_t
-{
-    char *psz_mux;
-    char *psz_access;
-    char *psz_url;
-    char *psz_name;
-    char *psz_group;
-    int i_params;
-    sout_param_t **pp_params;
-};
-void streaming_StdParametersApply( sout_std_t *p_module );
-
-/* Display */
-struct sout_display_t
-{
-};
-
-/* Duplicate */
-struct sout_duplicate_t
-{
-    int i_children;
-    int i_conditions;
-    sout_chain_t **pp_children;
-    char **ppsz_conditions;
-};
-
-/******* Generic profile structures and manipulation functions ********/
-typedef union
-{
-    sout_transcode_t *p_transcode;
-    sout_std_t       *p_std;
-    sout_duplicate_t *p_duplicate;
-    sout_display_t   *p_display;
-} sout_module_type_t;
-
-struct sout_module_t
-{
-    int i_type;
-    sout_module_type_t typed;
-    sout_module_t *p_parent;
-};
-
-enum { SOUT_MOD_TRANSCODE, SOUT_MOD_STD, SOUT_MOD_RTP, SOUT_MOD_DUPLICATE,
-       SOUT_MOD_DISPLAY };
-
-struct sout_chain_t
-{
-    int i_modules;
-    sout_module_t **pp_modules;
-
-    int i_options;
-    char **ppsz_options;
-
-    int i_pcats;
-    sout_pcat_t **pp_pcats;
-};
-
-static inline sout_chain_t *streaming_ChainNew(void)
-{
-    DECMALLOC_NULL( p_chain, sout_chain_t );
-    memset( p_chain, 0, sizeof( sout_chain_t ) );
-    p_chain->i_options = 0;
-    return p_chain;
-}
-
-struct streaming_profile_t
-{
-    char *psz_title;
-    char *psz_description;
-    sout_chain_t *p_chain;
-};
-
-/** struct for holding account information needed to access the services */
-struct streaming_account_t
-{
-    char *psz_username; /*< username of account */
-    char *psz_password; /*< password of account */
-};
-
-/**************** GUI interaction *****************/
-/** struct to hold user interface information */
-struct sout_gui_descr_t
-{
-    /* Access types */
-    bool b_local;   /*< local access module */
-    bool b_file;    /*< file access module */
-    bool b_http;    /*< http access module */
-    bool b_mms;     /*< mms access module */
-    bool b_rtp;     /*< rtp access module */
-    bool b_udp;     /*< udp access module */
-    bool b_dump;    /*< dump access module */
-    bool b_icecast; /*< icecast access module */
-
-    char *psz_file;     /*< filename */
-    char *psz_http;     /*< HTTP servername or ipaddress */
-    char *psz_mms;      /*< MMS servername or ipaddress */
-    char *psz_rtp;      /*< RTP servername or ipaddress */
-    char *psz_udp;      /*< UDP servername or ipaddress */
-    char *psz_icecast;  /*< Icecast servername or ipaddress*/
-
-    int32_t i_http;     /*< http port number */
-    int32_t i_mms;      /*< mms port number */
-    int32_t i_rtp;      /*< rtp port number */
-    int32_t i_udp;      /*< udp port number */
-    int32_t i_icecast;  /*< icecast port number */
-
-    /* Mux */
-    char *psz_mux;      /*< name of muxer to use in streaming */
-
-    /* Transcode */
-    bool b_soverlay; /*< enable burning overlay in the video */
-    char *psz_vcodec;   /*< video codec to use in transcoding */
-    char *psz_acodec;   /*< audio codec to use in transcoding */
-    char *psz_scodec;   /*< subtitle codec to use in transcoding */
-    int32_t i_vb;       /*< video bitrate to use in transcoding */
-    int32_t i_ab;       /*< audio bitrate to use in transcoding */
-    int32_t i_channels; /*< number of audio channels to use in transcoding */
-    float f_scale;      /*< scaling factor to use in transcoding */
-
-    /* Misc */
-    bool b_sap;   /*< send SAP announcement */
-    bool b_all_es;/*< send all elementary streams from source stream */
-    char *psz_group;    /*< SAP Group name */
-    char *psz_name;     /*< SAP name */
-    int32_t i_ttl;      /*< Time To Live (TTL) for network traversal */
-
-    /* Icecast */
-    char *psz_icecast_mountpoint;/*< path to Icecast mountpoint */
-    struct streaming_account_t sa_icecast;  /*< Icecast account information */
-};
-
-VLC_EXPORT(void, streaming_GuiDescToChain,(vlc_object_t*, sout_chain_t*, sout_gui_descr_t*));
-VLC_EXPORT(char*, streaming_ChainToPsz,(sout_chain_t*));
-
-/***************** Profile parsing ***********************/
-
-struct profile_parser_t
-{
-    char *psz_profile;
-    streaming_profile_t *p_profile;
-};
-
-#endif




More information about the vlc-devel mailing list