X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Frtp%2Frtp.c;h=15075ad61767ec40c47f9dba6e84984f277697c2;hb=152b1687c0ec112f3ab1360006d048d6b9cf7258;hp=056d9408c8e8c3eda744f90757270617ba99d333;hpb=ab36d2f79979987e7ec4c20dd4a90882a0a705de;p=vlc diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c index 056d9408c8..15075ad617 100644 --- a/modules/access/rtp/rtp.c +++ b/modules/access/rtp/rtp.c @@ -4,7 +4,7 @@ */ /***************************************************************************** * Copyright (C) 2001-2005 the VideoLAN team - * Copyright © 2007-2008 Rémi Denis-Courmont + * Copyright © 2007-2009 Rémi Denis-Courmont * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -42,6 +42,11 @@ #define RTP_CACHING_LONGTEXT N_( \ "How long to wait for late RTP packets (and delay the performance)." ) +#define RTCP_PORT_TEXT N_("RTCP (local) port") +#define RTCP_PORT_LONGTEXT N_( \ + "RTCP packets will be received on this transport protocol port. " \ + "If zero, multiplexed RTP/RTCP is used.") + #define SRTP_KEY_TEXT N_("SRTP key (hexadecimal)") #define SRTP_KEY_LONGTEXT N_( \ "RTP packets will be authenticated and deciphered "\ @@ -76,30 +81,35 @@ static void Close (vlc_object_t *); * Module descriptor */ vlc_module_begin () - set_shortname (_("RTP")) - set_description (_("(Experimental) Real-Time Protocol demuxer")) + set_shortname (N_("RTP")) + set_description (N_("Real-Time Protocol (RTP) input")) set_category (CAT_INPUT) set_subcategory (SUBCAT_INPUT_DEMUX) set_capability ("access_demux", 0) set_callbacks (Open, Close) add_integer ("rtp-caching", 1000, NULL, RTP_CACHING_TEXT, - RTP_CACHING_LONGTEXT, true); + RTP_CACHING_LONGTEXT, true) + change_integer_range (0, 65535) + change_safe () + add_integer ("rtcp-port", 0, NULL, RTCP_PORT_TEXT, + RTCP_PORT_LONGTEXT, false) change_integer_range (0, 65535) + change_safe () add_string ("srtp-key", "", NULL, - SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false); + SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false) add_string ("srtp-salt", "", NULL, - SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false); + SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false) add_integer ("rtp-max-src", 1, NULL, RTP_MAX_SRC_TEXT, - RTP_MAX_SRC_LONGTEXT, true); + RTP_MAX_SRC_LONGTEXT, true) change_integer_range (1, 255) add_integer ("rtp-timeout", 5, NULL, RTP_TIMEOUT_TEXT, - RTP_TIMEOUT_LONGTEXT, true); + RTP_TIMEOUT_LONGTEXT, true) add_integer ("rtp-max-dropout", 3000, NULL, RTP_MAX_DROPOUT_TEXT, - RTP_MAX_DROPOUT_LONGTEXT, true); + RTP_MAX_DROPOUT_LONGTEXT, true) change_integer_range (0, 32767) add_integer ("rtp-max-misorder", 100, NULL, RTP_MAX_MISORDER_TEXT, - RTP_MAX_MISORDER_LONGTEXT, true); + RTP_MAX_MISORDER_LONGTEXT, true) change_integer_range (0, 32767) add_shortcut ("dccp") @@ -114,7 +124,7 @@ vlc_module_end () * - send RTCP-RR and RTCP-BYE * - dynamic payload types (need SDP parser) * - multiple medias (need SDP parser, and RTCP-SR parser for lip-sync) - * - support for access_filter in case of stream_Demux (MPEG-TS) + * - support for stream_filter in case of stream_Demux (MPEG-TS) */ #ifndef IPPROTO_DCCP @@ -172,6 +182,8 @@ static int Open (vlc_object_t *obj) if (dport == 0) dport = 5004; /* avt-profile-1 port */ + int rtcp_dport = var_CreateGetInteger (obj, "rtcp-port"); + /* Try to connect */ int fd = -1, rtcp_fd = -1; @@ -179,15 +191,13 @@ static int Open (vlc_object_t *obj) { case IPPROTO_UDP: case IPPROTO_UDPLITE: - if ((dport & 1) != 0 || (sport & 1) != 0) - msg_Err (obj, "Using odd port number is higly discouraged"); - fd = net_OpenDgram (obj, dhost, dport, shost, sport, AF_UNSPEC, tp); if (fd == -1) break; - rtcp_fd = net_OpenDgram (obj, dhost, dport + 1, shost, - sport ? (sport + 1) : 0, AF_UNSPEC, tp); + if (rtcp_dport > 0) /* XXX: source port is unknown */ + rtcp_fd = net_OpenDgram (obj, dhost, rtcp_dport, shost, 0, + AF_UNSPEC, tp); break; case IPPROTO_DCCP: @@ -199,14 +209,14 @@ static int Open (vlc_object_t *obj) #ifdef SOCK_DCCP var_Create (obj, "dccp-service", VLC_VAR_STRING); var_SetString (obj, "dccp-service", "RTPV"); /* FIXME: RTPA? */ - fd = net_Connect (obj, shost, (sport + 1) & ~1, SOCK_DCCP, tp); + fd = net_Connect (obj, shost, sport, SOCK_DCCP, tp); #else msg_Err (obj, "DCCP support not included"); #endif break; case IPPROTO_TCP: - fd = net_Connect (obj, shost, (sport + 1) & ~1, SOCK_STREAM, tp); + fd = net_Connect (obj, shost, sport, SOCK_STREAM, tp); break; } @@ -235,7 +245,6 @@ static int Open (vlc_object_t *obj) p_sys->timeout = var_CreateGetInteger (obj, "rtp-timeout"); p_sys->max_dropout = var_CreateGetInteger (obj, "rtp-max-dropout"); p_sys->max_misorder = var_CreateGetInteger (obj, "rtp-max-misorder"); - p_sys->autodetect = true; p_sys->framed_rtp = (tp == IPPROTO_TCP); p_sys->dead = false; @@ -418,7 +427,7 @@ static void *stream_init (demux_t *demux, const char *name) static void stream_destroy (demux_t *demux, void *data) { if (data) - stream_DemuxDelete ((stream_t *)data); + stream_Delete ((stream_t *)data); (void)demux; } @@ -443,7 +452,20 @@ static void *pcmu_init (demux_t *demux) { es_format_t fmt; - es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC ('u', 'l', 'a', 'w')); + es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_MULAW); + fmt.audio.i_rate = 8000; + fmt.audio.i_channels = 1; + return codec_init (demux, &fmt); +} + +/* PT=3 + * GSM + */ +static void *gsm_init (demux_t *demux) +{ + es_format_t fmt; + + es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_GSM); fmt.audio.i_rate = 8000; fmt.audio.i_channels = 1; return codec_init (demux, &fmt); @@ -456,7 +478,7 @@ static void *pcma_init (demux_t *demux) { es_format_t fmt; - es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC ('a', 'l', 'a', 'w')); + es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_ALAW); fmt.audio.i_rate = 8000; fmt.audio.i_channels = 1; return codec_init (demux, &fmt); @@ -469,7 +491,7 @@ static void *l16s_init (demux_t *demux) { es_format_t fmt; - es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC ('s', '1', '6', 'b')); + es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_S16B); fmt.audio.i_rate = 44100; fmt.audio.i_channels = 2; return codec_init (demux, &fmt); @@ -479,12 +501,25 @@ static void *l16m_init (demux_t *demux) { es_format_t fmt; - es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC ('s', '1', '6', 'b')); + es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_S16B); fmt.audio.i_rate = 44100; fmt.audio.i_channels = 1; return codec_init (demux, &fmt); } +/* PT=12 + * QCELP + */ +static void *qcelp_init (demux_t *demux) +{ + es_format_t fmt; + + es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_QCELP); + fmt.audio.i_rate = 8000; + fmt.audio.i_channels = 1; + return codec_init (demux, &fmt); +} + /* PT=14 * MPA: MPEG Audio (RFC2250, §3.4) */ @@ -492,8 +527,9 @@ static void *mpa_init (demux_t *demux) { es_format_t fmt; - es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC ('m', 'p', 'g', 'a')); + es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_MPGA); fmt.audio.i_channels = 2; + fmt.b_packetized = false; return codec_init (demux, &fmt); } @@ -519,7 +555,8 @@ static void *mpv_init (demux_t *demux) { es_format_t fmt; - es_format_Init (&fmt, VIDEO_ES, VLC_FOURCC ('m', 'p', 'g', 'v')); + es_format_Init (&fmt, VIDEO_ES, VLC_CODEC_MPGV); + fmt.b_packetized = false; return codec_init (demux, &fmt); } @@ -567,6 +604,7 @@ int rtp_autodetect (demux_t *demux, rtp_session_t *session, .number = ptype, }; + /* Remember to keep this in sync with modules/services_discovery/sap.c */ switch (ptype) { case 0: @@ -575,6 +613,12 @@ int rtp_autodetect (demux_t *demux, rtp_session_t *session, pt.frequency = 8000; break; + case 3: + msg_Dbg (demux, "detected GSM"); + pt.init = gsm_init; + pt.frequency = 8000; + break; + case 8: msg_Dbg (demux, "detected G.711 A-law"); pt.init = pcma_init; @@ -593,6 +637,12 @@ int rtp_autodetect (demux_t *demux, rtp_session_t *session, pt.frequency = 44100; break; + case 12: + msg_Dbg (demux, "detected QCELP"); + pt.init = qcelp_init; + pt.frequency = 8000; + break; + case 14: msg_Dbg (demux, "detected MPEG Audio"); pt.init = mpa_init;