#define READ_PACKET_TIMEOUT_S 10
#define MAX_TIMEOUTS READ_PACKET_TIMEOUT_S * 1000 / SELECT_TIMEOUT_MS
#define SDP_MAX_SIZE 16384
+#define RECVBUF_SIZE 10 * RTP_MAX_PACKET_LENGTH
static void get_word_until_chars(char *buf, int buf_size,
const char *sep, const char **pp)
break;
}
}
+ /* If no dynamic handler was found, check with the list of standard
+ * allocated types, if such a stream for some reason happens to
+ * use a private payload type. This isn't handled in rtpdec.c, since
+ * the format name from the rtpmap line never is passed into rtpdec. */
+ if (!rtsp_st->dynamic_handler)
+ codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type);
} else {
/* We are in a standard case
* (from http://www.iana.org/assignments/rtp-parameters). */
// av_log(NULL, AV_LOG_DEBUG, "Range End: %lld\n", *end);
}
+static int get_sockaddr(const char *buf, struct sockaddr_storage *sock)
+{
+ struct addrinfo hints, *ai = NULL;
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_NUMERICHOST;
+ if (getaddrinfo(buf, NULL, &hints, &ai))
+ return -1;
+ memcpy(sock, ai->ai_addr, FFMIN(sizeof(*sock), ai->ai_addrlen));
+ freeaddrinfo(ai);
+ return 0;
+}
+
typedef struct SDPParseState {
/* SDP only */
- struct in_addr default_ip;
+ struct sockaddr_storage default_ip;
int default_ttl;
int skip_media; ///< set if an unknown m= line occurs
} SDPParseState;
int payload_type, i;
AVStream *st;
RTSPStream *rtsp_st;
- struct in_addr sdp_ip;
+ struct sockaddr_storage sdp_ip;
int ttl;
dprintf(s, "sdp: %c='%s'\n", letter, buf);
if (strcmp(buf1, "IN") != 0)
return;
get_word(buf1, sizeof(buf1), &p);
- if (strcmp(buf1, "IP4") != 0)
+ if (strcmp(buf1, "IP4") && strcmp(buf1, "IP6"))
return;
get_word_sep(buf1, sizeof(buf1), "/", &p);
- if (ff_inet_aton(buf1, &sdp_ip) == 0)
+ if (get_sockaddr(buf1, &sdp_ip))
return;
ttl = 16;
if (*p == '/') {
av_close_input_stream (rt->asf_ctx);
rt->asf_ctx = NULL;
}
+ av_free(rt->recvbuf);
}
static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
th->ttl = strtol(p, (char **)&p, 10);
}
} else if (!strcmp(parameter, "destination")) {
- struct in_addr ipaddr;
-
if (*p == '=') {
p++;
get_word_sep(buf, sizeof(buf), ";,", &p);
- if (ff_inet_aton(buf, &ipaddr))
- th->destination = ntohl(ipaddr.s_addr);
+ get_sockaddr(buf, &th->destination);
+ }
+ } else if (!strcmp(parameter, "source")) {
+ if (*p == '=') {
+ p++;
+ get_word_sep(buf, sizeof(buf), ";,", &p);
+ av_strlcpy(th->source, buf, sizeof(th->source));
}
}
+
while (*p != ';' && *p != '\0' && *p != ',')
p++;
if (*p == ';')
dprintf(s, "ret=%d c=%02x [%c]\n", ret, ch, ch);
#endif
if (ret != 1)
- return -1;
+ return AVERROR_EOF;
if (ch == '\n')
break;
if (ch == '$') {
case RTSP_LOWER_TRANSPORT_UDP: {
char url[1024];
- /* XXX: also use address if specified */
- ff_url_join(url, sizeof(url), "rtp", NULL, host,
- reply->transports[0].server_port_min, NULL);
+ /* Use source address if specified */
+ if (reply->transports[0].source[0]) {
+ ff_url_join(url, sizeof(url), "rtp", NULL,
+ reply->transports[0].source,
+ reply->transports[0].server_port_min, NULL);
+ } else {
+ ff_url_join(url, sizeof(url), "rtp", NULL, host,
+ reply->transports[0].server_port_min, NULL);
+ }
if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) &&
rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) {
err = AVERROR_INVALIDDATA;
break;
}
case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: {
- char url[1024];
- struct in_addr in;
+ char url[1024], namebuf[50];
+ struct sockaddr_storage addr;
int port, ttl;
- if (reply->transports[0].destination) {
- in.s_addr = htonl(reply->transports[0].destination);
+ if (reply->transports[0].destination.ss_family) {
+ addr = reply->transports[0].destination;
port = reply->transports[0].port_min;
ttl = reply->transports[0].ttl;
} else {
- in = rtsp_st->sdp_ip;
+ addr = rtsp_st->sdp_ip;
port = rtsp_st->sdp_port;
ttl = rtsp_st->sdp_ttl;
}
- ff_url_join(url, sizeof(url), "rtp", NULL, inet_ntoa(in),
+ getnameinfo((struct sockaddr*) &addr, sizeof(addr),
+ namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
+ ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
port, "?ttl=%d", ttl);
if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) {
err = AVERROR_INVALIDDATA;
char cmd[1024];
av_log(s, AV_LOG_DEBUG, "hello state=%d\n", rt->state);
+ rt->nb_byes = 0;
if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) {
if (rt->state == RTSP_STATE_PAUSED) {
RTSPState *rt = s->priv_data;
RTSPStream *rtsp_st;
fd_set rfds;
- int fd, fd_max, n, i, ret, tcp_fd, timeout_cnt = 0;
+ int fd, fd_rtcp, fd_max, n, i, ret, tcp_fd, timeout_cnt = 0;
struct timeval tv;
for (;;) {
for (i = 0; i < rt->nb_rtsp_streams; i++) {
rtsp_st = rt->rtsp_streams[i];
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_rtcp = rtp_get_rtcp_file_handle(rtsp_st->rtp_handle);
+ if (FFMAX(fd, fd_rtcp) > fd_max)
+ fd_max = FFMAX(fd, fd_rtcp);
FD_SET(fd, &rfds);
+ FD_SET(fd_rtcp, &rfds);
}
}
tv.tv_sec = 0;
rtsp_st = rt->rtsp_streams[i];
if (rtsp_st->rtp_handle) {
fd = url_get_file_handle(rtsp_st->rtp_handle);
- if (FD_ISSET(fd, &rfds)) {
+ fd_rtcp = rtp_get_rtcp_file_handle(rtsp_st->rtp_handle);
+ if (FD_ISSET(fd_rtcp, &rfds) || FD_ISSET(fd, &rfds)) {
ret = url_read(rtsp_st->rtp_handle, buf, buf_size);
if (ret > 0) {
*prtsp_st = rtsp_st;
RTSPMessageHeader reply;
ret = ff_rtsp_read_reply(s, &reply, NULL, 1);
- if (ret == -1)
- return -1;
+ if (ret < 0)
+ return ret;
if (ret == 1) /* received '$' */
break;
/* XXX: parse message */
{
RTSPState *rt = s->priv_data;
int ret, len;
- uint8_t buf[10 * RTP_MAX_PACKET_LENGTH];
RTSPStream *rtsp_st;
+ if (rt->nb_byes == rt->nb_rtsp_streams)
+ return AVERROR_EOF;
+
/* get next frames from the same RTP packet */
if (rt->cur_transport_priv) {
if (rt->transport == RTSP_TRANSPORT_RDT) {
/* read next RTP packet */
redo:
+ if (!rt->recvbuf) {
+ rt->recvbuf = av_malloc(RECVBUF_SIZE);
+ if (!rt->recvbuf)
+ return AVERROR(ENOMEM);
+ }
+
switch(rt->lower_transport) {
default:
#if CONFIG_RTSP_DEMUXER
case RTSP_LOWER_TRANSPORT_TCP:
- len = tcp_read_packet(s, &rtsp_st, buf, sizeof(buf));
+ len = tcp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE);
break;
#endif
case RTSP_LOWER_TRANSPORT_UDP:
case RTSP_LOWER_TRANSPORT_UDP_MULTICAST:
- len = udp_read_packet(s, &rtsp_st, buf, sizeof(buf));
+ len = udp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE);
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 AVERROR_EOF;
if (rt->transport == RTSP_TRANSPORT_RDT) {
- ret = ff_rdt_parse_packet(rtsp_st->transport_priv, pkt, buf, len);
+ ret = ff_rdt_parse_packet(rtsp_st->transport_priv, pkt, &rt->recvbuf, len);
} else {
- ret = rtp_parse_packet(rtsp_st->transport_priv, pkt, buf, len);
+ ret = rtp_parse_packet(rtsp_st->transport_priv, pkt, &rt->recvbuf, len);
if (ret < 0) {
/* Either bad packet, or a RTCP packet. Check if the
* first_rtcp_ntp_time field was initialized. */
* as this one. */
int i;
for (i = 0; i < rt->nb_rtsp_streams; i++) {
- RTPDemuxContext *rtpctx2 = rtsp_st->transport_priv;
+ RTPDemuxContext *rtpctx2 = rt->rtsp_streams[i]->transport_priv;
if (rtpctx2 &&
rtpctx2->first_rtcp_ntp_time == AV_NOPTS_VALUE)
rtpctx2->first_rtcp_ntp_time = rtpctx->first_rtcp_ntp_time;
}
}
+ if (ret == -RTCP_BYE) {
+ rt->nb_byes++;
+
+ av_log(s, AV_LOG_DEBUG, "Received BYE for stream %d (%d/%d)\n",
+ rtsp_st->stream_index, rt->nb_byes, rt->nb_rtsp_streams);
+
+ if (rt->nb_byes == rt->nb_rtsp_streams)
+ return AVERROR_EOF;
+ }
}
}
if (ret < 0)
{
const char *p = p1->buf, *p_end = p1->buf + p1->buf_size;
- /* we look for a line beginning "c=IN IP4" */
+ /* we look for a line beginning "c=IN IP" */
while (p < p_end && *p != '\0') {
- if (p + sizeof("c=IN IP4") - 1 < p_end &&
- av_strstart(p, "c=IN IP4", NULL))
+ if (p + sizeof("c=IN IP") - 1 < p_end &&
+ av_strstart(p, "c=IN IP", NULL))
return AVPROBE_SCORE_MAX / 2;
while (p < p_end - 1 && *p != '\n') p++;
/* open each RTP stream */
for (i = 0; i < rt->nb_rtsp_streams; i++) {
+ char namebuf[50];
rtsp_st = rt->rtsp_streams[i];
+ getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, sizeof(rtsp_st->sdp_ip),
+ namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
ff_url_join(url, sizeof(url), "rtp", NULL,
- inet_ntoa(rtsp_st->sdp_ip), rtsp_st->sdp_port,
+ namebuf, rtsp_st->sdp_port,
"?localport=%d&ttl=%d", rtsp_st->sdp_port,
rtsp_st->sdp_ttl);
if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) {
projects / ffmpeg / blobdiff