X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtsp.c;h=33f0e5539e288d4ca247c976bc69557b7c464c47;hb=9686df2be543b740ec71e6ef633f312b8592813f;hp=0c60b83fdc196b7d174c5f083ab193c7b1c58913;hpb=d6bb9ebdc605d3e28b9224cea9ecad822233ba52;p=ffmpeg diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 0c60b83fdc1..33f0e5539e2 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -26,12 +26,15 @@ #include "avformat.h" #include -#include /* for select() prototype */ +#ifdef HAVE_SYS_SELECT_H +#include +#endif #include #include "network.h" #include "rtsp.h" #include "rtp_internal.h" +#include "rdt.h" //#define DEBUG //#define DEBUG_RTP_TCP @@ -43,11 +46,17 @@ enum RTSPClientState { }; enum RTSPServerType { - RTSP_SERVER_RTP, /*< Standard-compliant RTP-server */ - RTSP_SERVER_RDT, /*< Realmedia-style server */ + 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; @@ -60,15 +69,17 @@ typedef struct RTSPState { // ByteIOContext rtsp_gb; int seq; /* RTSP command sequence number */ char session_id[512]; - enum RTSPProtocol protocol; + enum RTSPTransport transport; + enum RTSPLowerTransport lower_transport; enum RTSPServerType server_type; char last_reply[2048]; /* XXX: allocate ? */ - RTPDemuxContext *cur_rtp; + void *cur_tx; + int need_subscription; } RTSPState; typedef struct RTSPStream { URLContext *rtp_handle; /* RTP stream handle */ - RTPDemuxContext *rtp_ctx; /* RTP parse context */ + 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 */ @@ -81,7 +92,7 @@ typedef struct RTSPStream { 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) - void *dynamic_protocol_context; ///< Only valid if it's a dynamic protocol. (This is any private data associated with the dynamic protocol) + 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); @@ -90,7 +101,7 @@ static int rtsp_read_play(AVFormatContext *s); changing this variable */ #if LIBAVFORMAT_VERSION_INT < (53 << 16) -int rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_UDP); +int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP); #endif static int rtsp_probe(AVProbeData *p) @@ -282,7 +293,7 @@ typedef struct attrname_map /* All known fmtp parmeters and the corresping RTPAttrTypeEnum */ #define ATTR_NAME_TYPE_INT 0 #define ATTR_NAME_TYPE_STR 1 -static attrname_map_t attr_names[]= +static const attrname_map_t attr_names[]= { {"SizeLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, sizelength)}, {"IndexLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, indexlength)}, @@ -378,7 +389,8 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, RTSPState *rt = s->priv_data; char buf1[64], st_type[64]; const char *p; - int codec_type, payload_type, i; + enum CodecType codec_type; + int payload_type, i; AVStream *st; RTSPStream *rtsp_st; struct in_addr sdp_ip; @@ -534,6 +546,9 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, rtsp_parse_range_npt(p, &start, &end); s->start_time= start; s->duration= (end==AV_NOPTS_VALUE)?AV_NOPTS_VALUE:end-start; // AV_NOPTS_VALUE means live broadcast (and can't seek) + } 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 && @@ -632,16 +647,19 @@ static void rtsp_parse_transport(RTSPHeader *reply, const char *p) p++; get_word_sep(lower_transport, sizeof(lower_transport), ";,", &p); - } - } else if (!strcasecmp (transport_protocol, "x-pn-tng")) { + } + th->transport = RTSP_TRANSPORT_RTP; + } else if (!strcasecmp (transport_protocol, "x-pn-tng") || + !strcasecmp (transport_protocol, "x-real-rdt")) { /* x-pn-tng/ */ get_word_sep(lower_transport, sizeof(lower_transport), "/;,", &p); profile[0] = '\0'; + th->transport = RTSP_TRANSPORT_RDT; } if (!strcasecmp(lower_transport, "TCP")) - th->protocol = RTSP_PROTOCOL_RTP_TCP; + th->lower_transport = RTSP_LOWER_TRANSPORT_TCP; else - th->protocol = RTSP_PROTOCOL_RTP_UDP; + th->lower_transport = RTSP_LOWER_TRANSPORT_UDP; if (*p == ';') p++; @@ -672,8 +690,8 @@ static void rtsp_parse_transport(RTSPHeader *reply, const char *p) &th->interleaved_max, &p); } } else if (!strcmp(parameter, "multicast")) { - if (th->protocol == RTSP_PROTOCOL_RTP_UDP) - th->protocol = RTSP_PROTOCOL_RTP_UDP_MULTICAST; + if (th->lower_transport == RTSP_LOWER_TRANSPORT_UDP) + th->lower_transport = RTSP_LOWER_TRANSPORT_UDP_MULTICAST; } else if (!strcmp(parameter, "ttl")) { if (*p == '=') { p++; @@ -855,8 +873,12 @@ 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->rtp_ctx) - rtp_parse_close(rtsp_st->rtp_ctx); + if (rtsp_st->tx_ctx) { + if (rt->transport == RTSP_TRANSPORT_RDT) + ff_rdt_parse_close(rtsp_st->tx_ctx); + else + rtp_parse_close(rtsp_st->tx_ctx); + } if (rtsp_st->rtp_handle) url_close(rtsp_st->rtp_handle); if (rtsp_st->dynamic_handler && rtsp_st->dynamic_protocol_context) @@ -866,18 +888,58 @@ static void rtsp_close_streams(RTSPState *rt) av_free(rt->rtsp_streams); } +static int +rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) +{ + RTSPState *rt = s->priv_data; + AVStream *st = NULL; + + /* open the RTP context */ + if (rtsp_st->stream_index >= 0) + st = s->streams[rtsp_st->stream_index]; + if (!st) + s->ctx_flags |= AVFMTCTX_NOHEADER; + + if (rt->transport == RTSP_TRANSPORT_RDT) + rtsp_st->tx_ctx = 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->sdp_payload_type, + &rtsp_st->rtp_payload_data); + + if (!rtsp_st->tx_ctx) { + return AVERROR(ENOMEM); + } else if (rt->transport != RTSP_TRANSPORT_RDT) { + if(rtsp_st->dynamic_handler) { + rtp_parse_set_dynamic_protocol(rtsp_st->tx_ctx, + rtsp_st->dynamic_protocol_context, + rtsp_st->dynamic_handler); + } + } + + return 0; +} + /** * @returns 0 on success, <0 on error, 1 if protocol is unavailable. */ static int -make_setup_request (AVFormatContext *s, const char *host, int port, int protocol) +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; RTSPStream *rtsp_st; - AVStream *st; RTSPHeader reply1, *reply = &reply1; char cmd[2048]; + const char *trans_pref; + + if (rt->transport == RTSP_TRANSPORT_RDT) + trans_pref = "x-pn-tng"; + else + trans_pref = "RTP/AVP"; /* for each stream, make the setup request */ /* XXX: we assume the same server is used for the control of each @@ -888,11 +950,8 @@ make_setup_request (AVFormatContext *s, const char *host, int port, int protocol rtsp_st = rt->rtsp_streams[i]; - /* compute available transports */ - transport[0] = '\0'; - /* RTP/UDP */ - if (protocol == RTSP_PROTOCOL_RTP_UDP) { + if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) { char buf[256]; /* first try in specified port range */ @@ -915,32 +974,41 @@ make_setup_request (AVFormatContext *s, const char *host, int port, int protocol rtp_opened: port = rtp_get_local_port(rtsp_st->rtp_handle); - if (transport[0] != '\0') - av_strlcat(transport, ",", sizeof(transport)); - snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1, - "RTP/AVP/UDP;unicast;client_port=%d-%d", - port, port + 1); + 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) + av_strlcatf(transport, sizeof(transport), "-%d", port + 1); } /* RTP/TCP */ - else if (protocol == RTSP_PROTOCOL_RTP_TCP) { - if (transport[0] != '\0') - av_strlcat(transport, ",", sizeof(transport)); - snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1, - "RTP/AVP/TCP"); + else if (lower_transport == RTSP_LOWER_TRANSPORT_TCP) { + snprintf(transport, sizeof(transport) - 1, + "%s/TCP", trans_pref); } - else if (protocol == RTSP_PROTOCOL_RTP_UDP_MULTICAST) { - if (transport[0] != '\0') - av_strlcat(transport, ",", sizeof(transport)); - snprintf(transport + strlen(transport), - sizeof(transport) - strlen(transport) - 1, - "RTP/AVP/UDP;multicast"); + 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) + av_strlcat(transport, ";mode=play", sizeof(transport)); snprintf(cmd, sizeof(cmd), "SETUP %s RTSP/1.0\r\n" "Transport: %s\r\n", rtsp_st->control_url, transport); + if (i == 0 && rt->server_type == RTSP_SERVER_REAL) { + char real_res[41], real_csum[9]; + ff_rdt_calc_response_and_checksum(real_res, real_csum, + real_challenge); + av_strlcatf(cmd, sizeof(cmd), + "If-Match: %s\r\n" + "RealChallenge2: %s, sd=%s\r\n", + rt->session_id, real_res, real_csum); + } rtsp_send_cmd(s, cmd, reply, NULL); if (reply->status_code == 461 /* Unsupported protocol */ && i == 0) { err = 1; @@ -953,28 +1021,30 @@ make_setup_request (AVFormatContext *s, const char *host, int port, int protocol /* XXX: same protocol for all streams is required */ if (i > 0) { - if (reply->transports[0].protocol != rt->protocol) { + if (reply->transports[0].lower_transport != rt->lower_transport || + reply->transports[0].transport != rt->transport) { err = AVERROR_INVALIDDATA; goto fail; } } else { - rt->protocol = reply->transports[0].protocol; + rt->lower_transport = reply->transports[0].lower_transport; + rt->transport = reply->transports[0].transport; } /* close RTP connection if not choosen */ - if (reply->transports[0].protocol != RTSP_PROTOCOL_RTP_UDP && - (protocol == RTSP_PROTOCOL_RTP_UDP)) { + if (reply->transports[0].lower_transport != RTSP_LOWER_TRANSPORT_UDP && + (lower_transport == RTSP_LOWER_TRANSPORT_UDP)) { url_close(rtsp_st->rtp_handle); rtsp_st->rtp_handle = NULL; } - switch(reply->transports[0].protocol) { - case RTSP_PROTOCOL_RTP_TCP: + switch(reply->transports[0].lower_transport) { + case RTSP_LOWER_TRANSPORT_TCP: rtsp_st->interleaved_min = reply->transports[0].interleaved_min; rtsp_st->interleaved_max = reply->transports[0].interleaved_max; break; - case RTSP_PROTOCOL_RTP_UDP: + case RTSP_LOWER_TRANSPORT_UDP: { char url[1024]; @@ -987,7 +1057,7 @@ make_setup_request (AVFormatContext *s, const char *host, int port, int protocol } } break; - case RTSP_PROTOCOL_RTP_UDP_MULTICAST: + case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: { char url[1024]; struct in_addr in; @@ -1004,25 +1074,14 @@ make_setup_request (AVFormatContext *s, const char *host, int port, int protocol } break; } - /* open the RTP context */ - st = NULL; - if (rtsp_st->stream_index >= 0) - st = s->streams[rtsp_st->stream_index]; - if (!st) - s->ctx_flags |= AVFMTCTX_NOHEADER; - rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); - - if (!rtsp_st->rtp_ctx) { - err = AVERROR(ENOMEM); + + if ((err = rtsp_open_transport_ctx(s, rtsp_st))) goto fail; - } else { - if(rtsp_st->dynamic_handler) { - rtsp_st->rtp_ctx->dynamic_protocol_context= rtsp_st->dynamic_protocol_context; - rtsp_st->rtp_ctx->parse_packet= rtsp_st->dynamic_handler->parse_packet; - } - } } + if (rt->server_type == RTSP_SERVER_REAL) + rt->need_subscription = 1; + return 0; fail: @@ -1044,7 +1103,7 @@ static int rtsp_read_header(AVFormatContext *s, int port, ret, err; RTSPHeader reply1, *reply = &reply1; unsigned char *content = NULL; - int protocol_mask = 0; + int lower_transport_mask = 0; char real_challenge[64]; /* extract hostname and port */ @@ -1066,16 +1125,16 @@ static int rtsp_read_header(AVFormatContext *s, *(option_list++) = 0; /* handle the options */ if (strcmp(option, "udp") == 0) - protocol_mask = (1<< RTSP_PROTOCOL_RTP_UDP); + lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_UDP); else if (strcmp(option, "multicast") == 0) - protocol_mask = (1<< RTSP_PROTOCOL_RTP_UDP_MULTICAST); + lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_UDP_MULTICAST); else if (strcmp(option, "tcp") == 0) - protocol_mask = (1<< RTSP_PROTOCOL_RTP_TCP); + lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_TCP); } } - if (!protocol_mask) - protocol_mask = (1 << RTSP_PROTOCOL_RTP_LAST) - 1; + if (!lower_transport_mask) + lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_LAST) - 1; /* open the tcp connexion */ snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port); @@ -1088,7 +1147,7 @@ static int rtsp_read_header(AVFormatContext *s, for (rt->server_type = RTSP_SERVER_RTP;;) { snprintf(cmd, sizeof(cmd), "OPTIONS %s RTSP/1.0\r\n", s->filename); - if (rt->server_type == RTSP_SERVER_RDT) + if (rt->server_type == RTSP_SERVER_REAL) av_strlcat(cmd, /** * The following entries are required for proper @@ -1111,10 +1170,10 @@ static int rtsp_read_header(AVFormatContext *s, } /* detect server type if not standard-compliant RTP */ - if (rt->server_type != RTSP_SERVER_RDT && reply->real_challenge[0]) { - rt->server_type = RTSP_SERVER_RDT; + if (rt->server_type != RTSP_SERVER_REAL && reply->real_challenge[0]) { + rt->server_type = RTSP_SERVER_REAL; continue; - } else if (rt->server_type == RTSP_SERVER_RDT) { + } else if (rt->server_type == RTSP_SERVER_REAL) { strcpy(real_challenge, reply->real_challenge); } break; @@ -1125,7 +1184,7 @@ static int rtsp_read_header(AVFormatContext *s, "DESCRIBE %s RTSP/1.0\r\n" "Accept: application/sdp\r\n", s->filename); - if (rt->server_type == RTSP_SERVER_RDT) { + if (rt->server_type == RTSP_SERVER_REAL) { /** * The Require: attribute is needed for proper streaming from * Realmedia servers. @@ -1153,13 +1212,15 @@ static int rtsp_read_header(AVFormatContext *s, } do { - int protocol = ff_log2_tab[protocol_mask & ~(protocol_mask - 1)]; + int lower_transport = ff_log2_tab[lower_transport_mask & ~(lower_transport_mask - 1)]; - err = make_setup_request(s, host, port, protocol); + err = make_setup_request(s, host, port, lower_transport, + rt->server_type == RTSP_SERVER_REAL ? + real_challenge : NULL); if (err < 0) goto fail; - protocol_mask &= ~(1 << protocol); - if (protocol_mask == 0 && err == 1) { + lower_transport_mask &= ~(1 << lower_transport); + if (lower_transport_mask == 0 && err == 1) { err = AVERROR(FF_NETERROR(EPROTONOSUPPORT)); goto fail; } @@ -1219,6 +1280,9 @@ static int tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, ret = url_readbuf(rt->rtsp_hd, buf, len); if (ret != len) return -1; + if (rt->transport == RTSP_TRANSPORT_RDT && + ff_rdt_parse_header(buf, len, &id, NULL, NULL, NULL, NULL) < 0) + return -1; /* find the matching stream */ for(i = 0; i < rt->nb_rtsp_streams; i++) { @@ -1282,41 +1346,74 @@ static int rtsp_read_packet(AVFormatContext *s, int ret, len; uint8_t buf[RTP_MAX_PACKET_LENGTH]; + if (rt->server_type == RTSP_SERVER_REAL && rt->need_subscription) { + 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); + } + 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); + } + /* get next frames from the same RTP packet */ - if (rt->cur_rtp) { - ret = rtp_parse_packet(rt->cur_rtp, pkt, NULL, 0); + if (rt->cur_tx) { + if (rt->transport == RTSP_TRANSPORT_RDT) + ret = ff_rdt_parse_packet(rt->cur_tx, pkt, NULL, 0); + else + ret = rtp_parse_packet(rt->cur_tx, pkt, NULL, 0); if (ret == 0) { - rt->cur_rtp = NULL; + rt->cur_tx = NULL; return 0; } else if (ret == 1) { return 0; } else { - rt->cur_rtp = NULL; + rt->cur_tx = NULL; } } /* read next RTP packet */ redo: - switch(rt->protocol) { + switch(rt->lower_transport) { default: - case RTSP_PROTOCOL_RTP_TCP: + case RTSP_LOWER_TRANSPORT_TCP: len = tcp_read_packet(s, &rtsp_st, buf, sizeof(buf)); break; - case RTSP_PROTOCOL_RTP_UDP: - case RTSP_PROTOCOL_RTP_UDP_MULTICAST: + 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->rtp_ctx) - rtp_check_and_send_back_rr(rtsp_st->rtp_ctx, len); + if (len >=0 && rtsp_st->tx_ctx && rt->transport == RTSP_TRANSPORT_RTP) + rtp_check_and_send_back_rr(rtsp_st->tx_ctx, len); break; } if (len < 0) return len; - ret = rtp_parse_packet(rtsp_st->rtp_ctx, pkt, buf, len); + if (rt->transport == RTSP_TRANSPORT_RDT) + ret = ff_rdt_parse_packet(rtsp_st->tx_ctx, pkt, buf, len); + else + ret = rtp_parse_packet(rtsp_st->tx_ctx, pkt, buf, len); if (ret < 0) goto redo; if (ret == 1) { /* more packets may follow, so we save the RTP context */ - rt->cur_rtp = rtsp_st->rtp_ctx; + rt->cur_tx = rtsp_st->tx_ctx; } return 0; } @@ -1329,24 +1426,25 @@ static int rtsp_read_play(AVFormatContext *s) av_log(s, AV_LOG_DEBUG, "hello state=%d\n", rt->state); - if (rt->state == RTSP_STATE_PAUSED) { - snprintf(cmd, sizeof(cmd), - "PLAY %s RTSP/1.0\r\n", - s->filename); - } else { - snprintf(cmd, sizeof(cmd), - "PLAY %s RTSP/1.0\r\n" - "Range: npt=%0.3f-\r\n", - s->filename, - (double)rt->seek_timestamp / AV_TIME_BASE); - } - rtsp_send_cmd(s, cmd, reply, NULL); - if (reply->status_code != RTSP_STATUS_OK) { - return -1; - } else { - rt->state = RTSP_STATE_PLAYING; - return 0; + if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) { + if (rt->state == RTSP_STATE_PAUSED) { + snprintf(cmd, sizeof(cmd), + "PLAY %s RTSP/1.0\r\n", + s->filename); + } else { + snprintf(cmd, sizeof(cmd), + "PLAY %s RTSP/1.0\r\n" + "Range: npt=%0.3f-\r\n", + s->filename, + (double)rt->seek_timestamp / AV_TIME_BASE); + } + rtsp_send_cmd(s, cmd, reply, NULL); + if (reply->status_code != RTSP_STATUS_OK) { + return -1; + } } + rt->state = RTSP_STATE_PLAYING; + return 0; } /* pause the stream */ @@ -1360,17 +1458,17 @@ static int rtsp_read_pause(AVFormatContext *s) if (rt->state != RTSP_STATE_PLAYING) return 0; - - snprintf(cmd, sizeof(cmd), - "PAUSE %s RTSP/1.0\r\n", - s->filename); - rtsp_send_cmd(s, cmd, reply, NULL); - if (reply->status_code != RTSP_STATUS_OK) { - return -1; - } else { - rt->state = RTSP_STATE_PAUSED; - return 0; + else if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) { + snprintf(cmd, sizeof(cmd), + "PAUSE %s RTSP/1.0\r\n", + s->filename); + rtsp_send_cmd(s, cmd, reply, NULL); + if (reply->status_code != RTSP_STATUS_OK) { + return -1; + } } + rt->state = RTSP_STATE_PAUSED; + return 0; } static int rtsp_read_seek(AVFormatContext *s, int stream_index, @@ -1402,7 +1500,7 @@ static int rtsp_read_close(AVFormatContext *s) #if 0 /* NOTE: it is valid to flush the buffer here */ - if (rt->protocol == RTSP_PROTOCOL_RTP_TCP) { + if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) { url_fclose(&rt->rtsp_gb); } #endif @@ -1460,7 +1558,6 @@ static int sdp_read_header(AVFormatContext *s, int size, i, err; char *content; char url[1024]; - AVStream *st; /* read the whole sdp file */ /* XXX: better loading */ @@ -1488,22 +1585,8 @@ static int sdp_read_header(AVFormatContext *s, err = AVERROR_INVALIDDATA; goto fail; } - /* open the RTP context */ - st = NULL; - if (rtsp_st->stream_index >= 0) - st = s->streams[rtsp_st->stream_index]; - if (!st) - s->ctx_flags |= AVFMTCTX_NOHEADER; - rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); - if (!rtsp_st->rtp_ctx) { - err = AVERROR(ENOMEM); + if ((err = rtsp_open_transport_ctx(s, rtsp_st))) goto fail; - } else { - if(rtsp_st->dynamic_handler) { - rtsp_st->rtp_ctx->dynamic_protocol_context= rtsp_st->dynamic_protocol_context; - rtsp_st->rtp_ctx->parse_packet= rtsp_st->dynamic_handler->parse_packet; - } - } } return 0; fail: