summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-01 17:30:31 +0200
committerwm4 <wm4@nowhere>2012-08-01 17:47:14 +0200
commit59b938c8aa7d903e849748b737d45ccd949ef419 (patch)
tree8418d35dc94e3e7a8f185a1e63dbdad45e271e8d
parentc92538dfaa5eb7e9b2773f158cbb310545116abe (diff)
downloadmpv-59b938c8aa7d903e849748b737d45ccd949ef419.tar.bz2
mpv-59b938c8aa7d903e849748b737d45ccd949ef419.tar.xz
stream: remove native RTSP/RTP/PNM support
There are still various other RTSP implementations available, such as libnemesi, live555, and libav. The mplayer native version was a huge chunk of old unmaintained code.
-rw-r--r--Makefile20
-rw-r--r--cfg-mplayer.h10
-rwxr-xr-xconfigure4
-rw-r--r--stream/freesdp/common.c227
-rw-r--r--stream/freesdp/common.h352
-rw-r--r--stream/freesdp/errorlist.c72
-rw-r--r--stream/freesdp/parser.c1890
-rw-r--r--stream/freesdp/parser.h728
-rw-r--r--stream/freesdp/parserpriv.h118
-rw-r--r--stream/freesdp/priv.h272
-rw-r--r--stream/librtsp/rtsp.c729
-rw-r--r--stream/librtsp/rtsp.h135
-rw-r--r--stream/librtsp/rtsp_rtp.c700
-rw-r--r--stream/librtsp/rtsp_rtp.h42
-rw-r--r--stream/librtsp/rtsp_session.c318
-rw-r--r--stream/librtsp/rtsp_session.h45
-rw-r--r--stream/pnm.c874
-rw-r--r--stream/pnm.h37
-rw-r--r--stream/realrtsp/asmrp.c690
-rw-r--r--stream/realrtsp/asmrp.h47
-rw-r--r--stream/realrtsp/real.c653
-rw-r--r--stream/realrtsp/real.h60
-rw-r--r--stream/realrtsp/rmff.c876
-rw-r--r--stream/realrtsp/rmff.h275
-rw-r--r--stream/realrtsp/sdpplin.c388
-rw-r--r--stream/realrtsp/sdpplin.h108
-rw-r--r--stream/realrtsp/xbuffer.c117
-rw-r--r--stream/realrtsp/xbuffer.h40
-rw-r--r--stream/rtp.c255
-rw-r--r--stream/rtp.h24
-rw-r--r--stream/stream.c6
-rw-r--r--stream/stream_rtp.c118
-rw-r--r--stream/stream_rtsp.c182
33 files changed, 7 insertions, 10405 deletions
diff --git a/Makefile b/Makefile
index af3fd72135..948bc98155 100644
--- a/Makefile
+++ b/Makefile
@@ -101,14 +101,6 @@ SRCS_COMMON-$(COCOA) += libvo/osx_common.c \
SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
-SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
- stream/freesdp/common.c \
- stream/freesdp/errorlist.c \
- stream/freesdp/parser.c \
- stream/librtsp/rtsp.c \
- stream/librtsp/rtsp_rtp.c \
- stream/librtsp/rtsp_session.c \
-
SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c
SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c
SRCS_COMMON-$(NEED_SETENV) += osdep/setenv.c
@@ -122,18 +114,9 @@ SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \
stream/cookies.c \
stream/http.c \
stream/network.c \
- stream/pnm.c \
- stream/rtp.c \
stream/udp.c \
stream/tcp.c \
- stream/stream_rtp.c \
stream/stream_udp.c \
- stream/librtsp/rtsp.c \
- stream/realrtsp/asmrp.c \
- stream/realrtsp/real.c \
- stream/realrtsp/rmff.c \
- stream/realrtsp/sdpplin.c \
- stream/realrtsp/xbuffer.c \
SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c
SRCS_COMMON-$(PRIORITY) += osdep/priority.c
@@ -490,9 +473,6 @@ DIRS = . \
loader/wine \
osdep \
stream \
- stream/freesdp \
- stream/librtsp \
- stream/realrtsp \
sub \
timeline \
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 6deea83634..ac5ac0c75a 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -184,11 +184,11 @@ const m_option_t pvropts_conf[]={
extern const m_option_t dvbin_opts_conf[];
extern const m_option_t lavfdopts_conf[];
-extern int rtsp_transport_tcp;
-extern int rtsp_transport_http;
-extern int rtsp_transport_sctp;
-extern int rtsp_port;
-extern char *rtsp_destination;
+int rtsp_transport_tcp;
+int rtsp_transport_http;
+int rtsp_transport_sctp;
+int rtsp_port;
+char *rtsp_destination;
extern int sws_chr_vshift;
diff --git a/configure b/configure
index 2fdab8cb63..5adcd71aab 100755
--- a/configure
+++ b/configure
@@ -500,7 +500,6 @@ _real=auto
_live=no
_nemesi=auto
_lcms2=auto
-_native_rtsp=yes
_xinerama=auto
_vm=auto
_xf86keysym=auto
@@ -3517,11 +3516,9 @@ if test "$_nemesi" = auto && test "$networking" = yes ; then
fi
fi
if test "$_nemesi" = yes; then
- _native_rtsp=no
def_nemesi='#define CONFIG_LIBNEMESI 1'
inputmodules="nemesi $inputmodules"
else
- _native_rtsp="$networking"
_nemesi=no
def_nemesi='#undef CONFIG_LIBNEMESI'
noinputmodules="nemesi $noinputmodules"
@@ -4168,7 +4165,6 @@ MACOSX_FINDER = $_macosx_finder
MD5SUM = $_md5sum
MNG = $_mng
MPG123 = $_mpg123
-NATIVE_RTSP = $_native_rtsp
NETWORKING = $networking
OPENAL = $_openal
OSS = $_ossaudio
diff --git a/stream/freesdp/common.c b/stream/freesdp/common.c
deleted file mode 100644
index 9382674c5f..0000000000
--- a/stream/freesdp/common.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- This file is part of FreeSDP
- Copyright (C) 2001,2002,2003 Federico Montesino Pouzols <fedemp@suidzer0.org>
-
- FreeSDP 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-/**
- * @file common.c
- *
- * @short Implementation of routines common to parse and formatting
- * modules .
- *
- * This file implements the routines that operate over data structures
- * that are used in both the parse and formatting modules.
- **/
-
-#include "priv.h"
-#include "common.h"
-
-static void
-safe_free (void *ptr)
-{
- if (ptr)
- free (ptr);
-}
-
-fsdp_description_t *
-fsdp_description_new (void)
-{
- fsdp_description_t *result = malloc (sizeof (fsdp_description_t));
-
- result->version = 0;
- result->o_username = result->o_session_id =
- result->o_announcement_version = NULL;
- result->o_network_type = FSDP_NETWORK_TYPE_UNDEFINED;
- result->o_address_type = FSDP_ADDRESS_TYPE_UNDEFINED;
- result->o_address = NULL;
- result->s_name = NULL;
- result->i_information = NULL;
- result->u_uri = NULL;
- result->emails = NULL;
- result->emails_count = 0;
- result->phones = NULL;
- result->phones_count = 0;
- /* At first, there is no session-level definition for these
- parameters */
- result->c_network_type = FSDP_NETWORK_TYPE_UNDEFINED;
- result->c_address_type = FSDP_ADDRESS_TYPE_UNDEFINED;
- result->c_address.address = NULL;
- /* there is no session-level definition for these parameters */
- result->bw_modifiers = NULL;
- result->bw_modifiers_count = 0;
- result->time_periods = NULL;
- result->time_periods_count = 0;
- result->timezone_adj = NULL;
- result->k_encryption_method = FSDP_ENCRYPTION_METHOD_UNDEFINED;
- result->k_encryption_content = NULL;
- /* Default/undefined values for attributes */
- result->a_category = result->a_keywords = result->a_tool = NULL;
- result->a_type = FSDP_SESSION_TYPE_UNDEFINED;
- result->a_sendrecv_mode = FSDP_SENDRECV_UNDEFINED;
- result->a_charset = NULL;
- result->a_sdplangs = result->a_langs = NULL;
- result->a_controls = NULL;
- result->a_range = NULL;
- result->a_rtpmaps = NULL;
- result->a_rtpmaps_count = 0;
- result->a_sdplangs_count = 0;
- result->a_langs_count = 0;
- result->a_controls_count = 0;
- result->unidentified_attributes = NULL;
- result->unidentified_attributes_count = 0;
- result->media_announcements = NULL;
- result->media_announcements_count = 0;
-
- return result;
-}
-
-void
-fsdp_description_delete (fsdp_description_t * dsc)
-{
- fsdp_description_recycle (dsc);
- safe_free (dsc);
-}
-
-void
-fsdp_description_recycle (fsdp_description_t * dsc)
-{
- /* Recursively free all strings and arrays */
- unsigned int i, j;
-
- if (!dsc)
- return;
-
- safe_free (dsc->o_username);
- safe_free (dsc->o_session_id);
- safe_free (dsc->o_announcement_version);
- safe_free (dsc->o_address);
- safe_free (dsc->s_name);
- safe_free (dsc->i_information);
- safe_free (dsc->u_uri);
-
- for (i = 0; i < dsc->emails_count; i++)
- safe_free ((char *) dsc->emails[i]);
- safe_free (dsc->emails);
-
- for (i = 0; i < dsc->phones_count; i++)
- safe_free ((char *) dsc->phones[i]);
- safe_free (dsc->phones);
-
- safe_free (dsc->c_address.address);
-
- for (i = 0; i < dsc->bw_modifiers_count; i++)
- safe_free (dsc->bw_modifiers[i].b_unknown_bw_modt);
- safe_free (dsc->bw_modifiers);
-
- for (i = 0; i < dsc->time_periods_count; i++)
- {
- for (j = 0; j < dsc->time_periods[i]->repeats_count; j++)
- {
- safe_free (dsc->time_periods[i]->repeats[j]->offsets);
- safe_free (dsc->time_periods[i]->repeats[j]);
- }
- safe_free (dsc->time_periods[i]->repeats);
- safe_free (dsc->time_periods[i]);
- }
- safe_free (dsc->time_periods);
-
- safe_free (dsc->timezone_adj);
- safe_free (dsc->a_category);
- safe_free (dsc->a_keywords);
- safe_free (dsc->a_tool);
-
- for (i = 0; i < dsc->a_rtpmaps_count; i++)
- safe_free (dsc->a_rtpmaps[i]);
- safe_free (dsc->a_rtpmaps);
-
- safe_free (dsc->a_charset);
-
- for (i = 0; i < dsc->a_sdplangs_count; i++)
- safe_free (dsc->a_sdplangs[i]);
- safe_free (dsc->a_sdplangs);
-
- for (i = 0; i < dsc->a_langs_count; i++)
- safe_free (dsc->a_langs[i]);
- safe_free (dsc->a_langs);
-
- for (i = 0; i < dsc->a_controls_count; i++)
- safe_free (dsc->a_controls[i]);
- safe_free (dsc->a_controls);
-
- safe_free (dsc->a_range);
-
- for (i = 0; i < dsc->media_announcements_count; i++)
- {
- if (!dsc->media_announcements[i]) continue;
- for (j = 0; j < dsc->media_announcements[i]->formats_count; j++)
- safe_free (dsc->media_announcements[i]->formats[j]);
- safe_free (dsc->media_announcements[i]->formats);
- safe_free (dsc->media_announcements[i]->i_title);
-
- for (j = 0; j < dsc->media_announcements[i]->bw_modifiers_count; j++)
- {
- if (FSDP_BW_MOD_TYPE_UNKNOWN ==
- dsc->media_announcements[i]->bw_modifiers[j].b_mod_type)
- safe_free (dsc->media_announcements[i]->bw_modifiers[j].
- b_unknown_bw_modt);
- }
- safe_free (dsc->media_announcements[i]->bw_modifiers);
-
- safe_free (dsc->media_announcements[i]->k_encryption_content);
-
- for (j = 0; j < dsc->media_announcements[i]->a_rtpmaps_count; j++)
- {
- safe_free (dsc->media_announcements[i]->a_rtpmaps[j]->pt);
- safe_free (dsc->media_announcements[i]->a_rtpmaps[j]->
- encoding_name);
- safe_free (dsc->media_announcements[i]->a_rtpmaps[j]->parameters);
- safe_free (dsc->media_announcements[i]->a_rtpmaps[j]);
- }
- safe_free (dsc->media_announcements[i]->a_rtpmaps);
-
- for (j = 0; j < dsc->media_announcements[i]->a_sdplangs_count; j++)
- safe_free (dsc->media_announcements[i]->a_sdplangs[j]);
- safe_free (dsc->media_announcements[i]->a_sdplangs);
-
- for (j = 0; j < dsc->media_announcements[i]->a_langs_count; j++)
- safe_free (dsc->media_announcements[i]->a_langs[j]);
- safe_free (dsc->media_announcements[i]->a_langs);
-
- for (j = 0; j < dsc->media_announcements[i]->a_controls_count; j++)
- safe_free (dsc->media_announcements[i]->a_controls[j]);
- safe_free (dsc->media_announcements[i]->a_controls);
-
- for (j = 0; j < dsc->media_announcements[i]->a_fmtps_count; j++)
- safe_free (dsc->media_announcements[i]->a_fmtps[j]);
- safe_free (dsc->media_announcements[i]->a_fmtps);
-
- for (j = 0;
- j < dsc->media_announcements[i]->unidentified_attributes_count; j++)
- safe_free (dsc->media_announcements[i]->unidentified_attributes[j]);
- safe_free (dsc->media_announcements[i]->unidentified_attributes);
- safe_free (dsc->media_announcements[i]);
- }
- safe_free (dsc->media_announcements);
-
- /* This prevents the user to make the library crash when incorrectly
- using recycled but not rebuilt descriptions */
- dsc->emails_count = 0;
- dsc->phones_count = 0;
- dsc->bw_modifiers_count = 0;
- dsc->time_periods_count = 0;
- dsc->media_announcements_count = 0;
-}
diff --git a/stream/freesdp/common.h b/stream/freesdp/common.h
deleted file mode 100644
index bd051a57a7..0000000000
--- a/stream/freesdp/common.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- This file is part of FreeSDP.
- Copyright (C) 2001,2002,2003 Federico Montesino Pouzols <fedemp@altern.org>
-
- FreeSDP 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-/**
- * @file common.h
- * @ingroup common
- * @short Public header common for both parsing and formatting modules.
- **/
-
-#ifndef FSDP_COMMON_H
-#define FSDP_COMMON_H
-
-/* Macros to avoid name mangling when compiling with a C++ compiler */
-#ifdef __cplusplus
-# define BEGIN_C_DECLS extern "C" {
-# define END_C_DECLS }
-#else /* !__cplusplus */
-# define BEGIN_C_DECLS
-# define END_C_DECLS
-#endif /* __cplusplus */
-
-#include <sys/time.h>
-#include <time.h>
-
-BEGIN_C_DECLS
-/**
- * @defgroup common FreeSDP Common Facilities
- *
- * Data types and routines common for both parsing and formatting
- * modules.
- **/
-/** @addtogroup common */
-/*@{*/
-/**
- * @enum fsdp_error_t freesdp/common.h
- * @short Error codes in the FreeSDP library.
- *
- * There is a FSDPE_MISSING_XXXX for each mandatory line, as
- * FSDPE_MISSING_OWNER. This kind of error is reported when a
- * mandatory description line, such as the owner line, is not found
- * where it should be in the SDP description. There are also several
- * error codes like FSDPE_INVALID_XXXX. These are returned when there
- * is a recognized line in the parsed description that violates the
- * SDP syntax or gives wrong parameters, for instance "c=foo bar",
- * which would cause a FSDPE_INVALID_CONNECTION error code to be
- * returned.
- **/
-typedef enum
-{
- FSDPE_OK = 0,
- FSDPE_ILLEGAL_CHARACTER, /**< Misplaced '\r', '\n' or '\0' */
- FSDPE_MISSING_VERSION, /**< The first line is not like
- v=... */
- FSDPE_INVALID_VERSION, /**< Parse error in version line,
- perhaps, the version specified in
- v=... is not valid for FreeSDP */
- FSDPE_MISSING_OWNER, /**< No owner line found in its
- place */
- FSDPE_INVALID_OWNER, /**< Parse error in owner line */
- FSDPE_MISSING_NAME, /**< No session name found in its
- place */
- FSDPE_EMPTY_NAME, /**< Empty session name line */
-
- FSDPE_INVALID_CONNECTION, /**< Syntax error in connection
- line */
-
- FSDPE_INVALID_CONNECTION_ADDRTYPE, /**< Unrecognized address type in
- connection line */
- FSDPE_INVALID_CONNECTION_NETTYPE, /**< Unrecognized network type in
- connection line */
- FSDPE_INVALID_BANDWIDTH, /**< Parse error in bandwidth
- line */
- FSDPE_MISSING_TIME, /**< No time period has been given
- for the session */
- FSDPE_INVALID_TIME, /**< Parse error in time line */
- FSDPE_INVALID_REPEAT, /**< Parse error in repeat time
- line */
- FSDPE_INVALID_TIMEZONE, /**< Parse error in timezone line */
- FSDPE_INVALID_ENCRYPTION_METHOD, /**< Unknown encryption method */
- FSDPE_INVALID_ATTRIBUTE, /**< Syntax error in an attribute
- line */
-
- FSDPE_INVALID_ATTRIBUTE_RTPMAP,/**< Parse error in a=rtpmap:... line */
- FSDPE_INVALID_SESSION_TYPE, /**< An unknown session type has been
- specified in a `type:'
- session-level attribute */
-
- FSDPE_INVALID_MEDIA, /**< Parse error in media line */
- FSDPE_UNKNOWN_MEDIA_TYPE, /**< Unknown media type in media
- line */
-
- FSDPE_UNKNOWN_MEDIA_TRANSPORT, /**< A media transport has been
- specified that is unknown */
-
- FSDPE_OVERFILLED, /**< extra unknown lines are at the
- end of the description */
- FSDPE_INVALID_LINE, /**< a line unknown to FreeSDP has been
- found */
- FSDPE_MISSING_CONNECTION_INFO, /**< No connection information has
- been provided for the whole
- session nor one or more media */
- FSDPE_INVALID_INDEX,
- /* FSDPE_MAXSIZE, description does not fit requested maximun size */
- FSDPE_INTERNAL_ERROR,
-
- FSDPE_INVALID_PARAMETER, /**< Some parameter of the called
- FreeSDP routine has been given an
- invalid value. This includes
- cases such as NULL pointers. */
- FSDPE_BUFFER_OVERFLOW
-} fsdp_error_t;
-
-/**
- * @short Type of network
- *
- * Initially, SDP defines "Internet". New network types may be
- * registered with IANA. However, the number of types is expected to
- * be small and rarely extended. In addition, every new network type
- * requires at least one new address type.
- **/
-typedef enum
-{
- FSDP_NETWORK_TYPE_UNDEFINED, /**< Not provided */
- FSDP_NETWORK_TYPE_INET /**< Internet */
-} fsdp_network_type_t;
-
-/**
- * @short Type of address
- *
- * Initially, IPv4 and IPv6 are defined for the network type
- * Internet. New address types may be registered with IANA.
- **/
-typedef enum
-{
- FSDP_ADDRESS_TYPE_UNDEFINED, /**< Not provided */
- FSDP_ADDRESS_TYPE_IPV4, /**< IP version 4 */
- FSDP_ADDRESS_TYPE_IPV6 /**< IP version 6 */
-} fsdp_address_type_t;
-
-/**
- * @short Type of bandwith modifiers
- *
- * Bandwidth modifiers specify the meaning of the bandwidth
- * value. Initially "Conference Total" and "Application Specific" are
- * defined. Both use kilobits as bandwidth unit. "Conference Total"
- * specifies that the bandwidth value is a proposed upper limit to the
- * session bandwidth. "Application Specific" specifies thath the
- * bandwidth value is the application concept of maximum bandwidth.
- **/
-typedef enum
-{
- FSDP_BW_MOD_TYPE_UNDEFINED, /**< Not provided */
- FSDP_BW_MOD_TYPE_UNKNOWN, /**< Unknown bandwidth
- modifier (FreeSDP
- ignores it) */
- FSDP_BW_MOD_TYPE_CONFERENCE_TOTAL, /**< "CT - Conference Total" */
- FSDP_BW_MOD_TYPE_APPLICATION_SPECIFIC, /**< "AS - Application specific" */
- FSDP_BW_MOD_TYPE_RTCP_SENDERS, /**< "RS - RTCP bandwidth for
- senders */
- FSDP_BW_MOD_TYPE_RTCP_RECEIVERS, /**< "RR - RTCP bandwidth for
- receivers */
-} fsdp_bw_modifier_type_t;
-
-/**
- * @short encryption method
- *
- * The encryption method specifies the way to get the encryption key.
- **/
-typedef enum
-{
- FSDP_ENCRYPTION_METHOD_UNDEFINED, /**< Not provided */
- FSDP_ENCRYPTION_METHOD_CLEAR, /**< The key field is the
- untransformed key */
- FSDP_ENCRYPTION_METHOD_BASE64, /**< The key is base64
- encoded */
- FSDP_ENCRYPTION_METHOD_URI, /**< The key value provided is
- a URI pointing to the actual
- key */
- FSDP_ENCRYPTION_METHOD_PROMPT /**< The key is not provided
- but should be got prompting
- the user */
-} fsdp_encryption_method_t;
-
-/**
- * @short Advised reception/transmission mode
- *
- * Depending on wheter sendrecv, recvonly, sendonly or inactive
- * attribute is given, the tools used to participate in the session
- * should be started in the corresponding transmission
- * mode. FSDP_SENDRECV_SENDRECV is the default for sessions which are
- * not of the conference type broadcast or H332.
- **/
-typedef enum
-{
- FSDP_SENDRECV_UNDEFINED, /**< Not specified */
- FSDP_SENDRECV_SENDRECV, /**< Send and receive */
- FSDP_SENDRECV_RECVONLY, /**< Receive only */
- FSDP_SENDRECV_SENDONLY, /**< Send only */
- FSDP_SENDRECV_INACTIVE /**< Do not send nor receive */
-} fsdp_sendrecv_mode_t;
-
-/**
- * @short Values for `orient' media attribute.
- *
- * Normally used with whiteboard media, this attribute specifies the
- * orientation of the whiteboard.
- **/
-typedef enum
-{
- FSDP_ORIENT_UNDEFINED, /**< Not specified */
- FSDP_ORIENT_PORTRAIT, /**< Portrait */
- FSDP_ORIENT_LANDSCAPE, /**< Landscape */
- FSDP_ORIENT_SEASCAPE /**< Upside down landscape */
-} fsdp_orient_t;
-
-/**
- * @short Type of the conference
- *
- * The following types are initially defined: broadcast, meeting,
- * moderated, test and H332.
- **/
-typedef enum
-{
- FSDP_SESSION_TYPE_UNDEFINED, /**< Not specified */
- FSDP_SESSION_TYPE_BROADCAST, /**< Broadcast session */
- FSDP_SESSION_TYPE_MEETING, /**< Meeting session */
- FSDP_SESSION_TYPE_MODERATED, /**< Moderated session */
- FSDP_SESSION_TYPE_TEST, /**< Test (do not display) */
- FSDP_SESSION_TYPE_H332 /**< H332 session */
-} fsdp_session_type_t;
-
-/**
- * @short Media type
- *
- * The following types are defined initially: audio, video,
- * application, data and control.
- **/
-typedef enum
-{
- FSDP_MEDIA_UNDEFINED, /**< Not specified */
- FSDP_MEDIA_VIDEO, /**< Video */
- FSDP_MEDIA_AUDIO, /**< Audio */
- FSDP_MEDIA_APPLICATION, /**< Application, such as whiteboard */
- FSDP_MEDIA_DATA, /**< bulk data */
- FSDP_MEDIA_CONTROL /**< Control channel */
-} fsdp_media_t;
-
-/**
- * @short Transport protocol
- *
- * The transport protocol used depends on the address type. Initially,
- * RTP over UDP Audio/Video Profile, and UDP are defined.
- *
- **/
-typedef enum
-{
- FSDP_TP_UNDEFINED, /**< Not specified */
- FSDP_TP_RTP_AVP, /**< RTP Audio/Video Profile */
- FSDP_TP_UDP, /**< UDP */
- FSDP_TP_TCP, /**< TCP */
- FSDP_TP_UDPTL, /**< ITU-T T.38*/
- FSDP_TP_VAT, /**< old vat protocol (historic)*/
- FSDP_TP_OLD_RTP, /**< old rtp protocols (historic)*/
- FSDP_TP_H320 /**< TODO: add to the parser */
-} fsdp_transport_protocol_t;
-
-/**
- * Session-level attributes whose value is specified as a character
- * string in FreeSDP. These values are usually given to
- * fsdp_get_strn_att() in order to get the corresponding value.
- *
- **/
-typedef enum
-{
- FSDP_SESSION_STR_ATT_CATEGORY,
- FSDP_SESSION_STR_ATT_KEYWORDS,
- FSDP_SESSION_STR_ATT_TOOL,
- FSDP_SESSION_STR_ATT_CHARSET,
-} fsdp_session_str_att_t;
-
-/**
- * @short FreeSDP SDP description media object.
- *
- * Object for media specific information in SDP descriptions. Each SDP
- * description may include any number of media section. A
- * fsdp_media_description_t object encapsulates the information in a
- * media section, such as video, audio or whiteboard.
- **/
-typedef struct fsdp_media_description_t_s fsdp_media_description_t;
-
-/**
- * @short FreeSDP SDP session description object.
- *
- * Contains all the information extracted from a textual SDP
- * description, including all the media announcements.
- **/
-typedef struct fsdp_description_t_s fsdp_description_t;
-
-/**
- * Allocates memory and initializes values for a new
- * fsdp_description_t object. If you call this routine, do not forget
- * about <code>fsdp_description_delete()</code>
- *
- * @return new fsdp_description_t object
- **/
-fsdp_description_t *fsdp_description_new (void);
-
-/**
- * Destroys a fsdp_description_t object.
- *
- * @param dsc pointer to the fsdp_description_t object to delete.
- **/
-void fsdp_description_delete (fsdp_description_t * dsc);
-
-/**
- * Calling this function over a description is equivalent to calling
- * fsdp_description_delete and then fsdp_description_delete. This
- * function is however more suitable and efficient for description
- * processing loops.
- *
- * @param dsc pointer to the fsdp_description_t object to
- * renew/recycle.
- **/
-void fsdp_description_recycle (fsdp_description_t * dsc);
-
-/**
- * * Returns a string correspondent to the error number.
- * *
- * * @param err_no error number.
- * **/
-const char *fsdp_strerror (fsdp_error_t err_no);
-
- /*@}*//* closes addtogroup common */
-
-END_C_DECLS
-#endif /* FSDP_COMMON_H */
diff --git a/stream/freesdp/errorlist.c b/stream/freesdp/errorlist.c
deleted file mode 100644
index 1fb6e93851..0000000000
--- a/stream/freesdp/errorlist.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- This file is part of FreeSDP
- Copyright (C) 2001, 2002 Federico Montesino Pouzols <fedemp@suidzer0.org>
-
- FreeSDP 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-/**
- * @file errorlist.c
- *
- * @short Translation table for error numbers
- *
- */
-
-#ifndef FSDP_ERRORLIST_C
-#define FSDP_ERRORLIST_C
-
-#include "common.h"
-
-const char *fsdp_error_t_s[] = {
- "No error",/** FSDPE_OK **/
- "Illegal character detected",/** FSDPE_ILLEGAL_CHARACTER **/
- "Missing version item", /** FSDPE_MISSING_VERSION **/
- "Invalid version item", /** FSDPE_INVALID_VERSION **/
- "Owner item not present", /** FSDPE_MISSING_OWNER **/
- "Parse error in owner item", /** FSDPE_INVALID_OWNER **/
- "Session name not present", /** FSDPE_MISSING_NAME **/
- "Empty session name item", /** FSDPE_EMPTY_NAME **/
- "Syntax error in connection item", /** FSDPE_INVALID_CONNECTION **/
- "Unrecognized address type in connection item", /** FSDPE_INVALID_CONNECTION_ADDRTYPE **/
- "Unrecognized network type in connection item", /** FSDPE_INVALID_CONNECTION_NETTYPE **/
- "Parse error in bandwith item", /** FSDPE_INVALID_BANDWIDTH **/
- "No time period for the session", /** FSDPE_MISSING_TIME **/
- "Parse error in time item", /** FSDPE_INVALID_TIME **/
- "Parse error in repeat time item", /** FSDPE_INVALID_REPEAT **/
- "Parse error in timezone item", /** FSDPE_INVALID_TIMEZONE **/
- "Unknown encryption method", /** FSDPE_INVALID_ENCRYPTION_METHOD **/
- "Syntax error in an attribute item", /** FSDPE_INVALID_ATTRIBUTE **/
- "Syntax error in an rtpmap attribute item", /** FSDPE_INVALID_ATTRIBUTE_RTPMAP **/
- "Unknown session type in a session-level attribute", /** FSDPE_INVALID_SESSION_TYPE **/
- "Parse error in media item", /** FSDPE_INVALID_MEDIA **/
- "Unknown media type in media item", /** FSDPE_UNKNOWN_MEDIA_TYPE **/
- "Unknown media transport", /** FSDPE_UNKNOWN_MEDIA_TRANSPORT **/
- "Unknown extra lines in description item", /** FSDPE_OVERFILLED **/
- "Unknown line found", /** FSDPE_INVALID_LINE **/
- "No connection information provided", /** FSDPE_MISSING_CONNECTION_INFO **/
- "Description item does not fit in MAXSIZE", /** FSDPE_INVALID_INDEX **/
- "Internal error", /** FSDPE_INTERNAL_ERROR **/
- "Invalid function parameters", /** FSDPE_INVALID_PARAMETER **/
- "Buffer overflow" /** FSDPE_BUFFER_OVERFLOW **/