X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtsp.c;h=320d45ce7f12d870592577b6ff51df3fd35600c1;hb=5f71844e788b1dd06e87d95ca9ce823770f9a4f0;hp=4db95ee8a061cf2995bce2872f92c67908e30985;hpb=114732f4c72a854a3e4409d01ff0e8eb1fb2c20d;p=ffmpeg diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 4db95ee8a06..320d45ce7f1 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1,6 +1,6 @@ /* * RTSP/SDP client - * Copyright (c) 2002 Fabrice Bellard. + * Copyright (c) 2002 Fabrice Bellard * * This file is part of FFmpeg. * @@ -23,83 +23,27 @@ #define _SVID_SOURCE #include "libavutil/avstring.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include -#ifdef HAVE_SYS_SELECT_H +#if HAVE_SYS_SELECT_H #include #endif #include #include "network.h" #include "rtsp.h" -#include "rtp_internal.h" +#include "rtpdec.h" #include "rdt.h" +#include "rtp_asf.h" +#include "rtp_vorbis.h" //#define DEBUG //#define DEBUG_RTP_TCP -enum RTSPClientState { - RTSP_STATE_IDLE, - RTSP_STATE_PLAYING, - RTSP_STATE_PAUSED, -}; - -enum RTSPServerType { - RTSP_SERVER_RTP, /*< Standard-compliant RTP-server */ - RTSP_SERVER_REAL, /*< Realmedia-style server */ - RTSP_SERVER_LAST -}; - -enum RTSPTransport { - RTSP_TRANSPORT_RTP, - RTSP_TRANSPORT_RDT, - RTSP_TRANSPORT_LAST -}; - -typedef struct RTSPState { - URLContext *rtsp_hd; /* RTSP TCP connexion handle */ - int nb_rtsp_streams; - struct RTSPStream **rtsp_streams; - - enum RTSPClientState state; - int64_t seek_timestamp; - - /* XXX: currently we use unbuffered input */ - // ByteIOContext rtsp_gb; - int seq; /* RTSP command sequence number */ - char session_id[512]; - enum RTSPTransport transport; - enum RTSPLowerTransport lower_transport; - enum RTSPServerType server_type; - char last_reply[2048]; /* XXX: allocate ? */ - void *cur_tx; - int need_subscription; -} RTSPState; - -typedef struct RTSPStream { - URLContext *rtp_handle; /* RTP stream handle */ - void *tx_ctx; /* RTP/RDT parse context */ - - int stream_index; /* corresponding stream index, if any. -1 if none (MPEG2TS case) */ - int interleaved_min, interleaved_max; /* interleave ids, if TCP transport */ - char control_url[1024]; /* url for this stream (from SDP) */ - - int sdp_port; /* port (from SDP content - not used in RTSP) */ - struct in_addr sdp_ip; /* IP address (from SDP content - not used in RTSP) */ - int sdp_ttl; /* IP TTL (from SDP content - not used in RTSP) */ - int sdp_payload_type; /* payload type - only used in SDP */ - rtp_payload_data_t rtp_payload_data; /* rtp payload parsing infos from SDP */ - - RTPDynamicProtocolHandler *dynamic_handler; ///< Only valid if it's a dynamic protocol. (This is the handler structure) - PayloadContext *dynamic_protocol_context; ///< Only valid if it's a dynamic protocol. (This is any private data associated with the dynamic protocol) -} RTSPStream; - static int rtsp_read_play(AVFormatContext *s); -/* XXX: currently, the only way to change the protocols consists in - changing this variable */ - #if LIBAVFORMAT_VERSION_INT < (53 << 16) int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP); #endif @@ -111,11 +55,10 @@ static int rtsp_probe(AVProbeData *p) return 0; } -static int redir_isspace(int c) -{ - return c == ' ' || c == '\t' || c == '\n' || c == '\r'; -} - +#define SPACE_CHARS " \t\r\n" +/* we use memchr() instead of strchr() here because strchr() will return + * the terminating '\0' of SPACE_CHARS instead of NULL if c is '\0'. */ +#define redir_isspace(c) memchr(SPACE_CHARS, c, 4) static void skip_spaces(const char **pp) { const char *p; @@ -125,15 +68,13 @@ static void skip_spaces(const char **pp) *pp = p; } -static void get_word_sep(char *buf, int buf_size, const char *sep, - const char **pp) +static void get_word_until_chars(char *buf, int buf_size, + const char *sep, const char **pp) { const char *p; char *q; p = *pp; - if (*p == '/') - p++; skip_spaces(&p); q = buf; while (!strchr(sep, *p) && *p != '\0') { @@ -146,22 +87,16 @@ static void get_word_sep(char *buf, int buf_size, const char *sep, *pp = p; } -static void get_word(char *buf, int buf_size, const char **pp) +static void get_word_sep(char *buf, int buf_size, const char *sep, + const char **pp) { - const char *p; - char *q; + if (**pp == '/') (*pp)++; + get_word_until_chars(buf, buf_size, sep, pp); +} - p = *pp; - skip_spaces(&p); - q = buf; - while (!redir_isspace(*p) && *p != '\0') { - if ((q - buf) < buf_size - 1) - *q++ = *p; - p++; - } - if (buf_size > 0) - *q = '\0'; - *pp = p; +static void get_word(char *buf, int buf_size, const char **pp) +{ + get_word_until_chars(buf, buf_size, SPACE_CHARS, pp); } /* parse the rtpmap description: /[/= RTP_PT_PRIVATE) { RTPDynamicProtocolHandler *handler= RTPFirstDynamicPayloadHandler; while(handler) { - if (!strcmp(buf, handler->enc_name) && (codec->codec_type == handler->codec_type)) { + if (!strcasecmp(buf, handler->enc_name) && (codec->codec_type == handler->codec_type)) { codec->codec_id = handler->codec_id; rtsp_st->dynamic_handler= handler; if(handler->open) { @@ -242,7 +177,7 @@ static int hex_to_data(uint8_t *data, const char *p) v = 1; for(;;) { skip_spaces(&p); - if (p == '\0') + if (*p == '\0') break; c = toupper((unsigned char)*p++); if (c >= '0' && c <= '9') @@ -262,7 +197,8 @@ static int hex_to_data(uint8_t *data, const char *p) return len; } -static void sdp_parse_fmtp_config(AVCodecContext *codec, char *attr, char *value) +static void sdp_parse_fmtp_config(AVCodecContext * codec, void *ctx, + char *attr, char *value) { switch (codec->codec_id) { case CODEC_ID_MPEG4: @@ -270,6 +206,8 @@ static void sdp_parse_fmtp_config(AVCodecContext *codec, char *attr, char *value if (!strcmp(attr, "config")) { /* decode the hexa encoded parameter */ int len = hex_to_data(NULL, value); + if (codec->extradata) + av_free(codec->extradata); codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); if (!codec->extradata) return; @@ -277,30 +215,32 @@ static void sdp_parse_fmtp_config(AVCodecContext *codec, char *attr, char *value hex_to_data(codec->extradata, value); } break; + case CODEC_ID_VORBIS: + ff_vorbis_parse_fmtp_config(codec, ctx, attr, value); + break; default: break; } return; } -typedef struct attrname_map -{ +typedef struct { const char *str; uint16_t type; uint32_t offset; -} attrname_map_t; +} AttrNameMap; /* All known fmtp parmeters and the corresping RTPAttrTypeEnum */ #define ATTR_NAME_TYPE_INT 0 #define ATTR_NAME_TYPE_STR 1 -static const attrname_map_t attr_names[]= +static const AttrNameMap attr_names[]= { - {"SizeLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, sizelength)}, - {"IndexLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, indexlength)}, - {"IndexDeltaLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, indexdeltalength)}, - {"profile-level-id", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, profile_level_id)}, - {"StreamType", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, streamtype)}, - {"mode", ATTR_NAME_TYPE_STR, offsetof(rtp_payload_data_t, mode)}, + {"SizeLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, sizelength)}, + {"IndexLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, indexlength)}, + {"IndexDeltaLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, indexdeltalength)}, + {"profile-level-id", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, profile_level_id)}, + {"StreamType", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, streamtype)}, + {"mode", ATTR_NAME_TYPE_STR, offsetof(RTPPayloadData, mode)}, {NULL, -1, -1}, }; @@ -310,8 +250,7 @@ static const attrname_map_t attr_names[]= int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size) { skip_spaces(p); - if(**p) - { + if(**p) { get_word_sep(attr, attr_size, "=", p); if (**p == '=') (*p)++; @@ -327,18 +266,21 @@ int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *va static void sdp_parse_fmtp(AVStream *st, const char *p) { char attr[256]; - char value[4096]; + /* Vorbis setup headers can be up to 12KB and are sent base64 + * encoded, giving a 12KB * (4/3) = 16KB FMTP line. */ + char value[16384]; int i; RTSPStream *rtsp_st = st->priv_data; AVCodecContext *codec = st->codec; - rtp_payload_data_t *rtp_payload_data = &rtsp_st->rtp_payload_data; + RTPPayloadData *rtp_payload_data = &rtsp_st->rtp_payload_data; /* loop on each attribute */ while(rtsp_next_attr_and_value(&p, attr, sizeof(attr), value, sizeof(value))) { /* grab the codec extra_data from the config parameter of the fmtp line */ - sdp_parse_fmtp_config(codec, attr, value); + sdp_parse_fmtp_config(codec, rtsp_st->dynamic_protocol_context, + attr, value); /* Looking for a known attribute */ for (i = 0; attr_names[i].str; ++i) { if (!strcasecmp(attr, attr_names[i].str)) { @@ -381,6 +323,7 @@ typedef struct SDPParseState { /* SDP only */ struct in_addr default_ip; int default_ttl; + int skip_media; ///< set if an unknown m= line occurs } SDPParseState; static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, @@ -396,11 +339,11 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, struct in_addr sdp_ip; int ttl; -#ifdef DEBUG - printf("sdp: %c='%s'\n", letter, buf); -#endif + dprintf(s, "sdp: %c='%s'\n", letter, buf); p = buf; + if (s1->skip_media && letter != 'm') + return; switch(letter) { case 'c': get_word(buf1, sizeof(buf1), &p); @@ -429,22 +372,26 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, } break; case 's': - av_strlcpy(s->title, p, sizeof(s->title)); + av_metadata_set(&s->metadata, "title", p); break; case 'i': if (s->nb_streams == 0) { - av_strlcpy(s->comment, p, sizeof(s->comment)); + av_metadata_set(&s->metadata, "comment", p); break; } break; case 'm': /* new stream */ + s1->skip_media = 0; get_word(st_type, sizeof(st_type), &p); if (!strcmp(st_type, "audio")) { codec_type = CODEC_TYPE_AUDIO; } else if (!strcmp(st_type, "video")) { codec_type = CODEC_TYPE_VIDEO; + } else if (!strcmp(st_type, "application")) { + codec_type = CODEC_TYPE_DATA; } else { + s1->skip_media = 1; return; } rtsp_st = av_mallocz(sizeof(RTSPStream)); @@ -476,7 +423,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, st->codec->codec_type = codec_type; if (rtsp_st->sdp_payload_type < RTP_PT_PRIVATE) { /* if standard payload type, we can find the codec right now */ - rtp_get_codec_info(st->codec, rtsp_st->sdp_payload_type); + ff_rtp_get_codec_info(st->codec, rtsp_st->sdp_payload_type); } } /* put a default control url */ @@ -498,17 +445,13 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, } else { av_strlcpy(rtsp_st->control_url, p, sizeof(rtsp_st->control_url)); } - } else if (av_strstart(p, "rtpmap:", &p)) { + } else if (av_strstart(p, "rtpmap:", &p) && s->nb_streams > 0) { /* NOTE: rtpmap is only supported AFTER the 'm=' tag */ get_word(buf1, sizeof(buf1), &p); payload_type = atoi(buf1); - for(i = 0; i < s->nb_streams;i++) { - st = s->streams[i]; - rtsp_st = st->priv_data; - if (rtsp_st->sdp_payload_type == payload_type) { - sdp_parse_rtpmap(st->codec, rtsp_st, payload_type, p); - } - } + st = s->streams[s->nb_streams - 1]; + rtsp_st = st->priv_data; + sdp_parse_rtpmap(st->codec, rtsp_st, payload_type, p); } else if (av_strstart(p, "fmtp:", &p)) { /* NOTE: fmtp is only supported AFTER the 'a=rtpmap:xxx' tag */ get_word(buf1, sizeof(buf1), &p); @@ -518,7 +461,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, rtsp_st = st->priv_data; if (rtsp_st->sdp_payload_type == payload_type) { if(rtsp_st->dynamic_handler && rtsp_st->dynamic_handler->parse_sdp_a_line) { - if(!rtsp_st->dynamic_handler->parse_sdp_a_line(st, rtsp_st->dynamic_protocol_context, buf)) { + if(!rtsp_st->dynamic_handler->parse_sdp_a_line(s, i, rtsp_st->dynamic_protocol_context, buf)) { sdp_parse_fmtp(st, p); } } else { @@ -535,7 +478,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, rtsp_st = st->priv_data; if (rtsp_st->sdp_payload_type == payload_type) { if(rtsp_st->dynamic_handler && rtsp_st->dynamic_handler->parse_sdp_a_line) { - rtsp_st->dynamic_handler->parse_sdp_a_line(st, rtsp_st->dynamic_protocol_context, buf); + rtsp_st->dynamic_handler->parse_sdp_a_line(s, i, rtsp_st->dynamic_protocol_context, buf); } } } @@ -549,12 +492,19 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, } else if (av_strstart(p, "IsRealDataType:integer;",&p)) { if (atoi(p) == 1) rt->transport = RTSP_TRANSPORT_RDT; - } else if (s->nb_streams > 0) { - rtsp_st = s->streams[s->nb_streams - 1]->priv_data; - if (rtsp_st->dynamic_handler && - rtsp_st->dynamic_handler->parse_sdp_a_line) - rtsp_st->dynamic_handler->parse_sdp_a_line(s->streams[s->nb_streams - 1], - rtsp_st->dynamic_protocol_context, buf); + } else { + if (rt->server_type == RTSP_SERVER_WMS) + ff_wms_parse_sdp_a_line(s, p); + if (s->nb_streams > 0) { + if (rt->server_type == RTSP_SERVER_REAL) + ff_real_parse_sdp_a_line(s, s->nb_streams - 1, p); + + rtsp_st = s->streams[s->nb_streams - 1]->priv_data; + if (rtsp_st->dynamic_handler && + rtsp_st->dynamic_handler->parse_sdp_a_line) + rtsp_st->dynamic_handler->parse_sdp_a_line(s, s->nb_streams - 1, + rtsp_st->dynamic_protocol_context, buf); + } } break; } @@ -564,7 +514,14 @@ static int sdp_parse(AVFormatContext *s, const char *content) { const char *p; int letter; - char buf[2048], *q; + /* Some SDP lines, particularly for Realmedia or ASF RTSP streams, + * contain long SDP lines containing complete ASF Headers (several + * kB) or arrays of MDPR (RM stream descriptor) headers plus + * "rulebooks" describing their properties. Therefore, the SDP line + * buffer is large. + * + * The Vorbis FMTP line can be up to 16KB - see sdp_parse_fmtp. */ + char buf[16384], *q; SDPParseState sdp_parse_state, *s1 = &sdp_parse_state; memset(s1, 0, sizeof(SDPParseState)); @@ -617,7 +574,7 @@ static void rtsp_parse_range(int *min_ptr, int *max_ptr, const char **pp) } /* XXX: only one transport specification is parsed */ -static void rtsp_parse_transport(RTSPHeader *reply, const char *p) +static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p) { char transport_protocol[16]; char profile[16]; @@ -637,14 +594,11 @@ static void rtsp_parse_transport(RTSPHeader *reply, const char *p) get_word_sep(transport_protocol, sizeof(transport_protocol), "/", &p); - if (*p == '/') - p++; if (!strcasecmp (transport_protocol, "rtp")) { get_word_sep(profile, sizeof(profile), "/;,", &p); lower_transport[0] = '\0'; /* rtp/avp/ */ if (*p == '/') { - p++; get_word_sep(lower_transport, sizeof(lower_transport), ";,", &p); } @@ -719,14 +673,19 @@ static void rtsp_parse_transport(RTSPHeader *reply, const char *p) } } -void rtsp_parse_line(RTSPHeader *reply, const char *buf) +void rtsp_parse_line(RTSPMessageHeader *reply, const char *buf) { const char *p; /* NOTE: we do case independent match for broken servers */ p = buf; if (av_stristart(p, "Session:", &p)) { + int t; get_word_sep(reply->session_id, sizeof(reply->session_id), ";", &p); + if (av_stristart(p, ";timeout=", &p) && + (t = strtol(p, NULL, 10)) > 0) { + reply->timeout = t; + } } else if (av_stristart(p, "Content-Length:", &p)) { reply->content_length = strtol(p, NULL, 10); } else if (av_stristart(p, "Transport:", &p)) { @@ -738,23 +697,15 @@ void rtsp_parse_line(RTSPHeader *reply, const char *buf) } else if (av_stristart(p, "RealChallenge1:", &p)) { skip_spaces(&p); av_strlcpy(reply->real_challenge, p, sizeof(reply->real_challenge)); + } else if (av_stristart(p, "Server:", &p)) { + skip_spaces(&p); + av_strlcpy(reply->server, p, sizeof(reply->server)); + } else if (av_stristart(p, "Notice:", &p) || + av_stristart(p, "X-Notice:", &p)) { + reply->notice = strtol(p, NULL, 10); } } -static int url_readbuf(URLContext *h, unsigned char *buf, int size) -{ - int ret, len; - - len = 0; - while (len < size) { - ret = url_read(h, buf+len, size-len); - if (ret < 1) - return ret; - len += ret; - } - return len; -} - /* skip a RTP/TCP interleaved packet */ static void rtsp_skip_packet(AVFormatContext *s) { @@ -762,64 +713,77 @@ static void rtsp_skip_packet(AVFormatContext *s) int ret, len, len1; uint8_t buf[1024]; - ret = url_readbuf(rt->rtsp_hd, buf, 3); + ret = url_read_complete(rt->rtsp_hd, buf, 3); if (ret != 3) return; len = AV_RB16(buf + 1); -#ifdef DEBUG - printf("skipping RTP packet len=%d\n", len); -#endif + + dprintf(s, "skipping RTP packet len=%d\n", len); + /* skip payload */ while (len > 0) { len1 = len; if (len1 > sizeof(buf)) len1 = sizeof(buf); - ret = url_readbuf(rt->rtsp_hd, buf, len1); + ret = url_read_complete(rt->rtsp_hd, buf, len1); if (ret != len1) return; len -= len1; } } -static void rtsp_send_cmd(AVFormatContext *s, - const char *cmd, RTSPHeader *reply, - unsigned char **content_ptr) +/** + * Read a RTSP message from the server, or prepare to read data + * packets if we're reading data interleaved over the TCP/RTSP + * connection as well. + * + * @param s RTSP demuxer context + * @param reply pointer where the RTSP message header will be stored + * @param content_ptr pointer where the RTSP message body, if any, will + * be stored (length is in \p reply) + * @param return_on_interleaved_data whether the function may return if we + * encounter a data marker ('$'), which precedes data + * packets over interleaved TCP/RTSP connections. If this + * is set, this function will return 1 after encountering + * a '$'. If it is not set, the function will skip any + * data packets (if they are encountered), until a reply + * has been fully parsed. If no more data is available + * without parsing a reply, it will return an error. + * + * @returns 1 if a data packets is ready to be received, -1 on error, + * and 0 on success. + */ +static int +rtsp_read_reply (AVFormatContext *s, RTSPMessageHeader *reply, + unsigned char **content_ptr, int return_on_interleaved_data) { RTSPState *rt = s->priv_data; char buf[4096], buf1[1024], *q; unsigned char ch; const char *p; - int content_length, line_count; + int ret, content_length, line_count = 0; unsigned char *content = NULL; - memset(reply, 0, sizeof(RTSPHeader)); - - rt->seq++; - av_strlcpy(buf, cmd, sizeof(buf)); - snprintf(buf1, sizeof(buf1), "CSeq: %d\r\n", rt->seq); - av_strlcat(buf, buf1, sizeof(buf)); - if (rt->session_id[0] != '\0' && !strstr(cmd, "\nIf-Match:")) { - snprintf(buf1, sizeof(buf1), "Session: %s\r\n", rt->session_id); - av_strlcat(buf, buf1, sizeof(buf)); - } - av_strlcat(buf, "\r\n", sizeof(buf)); -#ifdef DEBUG - printf("Sending:\n%s--\n", buf); -#endif - url_write(rt->rtsp_hd, buf, strlen(buf)); + memset(reply, 0, sizeof(*reply)); /* parse reply (XXX: use buffers) */ - line_count = 0; rt->last_reply[0] = '\0'; for(;;) { q = buf; for(;;) { - if (url_readbuf(rt->rtsp_hd, &ch, 1) != 1) - break; + ret = url_read_complete(rt->rtsp_hd, &ch, 1); +#ifdef DEBUG_RTP_TCP + dprintf(s, "ret=%d c=%02x [%c]\n", ret, ch, ch); +#endif + if (ret != 1) + return -1; if (ch == '\n') break; if (ch == '$') { /* XXX: only parse it if first char on line ? */ + if (return_on_interleaved_data) { + return 1; + } else rtsp_skip_packet(s); } else if (ch != '\r') { if ((q - buf) < sizeof(buf) - 1) @@ -827,9 +791,9 @@ static void rtsp_send_cmd(AVFormatContext *s, } } *q = '\0'; -#ifdef DEBUG - printf("line='%s'\n", buf); -#endif + + dprintf(s, "line='%s'\n", buf); + /* test if last line */ if (buf[0] == '\0') break; @@ -854,13 +818,58 @@ static void rtsp_send_cmd(AVFormatContext *s, if (content_length > 0) { /* leave some room for a trailing '\0' (useful for simple parsing) */ content = av_malloc(content_length + 1); - (void)url_readbuf(rt->rtsp_hd, content, content_length); + (void)url_read_complete(rt->rtsp_hd, content, content_length); content[content_length] = '\0'; } if (content_ptr) *content_ptr = content; else av_free(content); + + /* EOS */ + if (reply->notice == 2101 /* End-of-Stream Reached */ || + reply->notice == 2104 /* Start-of-Stream Reached */ || + reply->notice == 2306 /* Continuous Feed Terminated */) + rt->state = RTSP_STATE_IDLE; + else if (reply->notice >= 4400 && reply->notice < 5500) + return AVERROR(EIO); /* data or server error */ + else if (reply->notice == 2401 /* Ticket Expired */ || + (reply->notice >= 5500 && reply->notice < 5600) /* end of term */ ) + return AVERROR(EPERM); + + return 0; +} + +static void rtsp_send_cmd_async (AVFormatContext *s, + const char *cmd, RTSPMessageHeader *reply, + unsigned char **content_ptr) +{ + RTSPState *rt = s->priv_data; + char buf[4096], buf1[1024]; + + rt->seq++; + av_strlcpy(buf, cmd, sizeof(buf)); + snprintf(buf1, sizeof(buf1), "CSeq: %d\r\n", rt->seq); + av_strlcat(buf, buf1, sizeof(buf)); + if (rt->session_id[0] != '\0' && !strstr(cmd, "\nIf-Match:")) { + snprintf(buf1, sizeof(buf1), "Session: %s\r\n", rt->session_id); + av_strlcat(buf, buf1, sizeof(buf)); + } + av_strlcat(buf, "\r\n", sizeof(buf)); + + dprintf(s, "Sending:\n%s--\n", buf); + + url_write(rt->rtsp_hd, buf, strlen(buf)); + rt->last_cmd_time = av_gettime(); +} + +static void rtsp_send_cmd (AVFormatContext *s, + const char *cmd, RTSPMessageHeader *reply, + unsigned char **content_ptr) +{ + rtsp_send_cmd_async(s, cmd, reply, content_ptr); + + rtsp_read_reply(s, reply, content_ptr, 0); } @@ -873,11 +882,11 @@ static void rtsp_close_streams(RTSPState *rt) for(i=0;inb_rtsp_streams;i++) { rtsp_st = rt->rtsp_streams[i]; if (rtsp_st) { - if (rtsp_st->tx_ctx) { + if (rtsp_st->transport_priv) { if (rt->transport == RTSP_TRANSPORT_RDT) - ff_rdt_parse_close(rtsp_st->tx_ctx); + ff_rdt_parse_close(rtsp_st->transport_priv); else - rtp_parse_close(rtsp_st->tx_ctx); + rtp_parse_close(rtsp_st->transport_priv); } if (rtsp_st->rtp_handle) url_close(rtsp_st->rtp_handle); @@ -886,6 +895,10 @@ static void rtsp_close_streams(RTSPState *rt) } } av_free(rt->rtsp_streams); + if (rt->asf_ctx) { + av_close_input_stream (rt->asf_ctx); + rt->asf_ctx = NULL; + } } static int @@ -901,19 +914,19 @@ rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) s->ctx_flags |= AVFMTCTX_NOHEADER; if (rt->transport == RTSP_TRANSPORT_RDT) - rtsp_st->tx_ctx = ff_rdt_parse_open(s, st, + rtsp_st->transport_priv = ff_rdt_parse_open(s, st->index, rtsp_st->dynamic_protocol_context, rtsp_st->dynamic_handler); else - rtsp_st->tx_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, + rtsp_st->transport_priv = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); - if (!rtsp_st->tx_ctx) { + if (!rtsp_st->transport_priv) { return AVERROR(ENOMEM); } else if (rt->transport != RTSP_TRANSPORT_RDT) { if(rtsp_st->dynamic_handler) { - rtp_parse_set_dynamic_protocol(rtsp_st->tx_ctx, + rtp_parse_set_dynamic_protocol(rtsp_st->transport_priv, rtsp_st->dynamic_protocol_context, rtsp_st->dynamic_handler); } @@ -930,9 +943,9 @@ make_setup_request (AVFormatContext *s, const char *host, int port, int lower_transport, const char *real_challenge) { RTSPState *rt = s->priv_data; - int j, i, err; + int rtx, j, i, err, interleave = 0; RTSPStream *rtsp_st; - RTSPHeader reply1, *reply = &reply1; + RTSPMessageHeader reply1, *reply = &reply1; char cmd[2048]; const char *trans_pref; @@ -941,6 +954,9 @@ make_setup_request (AVFormatContext *s, const char *host, int port, else trans_pref = "RTP/AVP"; + /* default timeout: 1 minute */ + rt->timeout = 60; + /* for each stream, make the setup request */ /* XXX: we assume the same server is used for the control of each RTSP stream */ @@ -948,12 +964,38 @@ make_setup_request (AVFormatContext *s, const char *host, int port, for(j = RTSP_RTP_PORT_MIN, i = 0; i < rt->nb_rtsp_streams; ++i) { char transport[2048]; - rtsp_st = rt->rtsp_streams[i]; + /** + * WMS serves all UDP data over a single connection, the RTX, which + * isn't necessarily the first in the SDP but has to be the first + * to be set up, else the second/third SETUP will fail with a 461. + */ + if (lower_transport == RTSP_LOWER_TRANSPORT_UDP && + rt->server_type == RTSP_SERVER_WMS) { + if (i == 0) { + /* rtx first */ + for (rtx = 0; rtx < rt->nb_rtsp_streams; rtx++) { + int len = strlen(rt->rtsp_streams[rtx]->control_url); + if (len >= 4 && + !strcmp(rt->rtsp_streams[rtx]->control_url + len - 4, "/rtx")) + break; + } + if (rtx == rt->nb_rtsp_streams) + return -1; /* no RTX found */ + rtsp_st = rt->rtsp_streams[rtx]; + } else + rtsp_st = rt->rtsp_streams[i > rtx ? i : i - 1]; + } else + rtsp_st = rt->rtsp_streams[i]; /* RTP/UDP */ if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) { char buf[256]; + if (rt->server_type == RTSP_SERVER_WMS && i > 1) { + port = reply->transports[0].client_port_min; + goto have_port; + } + /* first try in specified port range */ if (RTSP_RTP_PORT_MIN != 0) { while(j <= RTSP_RTP_PORT_MAX) { @@ -974,27 +1016,42 @@ make_setup_request (AVFormatContext *s, const char *host, int port, rtp_opened: port = rtp_get_local_port(rtsp_st->rtp_handle); + have_port: snprintf(transport, sizeof(transport) - 1, "%s/UDP;", trans_pref); if (rt->server_type != RTSP_SERVER_REAL) av_strlcat(transport, "unicast;", sizeof(transport)); av_strlcatf(transport, sizeof(transport), "client_port=%d", port); - if (rt->transport == RTSP_TRANSPORT_RTP) + if (rt->transport == RTSP_TRANSPORT_RTP && + !(rt->server_type == RTSP_SERVER_WMS && i > 0)) av_strlcatf(transport, sizeof(transport), "-%d", port + 1); } /* RTP/TCP */ else if (lower_transport == RTSP_LOWER_TRANSPORT_TCP) { + /** For WMS streams, the application streams are only used for + * UDP. When trying to set it up for TCP streams, the server + * will return an error. Therefore, we skip those streams. */ + if (rt->server_type == RTSP_SERVER_WMS && + s->streams[rtsp_st->stream_index]->codec->codec_type == CODEC_TYPE_DATA) + continue; snprintf(transport, sizeof(transport) - 1, - "%s/TCP", trans_pref); + "%s/TCP;", trans_pref); + if (rt->server_type == RTSP_SERVER_WMS) + av_strlcat(transport, "unicast;", sizeof(transport)); + av_strlcatf(transport, sizeof(transport), + "interleaved=%d-%d", + interleave, interleave + 1); + interleave += 2; } else if (lower_transport == RTSP_LOWER_TRANSPORT_UDP_MULTICAST) { snprintf(transport, sizeof(transport) - 1, "%s/UDP;multicast", trans_pref); } - if (rt->server_type == RTSP_SERVER_REAL) + if (rt->server_type == RTSP_SERVER_REAL || + rt->server_type == RTSP_SERVER_WMS) av_strlcat(transport, ";mode=play", sizeof(transport)); snprintf(cmd, sizeof(cmd), "SETUP %s RTSP/1.0\r\n" @@ -1051,7 +1108,8 @@ make_setup_request (AVFormatContext *s, const char *host, int port, /* XXX: also use address if specified */ snprintf(url, sizeof(url), "rtp://%s:%d", host, reply->transports[0].server_port_min); - if (rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) { + if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) && + rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) { err = AVERROR_INVALIDDATA; goto fail; } @@ -1079,6 +1137,9 @@ make_setup_request (AVFormatContext *s, const char *host, int port, goto fail; } + if (reply->timeout > 0) + rt->timeout = reply->timeout; + if (rt->server_type == RTSP_SERVER_REAL) rt->need_subscription = 1; @@ -1101,7 +1162,7 @@ static int rtsp_read_header(AVFormatContext *s, char host[1024], path[1024], tcpname[1024], cmd[2048], *option_list, *option; URLContext *rtsp_hd; int port, ret, err; - RTSPHeader reply1, *reply = &reply1; + RTSPMessageHeader reply1, *reply = &reply1; unsigned char *content = NULL; int lower_transport_mask = 0; char real_challenge[64]; @@ -1134,7 +1195,7 @@ static int rtsp_read_header(AVFormatContext *s, } if (!lower_transport_mask) - lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_LAST) - 1; + lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1; /* open the tcp connexion */ snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port); @@ -1173,6 +1234,8 @@ static int rtsp_read_header(AVFormatContext *s, if (rt->server_type != RTSP_SERVER_REAL && reply->real_challenge[0]) { rt->server_type = RTSP_SERVER_REAL; continue; + } else if (!strncasecmp(reply->server, "WMServer/", 9)) { + rt->server_type = RTSP_SERVER_WMS; } else if (rt->server_type == RTSP_SERVER_REAL) { strcpy(real_challenge, reply->real_challenge); } @@ -1253,31 +1316,33 @@ static int tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, RTSPStream *rtsp_st; #ifdef DEBUG_RTP_TCP - printf("tcp_read_packet:\n"); + dprintf(s, "tcp_read_packet:\n"); #endif redo: for(;;) { - ret = url_readbuf(rt->rtsp_hd, buf, 1); -#ifdef DEBUG_RTP_TCP - printf("ret=%d c=%02x [%c]\n", ret, buf[0], buf[0]); -#endif - if (ret != 1) + RTSPMessageHeader reply; + + ret = rtsp_read_reply(s, &reply, NULL, 1); + if (ret == -1) return -1; - if (buf[0] == '$') + if (ret == 1) /* received '$' */ break; + /* XXX: parse message */ + if (rt->state != RTSP_STATE_PLAYING) + return 0; } - ret = url_readbuf(rt->rtsp_hd, buf, 3); + ret = url_read_complete(rt->rtsp_hd, buf, 3); if (ret != 3) return -1; id = buf[0]; len = AV_RB16(buf + 1); #ifdef DEBUG_RTP_TCP - printf("id=%d len=%d\n", id, len); + dprintf(s, "id=%d len=%d\n", id, len); #endif if (len > buf_size || len < 12) goto redo; /* get the data */ - ret = url_readbuf(rt->rtsp_hd, buf, len); + ret = url_read_complete(rt->rtsp_hd, buf, len); if (ret != len) return -1; if (rt->transport == RTSP_TRANSPORT_RDT && @@ -1303,21 +1368,30 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, RTSPState *rt = s->priv_data; RTSPStream *rtsp_st; fd_set rfds; - int fd1, fd2, fd_max, n, i, ret; + int fd, fd_max, n, i, ret, tcp_fd; struct timeval tv; for(;;) { if (url_interrupt_cb()) return AVERROR(EINTR); FD_ZERO(&rfds); - fd_max = -1; + if (rt->rtsp_hd) { + tcp_fd = fd_max = url_get_file_handle(rt->rtsp_hd); + FD_SET(tcp_fd, &rfds); + } else { + fd_max = 0; + tcp_fd = -1; + } for(i = 0; i < rt->nb_rtsp_streams; i++) { rtsp_st = rt->rtsp_streams[i]; - /* currently, we cannot probe RTCP handle because of blocking restrictions */ - rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); - if (fd1 > fd_max) - fd_max = fd1; - FD_SET(fd1, &rfds); + if (rtsp_st->rtp_handle) { + /* currently, we cannot probe RTCP handle because of + * blocking restrictions */ + fd = url_get_file_handle(rtsp_st->rtp_handle); + if (fd > fd_max) + fd_max = fd; + FD_SET(fd, &rfds); + } } tv.tv_sec = 0; tv.tv_usec = 100 * 1000; @@ -1325,15 +1399,25 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, if (n > 0) { for(i = 0; i < rt->nb_rtsp_streams; i++) { rtsp_st = rt->rtsp_streams[i]; - rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); - if (FD_ISSET(fd1, &rfds)) { - ret = url_read(rtsp_st->rtp_handle, buf, buf_size); - if (ret > 0) { - *prtsp_st = rtsp_st; - return ret; + if (rtsp_st->rtp_handle) { + fd = url_get_file_handle(rtsp_st->rtp_handle); + if (FD_ISSET(fd, &rfds)) { + ret = url_read(rtsp_st->rtp_handle, buf, buf_size); + if (ret > 0) { + *prtsp_st = rtsp_st; + return ret; + } } } } + if (FD_ISSET(tcp_fd, &rfds)) { + RTSPMessageHeader reply; + + rtsp_read_reply(s, &reply, NULL, 0); + /* XXX: parse message */ + if (rt->state != RTSP_STATE_PLAYING) + return 0; + } } } } @@ -1344,48 +1428,83 @@ static int rtsp_read_packet(AVFormatContext *s, RTSPState *rt = s->priv_data; RTSPStream *rtsp_st; int ret, len; - uint8_t buf[RTP_MAX_PACKET_LENGTH]; + uint8_t buf[10 * RTP_MAX_PACKET_LENGTH]; + RTSPMessageHeader reply1, *reply = &reply1; + char cmd[1024]; - if (rt->server_type == RTSP_SERVER_REAL && rt->need_subscription) { + if (rt->server_type == RTSP_SERVER_REAL) { int i; - RTSPHeader reply1, *reply = &reply1; - char cmd[1024]; - - snprintf(cmd, sizeof(cmd), - "SET_PARAMETER %s RTSP/1.0\r\n" - "Subscribe: ", - s->filename); - for (i = 0; i < rt->nb_rtsp_streams; i++) { - if (i != 0) av_strlcat(cmd, ",", sizeof(cmd)); - ff_rdt_subscribe_rule(cmd, sizeof(cmd), i, 0); - if (rt->transport == RTSP_TRANSPORT_RDT) - ff_rdt_subscribe_rule2( - rt->rtsp_streams[i]->tx_ctx, - cmd, sizeof(cmd), i, 0); + enum AVDiscard cache[MAX_STREAMS]; + + for (i = 0; i < s->nb_streams; i++) + cache[i] = s->streams[i]->discard; + + if (!rt->need_subscription) { + if (memcmp (cache, rt->real_setup_cache, + sizeof(enum AVDiscard) * s->nb_streams)) { + av_strlcatf(cmd, sizeof(cmd), + "SET_PARAMETER %s RTSP/1.0\r\n" + "Unsubscribe: %s\r\n", + s->filename, rt->last_subscription); + rtsp_send_cmd(s, cmd, reply, NULL); + if (reply->status_code != RTSP_STATUS_OK) + return AVERROR_INVALIDDATA; + rt->need_subscription = 1; + } } - av_strlcat(cmd, "\r\n", sizeof(cmd)); - rtsp_send_cmd(s, cmd, reply, NULL); - if (reply->status_code != RTSP_STATUS_OK) - return AVERROR_INVALIDDATA; - rt->need_subscription = 0; - if (rt->state == RTSP_STATE_PLAYING) - rtsp_read_play (s); + if (rt->need_subscription) { + int r, rule_nr, first = 1; + + memcpy(rt->real_setup_cache, cache, + sizeof(enum AVDiscard) * s->nb_streams); + rt->last_subscription[0] = 0; + + snprintf(cmd, sizeof(cmd), + "SET_PARAMETER %s RTSP/1.0\r\n" + "Subscribe: ", + s->filename); + for (i = 0; i < rt->nb_rtsp_streams; i++) { + rule_nr = 0; + for (r = 0; r < s->nb_streams; r++) { + if (s->streams[r]->priv_data == rt->rtsp_streams[i]) { + if (s->streams[r]->discard != AVDISCARD_ALL) { + if (!first) + av_strlcat(rt->last_subscription, ",", + sizeof(rt->last_subscription)); + ff_rdt_subscribe_rule( + rt->last_subscription, + sizeof(rt->last_subscription), i, rule_nr); + first = 0; + } + rule_nr++; + } + } + } + av_strlcatf(cmd, sizeof(cmd), "%s\r\n", rt->last_subscription); + rtsp_send_cmd(s, cmd, reply, NULL); + if (reply->status_code != RTSP_STATUS_OK) + return AVERROR_INVALIDDATA; + rt->need_subscription = 0; + + if (rt->state == RTSP_STATE_PLAYING) + rtsp_read_play (s); + } } /* get next frames from the same RTP packet */ - if (rt->cur_tx) { + if (rt->cur_transport_priv) { if (rt->transport == RTSP_TRANSPORT_RDT) - ret = ff_rdt_parse_packet(rt->cur_tx, pkt, NULL, 0); + ret = ff_rdt_parse_packet(rt->cur_transport_priv, pkt, NULL, 0); else - ret = rtp_parse_packet(rt->cur_tx, pkt, NULL, 0); + ret = rtp_parse_packet(rt->cur_transport_priv, pkt, NULL, 0); if (ret == 0) { - rt->cur_tx = NULL; + rt->cur_transport_priv = NULL; return 0; } else if (ret == 1) { return 0; } else { - rt->cur_tx = NULL; + rt->cur_transport_priv = NULL; } } @@ -1399,29 +1518,47 @@ static int rtsp_read_packet(AVFormatContext *s, case RTSP_LOWER_TRANSPORT_UDP: case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: len = udp_read_packet(s, &rtsp_st, buf, sizeof(buf)); - if (len >=0 && rtsp_st->tx_ctx && rt->transport == RTSP_TRANSPORT_RTP) - rtp_check_and_send_back_rr(rtsp_st->tx_ctx, len); + if (len >=0 && rtsp_st->transport_priv && rt->transport == RTSP_TRANSPORT_RTP) + rtp_check_and_send_back_rr(rtsp_st->transport_priv, len); break; } if (len < 0) return len; + if (len == 0) + return AVERROR_EOF; if (rt->transport == RTSP_TRANSPORT_RDT) - ret = ff_rdt_parse_packet(rtsp_st->tx_ctx, pkt, buf, len); + ret = ff_rdt_parse_packet(rtsp_st->transport_priv, pkt, buf, len); else - ret = rtp_parse_packet(rtsp_st->tx_ctx, pkt, buf, len); + ret = rtp_parse_packet(rtsp_st->transport_priv, pkt, buf, len); if (ret < 0) goto redo; if (ret == 1) { /* more packets may follow, so we save the RTP context */ - rt->cur_tx = rtsp_st->tx_ctx; + rt->cur_transport_priv = rtsp_st->transport_priv; } + + /* send dummy request to keep TCP connection alive */ + if ((rt->server_type == RTSP_SERVER_WMS || + rt->server_type == RTSP_SERVER_REAL) && + (av_gettime() - rt->last_cmd_time) / 1000000 >= rt->timeout / 2) { + if (rt->server_type == RTSP_SERVER_WMS) { + snprintf(cmd, sizeof(cmd) - 1, + "GET_PARAMETER %s RTSP/1.0\r\n", + s->filename); + rtsp_send_cmd_async(s, cmd, reply, NULL); + } else { + rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n", + reply, NULL); + } + } + return 0; } static int rtsp_read_play(AVFormatContext *s) { RTSPState *rt = s->priv_data; - RTSPHeader reply1, *reply = &reply1; + RTSPMessageHeader reply1, *reply = &reply1; char cmd[1024]; av_log(s, AV_LOG_DEBUG, "hello state=%d\n", rt->state); @@ -1451,7 +1588,7 @@ static int rtsp_read_play(AVFormatContext *s) static int rtsp_read_pause(AVFormatContext *s) { RTSPState *rt = s->priv_data; - RTSPHeader reply1, *reply = &reply1; + RTSPMessageHeader reply1, *reply = &reply1; char cmd[1024]; rt = s->priv_data; @@ -1482,6 +1619,9 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index, case RTSP_STATE_IDLE: break; case RTSP_STATE_PLAYING: + if (rtsp_read_pause(s) != 0) + return -1; + rt->state = RTSP_STATE_SEEKING; if (rtsp_read_play(s) != 0) return -1; break; @@ -1495,7 +1635,7 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index, static int rtsp_read_close(AVFormatContext *s) { RTSPState *rt = s->priv_data; - RTSPHeader reply1, *reply = &reply1; + RTSPMessageHeader reply1, *reply = &reply1; char cmd[1024]; #if 0 @@ -1514,7 +1654,7 @@ static int rtsp_read_close(AVFormatContext *s) return 0; } -#ifdef CONFIG_RTSP_DEMUXER +#if CONFIG_RTSP_DEMUXER AVInputFormat rtsp_demuxer = { "rtsp", NULL_IF_CONFIG_SMALL("RTSP input format"), @@ -1607,7 +1747,7 @@ static int sdp_read_close(AVFormatContext *s) return 0; } -#ifdef CONFIG_SDP_DEMUXER +#if CONFIG_SDP_DEMUXER AVInputFormat sdp_demuxer = { "sdp", NULL_IF_CONFIG_SMALL("SDP"), @@ -1619,14 +1759,13 @@ AVInputFormat sdp_demuxer = { }; #endif -#ifdef CONFIG_REDIR_DEMUXER +#if CONFIG_REDIR_DEMUXER /* dummy redirector format (used directly in av_open_input_file now) */ static int redir_probe(AVProbeData *pd) { const char *p; p = pd->buf; - while (redir_isspace(*p)) - p++; + skip_spaces(&p); if (av_strstart(p, "http://", NULL) || av_strstart(p, "rtsp://", NULL)) return AVPROBE_SCORE_MAX;