#include "avformat.h"
#include <sys/time.h>
-#include <unistd.h> /* for select() prototype */
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
#include <strings.h>
#include "network.h"
#include "rtsp.h"
};
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;
// 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 */
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);
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)
/* 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)},
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;
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 &&
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/<protocol> */
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++;
&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++;
for(i=0;i<rt->nb_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)
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, const char *real_challenge)
+ 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->server_type == RTSP_SERVER_RDT)
+ if (rt->transport == RTSP_TRANSPORT_RDT)
trans_pref = "x-pn-tng";
else
trans_pref = "RTP/AVP";
rtsp_st = rt->rtsp_streams[i];
/* RTP/UDP */
- if (protocol == RTSP_PROTOCOL_RTP_UDP) {
+ if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) {
char buf[256];
/* first try in specified port range */
rtp_opened:
port = rtp_get_local_port(rtsp_st->rtp_handle);
snprintf(transport, sizeof(transport) - 1,
- "%s/UDP;unicast;client_port=%d",
- trans_pref, port);
- if (rt->server_type == RTSP_SERVER_RTP)
+ "%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) {
+ 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) {
+ 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_RDT)
+ 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_RDT) {
+ 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);
/* 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];
}
}
break;
- case RTSP_PROTOCOL_RTP_UDP_MULTICAST:
+ case RTSP_LOWER_TRANSPORT_UDP_MULTICAST:
{
char url[1024];
struct in_addr in;
}
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_RDT)
+ if (rt->server_type == RTSP_SERVER_REAL)
rt->need_subscription = 1;
return 0;
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 */
*(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);
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
}
/* 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;
"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.
}
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,
- rt->server_type == RTSP_SERVER_RDT ?
+ 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;
}
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++) {
int ret, len;
uint8_t buf[RTP_MAX_PACKET_LENGTH];
- if (rt->server_type == RTSP_SERVER_RDT && rt->need_subscription) {
+ if (rt->server_type == RTSP_SERVER_REAL && rt->need_subscription) {
int i;
RTSPHeader reply1, *reply = &reply1;
char cmd[1024];
s->filename);
for (i = 0; i < rt->nb_rtsp_streams; i++) {
if (i != 0) av_strlcat(cmd, ",", sizeof(cmd));
- ff_rdt_subscribe_rule(
- rt->rtsp_streams[i]->rtp_ctx,
- cmd, sizeof(cmd), i, 0);
+ 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);
}
/* get next frames from the same RTP packet */
- if (rt->cur_rtp) {
- if (rt->server_type == RTSP_SERVER_RDT)
- ret = ff_rdt_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_rtp, pkt, NULL, 0);
+ 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;
- if (rt->server_type == RTSP_SERVER_RDT)
- ret = ff_rdt_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->rtp_ctx, pkt, buf, len);
+ 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;
}
av_log(s, AV_LOG_DEBUG, "hello state=%d\n", rt->state);
- if (!(rt->server_type == RTSP_SERVER_RDT && rt->need_subscription)) {
+ 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",
if (rt->state != RTSP_STATE_PLAYING)
return 0;
- else if (!(rt->server_type == RTSP_SERVER_RDT && rt->need_subscription)) {
+ else if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) {
snprintf(cmd, sizeof(cmd),
"PAUSE %s RTSP/1.0\r\n",
s->filename);
#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
int size, i, err;
char *content;
char url[1024];
- AVStream *st;
/* read the whole sdp file */
/* XXX: better loading */
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:
projects / ffmpeg / blobdiff