//#define DEBUG
//#define DEBUG_RTP_TCP
-#if LIBAVFORMAT_VERSION_INT < (53 << 16)
-int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP);
-#endif
-
/* Timeout values for socket select, in ms,
* and read_packet(), in seconds */
#define SELECT_TIMEOUT_MS 100
return 0;
}
+#if CONFIG_RTPDEC
+static void init_rtp_handler(RTPDynamicProtocolHandler *handler,
+ RTSPStream *rtsp_st, AVCodecContext *codec)
+{
+ if (!handler)
+ return;
+ codec->codec_id = handler->codec_id;
+ rtsp_st->dynamic_handler = handler;
+ if (handler->open)
+ rtsp_st->dynamic_protocol_context = handler->open();
+}
+
/* parse the rtpmap description: <codec_name>/<clock_rate>[/<other params>] */
static int sdp_parse_rtpmap(AVFormatContext *s,
- AVCodecContext *codec, RTSPStream *rtsp_st,
+ AVStream *st, RTSPStream *rtsp_st,
int payload_type, const char *p)
{
+ AVCodecContext *codec = st->codec;
char buf[256];
int i;
AVCodec *c;
* have a trailing space. */
get_word_sep(buf, sizeof(buf), "/ ", &p);
if (payload_type >= RTP_PT_PRIVATE) {
- RTPDynamicProtocolHandler *handler;
- for (handler = RTPFirstDynamicPayloadHandler;
- handler; handler = handler->next) {
- 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)
- rtsp_st->dynamic_protocol_context = handler->open();
- break;
- }
- }
+ RTPDynamicProtocolHandler *handler =
+ ff_rtp_handler_find_by_name(buf, codec->codec_type);
+ init_rtp_handler(handler, rtsp_st, codec);
/* 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
codec->channels = RTSP_DEFAULT_NB_AUDIO_CHANNELS;
if (i > 0) {
codec->sample_rate = i;
+ av_set_pts_info(st, 32, 1, codec->sample_rate);
get_word_sep(buf, sizeof(buf), "/", &p);
i = atoi(buf);
if (i > 0)
break;
case AVMEDIA_TYPE_VIDEO:
av_log(s, AV_LOG_DEBUG, "video codec set to: %s\n", c_name);
+ if (i > 0)
+ av_set_pts_info(st, 32, 1, i);
break;
default:
break;
rtsp_st->stream_index = st->index;
st->codec->codec_type = codec_type;
if (rtsp_st->sdp_payload_type < RTP_PT_PRIVATE) {
+ RTPDynamicProtocolHandler *handler;
/* if standard payload type, we can find the codec right now */
ff_rtp_get_codec_info(st->codec, rtsp_st->sdp_payload_type);
+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
+ st->codec->sample_rate > 0)
+ av_set_pts_info(st, 32, 1, st->codec->sample_rate);
+ /* Even static payload types may need a custom depacketizer */
+ handler = ff_rtp_handler_find_by_id(
+ rtsp_st->sdp_payload_type, st->codec->codec_type);
+ init_rtp_handler(handler, rtsp_st, st->codec);
}
}
/* put a default control url */
av_strlcpy(rt->control_uri, p,
sizeof(rt->control_uri));
} else {
- char proto[32];
- /* get the control url */
- st = s->streams[s->nb_streams - 1];
- rtsp_st = st->priv_data;
+ char proto[32];
+ /* get the control url */
+ st = s->streams[s->nb_streams - 1];
+ rtsp_st = st->priv_data;
- /* XXX: may need to add full url resolution */
- av_url_split(proto, sizeof(proto), NULL, 0, NULL, 0,
- NULL, NULL, 0, p);
- if (proto[0] == '\0') {
- /* relative control URL */
- if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/')
- av_strlcat(rtsp_st->control_url, "/",
- sizeof(rtsp_st->control_url));
- av_strlcat(rtsp_st->control_url, p,
- sizeof(rtsp_st->control_url));
- } else
- av_strlcpy(rtsp_st->control_url, p,
- sizeof(rtsp_st->control_url));
+ /* XXX: may need to add full url resolution */
+ av_url_split(proto, sizeof(proto), NULL, 0, NULL, 0,
+ NULL, NULL, 0, p);
+ if (proto[0] == '\0') {
+ /* relative control URL */
+ if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/')
+ av_strlcat(rtsp_st->control_url, "/",
+ sizeof(rtsp_st->control_url));
+ av_strlcat(rtsp_st->control_url, p,
+ sizeof(rtsp_st->control_url));
+ } else
+ av_strlcpy(rtsp_st->control_url, p,
+ sizeof(rtsp_st->control_url));
}
} else if (av_strstart(p, "rtpmap:", &p) && s->nb_streams > 0) {
/* NOTE: rtpmap is only supported AFTER the 'm=' tag */
payload_type = atoi(buf1);
st = s->streams[s->nb_streams - 1];
rtsp_st = st->priv_data;
- sdp_parse_rtpmap(s, st->codec, rtsp_st, payload_type, p);
+ sdp_parse_rtpmap(s, st, rtsp_st, payload_type, p);
} else if (av_strstart(p, "fmtp:", &p) ||
av_strstart(p, "framesize:", &p)) {
/* NOTE: fmtp is only supported AFTER the 'a=rtpmap:xxx' tag */
} else if (av_strstart(p, "IsRealDataType:integer;",&p)) {
if (atoi(p) == 1)
rt->transport = RTSP_TRANSPORT_RDT;
+ } else if (av_strstart(p, "SampleRate:integer;", &p) &&
+ s->nb_streams > 0) {
+ st = s->streams[s->nb_streams - 1];
+ st->codec->sample_rate = atoi(p);
} else {
if (rt->server_type == RTSP_SERVER_WMS)
ff_wms_parse_sdp_a_line(s, p);
}
}
-static int sdp_parse(AVFormatContext *s, const char *content)
+int ff_sdp_parse(AVFormatContext *s, const char *content)
{
const char *p;
int letter;
}
return 0;
}
+#endif /* CONFIG_RTPDEC */
/* close and free RTSP streams */
void ff_rtsp_close_streams(AVFormatContext *s)
av_metadata_free(&rtpctx->metadata);
av_free(rtpctx->streams[0]);
av_free(rtpctx);
- } else if (rt->transport == RTSP_TRANSPORT_RDT)
+ } else if (rt->transport == RTSP_TRANSPORT_RDT && CONFIG_RTPDEC)
ff_rdt_parse_close(rtsp_st->transport_priv);
- else
+ else if (CONFIG_RTPDEC)
rtp_parse_close(rtsp_st->transport_priv);
}
if (rtsp_st->rtp_handle)
if (!st)
s->ctx_flags |= AVFMTCTX_NOHEADER;
- if (s->oformat) {
+ if (s->oformat && CONFIG_RTSP_MUXER) {
rtsp_st->transport_priv = ff_rtp_chain_mux_open(s, st,
rtsp_st->rtp_handle,
RTSP_TCP_MAX_PACKET_SIZE);
/* Ownership of rtp_handle is passed to the rtp mux context */
rtsp_st->rtp_handle = NULL;
- } else if (rt->transport == RTSP_TRANSPORT_RDT)
+ } else if (rt->transport == RTSP_TRANSPORT_RDT && CONFIG_RTPDEC)
rtsp_st->transport_priv = ff_rdt_parse_open(s, st->index,
rtsp_st->dynamic_protocol_context,
rtsp_st->dynamic_handler);
- else
+ else if (CONFIG_RTPDEC)
rtsp_st->transport_priv = rtp_parse_open(s, st, rtsp_st->rtp_handle,
rtsp_st->sdp_payload_type,
(rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP || !s->max_delay)
if (!rtsp_st->transport_priv) {
return AVERROR(ENOMEM);
- } else if (rt->transport != RTSP_TRANSPORT_RDT) {
+ } else if (rt->transport != RTSP_TRANSPORT_RDT && CONFIG_RTPDEC) {
if (rtsp_st->dynamic_handler) {
rtp_parse_set_dynamic_protocol(rtsp_st->transport_priv,
rtsp_st->dynamic_protocol_context,
}
#if CONFIG_RTSP_DEMUXER || CONFIG_RTSP_MUXER
-static int rtsp_probe(AVProbeData *p)
-{
- if (av_strstart(p->filename, "rtsp:", NULL))
- return AVPROBE_SCORE_MAX;
- return 0;
-}
-
static void rtsp_parse_range(int *min_ptr, int *max_ptr, const char **pp)
{
const char *p;
}
}
+static void handle_rtp_info(RTSPState *rt, const char *url,
+ uint32_t seq, uint32_t rtptime)
+{
+ int i;
+ if (!rtptime || !url[0])
+ return;
+ if (rt->transport != RTSP_TRANSPORT_RTP)
+ return;
+ for (i = 0; i < rt->nb_rtsp_streams; i++) {
+ RTSPStream *rtsp_st = rt->rtsp_streams[i];
+ RTPDemuxContext *rtpctx = rtsp_st->transport_priv;
+ if (!rtpctx)
+ continue;
+ if (!strcmp(rtsp_st->control_url, url)) {
+ rtpctx->base_timestamp = rtptime;
+ break;
+ }
+ }
+}
+
+static void rtsp_parse_rtp_info(RTSPState *rt, const char *p)
+{
+ int read = 0;
+ char key[20], value[1024], url[1024] = "";
+ uint32_t seq = 0, rtptime = 0;
+
+ for (;;) {
+ p += strspn(p, SPACE_CHARS);
+ if (!*p)
+ break;
+ get_word_sep(key, sizeof(key), "=", &p);
+ if (*p != '=')
+ break;
+ p++;
+ get_word_sep(value, sizeof(value), ";, ", &p);
+ read++;
+ if (!strcmp(key, "url"))
+ av_strlcpy(url, value, sizeof(url));
+ else if (!strcmp(key, "seq"))
+ seq = strtol(value, NULL, 10);
+ else if (!strcmp(key, "rtptime"))
+ rtptime = strtol(value, NULL, 10);
+ if (*p == ',') {
+ handle_rtp_info(rt, url, seq, rtptime);
+ url[0] = '\0';
+ seq = rtptime = 0;
+ read = 0;
+ }
+ if (*p)
+ p++;
+ }
+ if (read > 0)
+ handle_rtp_info(rt, url, seq, rtptime);
+}
+
void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
- HTTPAuthState *auth_state)
+ RTSPState *rt, const char *method)
{
const char *p;
} else if (av_stristart(p, "Location:", &p)) {
p += strspn(p, SPACE_CHARS);
av_strlcpy(reply->location, p , sizeof(reply->location));
- } else if (av_stristart(p, "WWW-Authenticate:", &p) && auth_state) {
+ } else if (av_stristart(p, "WWW-Authenticate:", &p) && rt) {
+ p += strspn(p, SPACE_CHARS);
+ ff_http_auth_handle_header(&rt->auth_state, "WWW-Authenticate", p);
+ } else if (av_stristart(p, "Authentication-Info:", &p) && rt) {
+ p += strspn(p, SPACE_CHARS);
+ ff_http_auth_handle_header(&rt->auth_state, "Authentication-Info", p);
+ } else if (av_stristart(p, "Content-Base:", &p) && rt) {
p += strspn(p, SPACE_CHARS);
- ff_http_auth_handle_header(auth_state, "WWW-Authenticate", p);
- } else if (av_stristart(p, "Authentication-Info:", &p) && auth_state) {
+ if (method && !strcmp(method, "DESCRIBE"))
+ av_strlcpy(rt->control_uri, p , sizeof(rt->control_uri));
+ } else if (av_stristart(p, "RTP-Info:", &p) && rt) {
p += strspn(p, SPACE_CHARS);
- ff_http_auth_handle_header(auth_state, "Authentication-Info", p);
+ if (method && !strcmp(method, "PLAY"))
+ rtsp_parse_rtp_info(rt, p);
}
}
int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
unsigned char **content_ptr,
- int return_on_interleaved_data)
+ int return_on_interleaved_data, const char *method)
{
RTSPState *rt = s->priv_data;
char buf[4096], buf1[1024], *q;
reply->status_code = atoi(buf1);
av_strlcpy(reply->reason, p, sizeof(reply->reason));
} else {
- ff_rtsp_parse_line(reply, p, &rt->auth_state);
+ ff_rtsp_parse_line(reply, p, rt, method);
av_strlcat(rt->last_reply, p, sizeof(rt->last_reply));
av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply));
}
send_content_length)))
return ret;
- if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0) ) < 0)
+ if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0, method) ) < 0)
return ret;
if (reply->status_code == 401 && cur_auth_type == HTTP_AUTH_NONE &&
/**
* @return 0 on success, <0 on error, 1 if protocol is unavailable.
*/
-static int make_setup_request(AVFormatContext *s, const char *host, int port,
+int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
int lower_transport, const char *real_challenge)
{
RTSPState *rt = s->priv_data;
err = AVERROR_INVALIDDATA;
goto fail;
}
+#else
+ av_log(s, AV_LOG_ERROR, "Unable to open an input RTP port\n");
+ err = AVERROR(EIO);
+ goto fail;
#endif
rtp_opened:
- port = rtp_get_local_port(rtsp_st->rtp_handle);
+ port = rtp_get_local_rtp_port(rtsp_st->rtp_handle);
have_port:
snprintf(transport, sizeof(transport) - 1,
"%s/UDP;", trans_pref);
snprintf(cmd, sizeof(cmd),
"Transport: %s\r\n",
transport);
- if (i == 0 && rt->server_type == RTSP_SERVER_REAL) {
+ if (i == 0 && rt->server_type == RTSP_SERVER_REAL && CONFIG_RTPDEC) {
char real_res[41], real_csum[9];
ff_rdt_calc_response_and_checksum(real_res, real_csum,
real_challenge);
rt->transport = reply->transports[0].transport;
}
- /* close RTP connection if not chosen */
- 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;
+ /* Fail if the server responded with another lower transport mode
+ * than what we requested. */
+ if (reply->transports[0].lower_transport != lower_transport) {
+ av_log(s, AV_LOG_ERROR, "Nonmatching transport in server reply\n");
+ err = AVERROR_INVALIDDATA;
+ goto fail;
}
switch(reply->transports[0].lower_transport) {
break;
case RTSP_LOWER_TRANSPORT_UDP: {
- char url[1024];
+ char url[1024], options[30] = "";
+ if (rt->filter_source)
+ av_strlcpy(options, "?connect=1", sizeof(options));
/* 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);
+ reply->transports[0].server_port_min, options);
} else {
ff_url_join(url, sizeof(url), "rtp", NULL, host,
- reply->transports[0].server_port_min, NULL);
+ reply->transports[0].server_port_min, options);
}
if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) &&
rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) {
* potential NAT router by sending dummy packets.
* RTP/RTCP dummy packets are used for RDT, too.
*/
- if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) && s->iformat)
+ if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) && s->iformat &&
+ CONFIG_RTPDEC)
rtp_send_punch_packets(rtsp_st->rtp_handle);
break;
}
return err;
}
-static int rtsp_read_play(AVFormatContext *s)
-{
- RTSPState *rt = s->priv_data;
- RTSPMessageHeader reply1, *reply = &reply1;
- int i;
- 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) {
- cmd[0] = 0;
- } else {
- snprintf(cmd, sizeof(cmd),
- "Range: npt=%0.3f-\r\n",
- (double)rt->seek_timestamp / AV_TIME_BASE);
- }
- ff_rtsp_send_cmd(s, "PLAY", rt->control_uri, cmd, reply, NULL);
- if (reply->status_code != RTSP_STATUS_OK) {
- return -1;
- }
- if (rt->transport == RTSP_TRANSPORT_RTP) {
- for (i = 0; i < rt->nb_rtsp_streams; i++) {
- RTSPStream *rtsp_st = rt->rtsp_streams[i];
- RTPDemuxContext *rtpctx = rtsp_st->transport_priv;
- AVStream *st = NULL;
- if (!rtpctx)
- continue;
- if (rtsp_st->stream_index >= 0)
- st = s->streams[rtsp_st->stream_index];
- ff_rtp_reset_packet_queue(rtpctx);
- if (reply->range_start != AV_NOPTS_VALUE) {
- rtpctx->last_rtcp_ntp_time = AV_NOPTS_VALUE;
- rtpctx->first_rtcp_ntp_time = AV_NOPTS_VALUE;
- if (st)
- rtpctx->range_start_offset =
- av_rescale_q(reply->range_start, AV_TIME_BASE_Q,
- st->time_base);
- }
- }
- }
- }
- rt->state = RTSP_STATE_STREAMING;
- return 0;
-}
-
-static int rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply)
-{
- RTSPState *rt = s->priv_data;
- char cmd[1024];
- unsigned char *content = NULL;
- int ret;
-
- /* describe the stream */
- snprintf(cmd, sizeof(cmd),
- "Accept: application/sdp\r\n");
- if (rt->server_type == RTSP_SERVER_REAL) {
- /**
- * The Require: attribute is needed for proper streaming from
- * Realmedia servers.
- */
- av_strlcat(cmd,
- "Require: com.real.retain-entity-for-setup\r\n",
- sizeof(cmd));
- }
- ff_rtsp_send_cmd(s, "DESCRIBE", rt->control_uri, cmd, reply, &content);
- if (!content)
- return AVERROR_INVALIDDATA;
- if (reply->status_code != RTSP_STATUS_OK) {
- av_freep(&content);
- return AVERROR_INVALIDDATA;
- }
-
- av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", content);
- /* now we got the SDP description, we parse it */
- ret = sdp_parse(s, (const char *)content);
- av_freep(&content);
- if (ret < 0)
- return AVERROR_INVALIDDATA;
-
- return 0;
-}
-
-static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr)
-{
- RTSPState *rt = s->priv_data;
- RTSPMessageHeader reply1, *reply = &reply1;
- int i;
- char *sdp;
- AVFormatContext sdp_ctx, *ctx_array[1];
-
- s->start_time_realtime = av_gettime();
-
- /* Announce the stream */
- sdp = av_mallocz(SDP_MAX_SIZE);
- if (sdp == NULL)
- return AVERROR(ENOMEM);
- /* We create the SDP based on the RTSP AVFormatContext where we
- * aren't allowed to change the filename field. (We create the SDP
- * based on the RTSP context since the contexts for the RTP streams
- * don't exist yet.) In order to specify a custom URL with the actual
- * peer IP instead of the originally specified hostname, we create
- * a temporary copy of the AVFormatContext, where the custom URL is set.
- *
- * FIXME: Create the SDP without copying the AVFormatContext.
- * This either requires setting up the RTP stream AVFormatContexts
- * already here (complicating things immensely) or getting a more
- * flexible SDP creation interface.
- */
- sdp_ctx = *s;
- ff_url_join(sdp_ctx.filename, sizeof(sdp_ctx.filename),
- "rtsp", NULL, addr, -1, NULL);
- ctx_array[0] = &sdp_ctx;
- if (avf_sdp_create(ctx_array, 1, sdp, SDP_MAX_SIZE)) {
- av_free(sdp);
- return AVERROR_INVALIDDATA;
- }
- av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp);
- ff_rtsp_send_cmd_with_content(s, "ANNOUNCE", rt->control_uri,
- "Content-Type: application/sdp\r\n",
- reply, NULL, sdp, strlen(sdp));
- av_free(sdp);
- if (reply->status_code != RTSP_STATUS_OK)
- return AVERROR_INVALIDDATA;
-
- /* Set up the RTSPStreams for each AVStream */
- for (i = 0; i < s->nb_streams; i++) {
- RTSPStream *rtsp_st;
- AVStream *st = s->streams[i];
-
- rtsp_st = av_mallocz(sizeof(RTSPStream));
- if (!rtsp_st)
- return AVERROR(ENOMEM);
- dynarray_add(&rt->rtsp_streams, &rt->nb_rtsp_streams, rtsp_st);
-
- st->priv_data = rtsp_st;
- rtsp_st->stream_index = i;
-
- av_strlcpy(rtsp_st->control_url, rt->control_uri, sizeof(rtsp_st->control_url));
- /* Note, this must match the relative uri set in the sdp content */
- av_strlcatf(rtsp_st->control_url, sizeof(rtsp_st->control_url),
- "/streamid=%d", i);
- }
-
- return 0;
-}
-
void ff_rtsp_close_connections(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
} else if(!strcmp(option, "http")) {
lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_TCP);
rt->control_transport = RTSP_MODE_TUNNEL;
+ } else if (!strcmp(option, "filter_src")) {
+ rt->filter_source = 1;
} else {
/* Write options back into the buffer, using memmove instead
* of strcpy since the strings may overlap. */
break;
}
- if (s->iformat)
- err = rtsp_setup_input_streams(s, reply);
- else
- err = rtsp_setup_output_streams(s, host);
+ if (s->iformat && CONFIG_RTSP_DEMUXER)
+ err = ff_rtsp_setup_input_streams(s, reply);
+ else if (CONFIG_RTSP_MUXER)
+ err = ff_rtsp_setup_output_streams(s, host);
if (err)
goto fail;
int lower_transport = ff_log2_tab[lower_transport_mask &
~(lower_transport_mask - 1)];
- err = make_setup_request(s, host, port, lower_transport,
+ err = ff_rtsp_make_setup_request(s, host, port, lower_transport,
rt->server_type == RTSP_SERVER_REAL ?
real_challenge : NULL);
if (err < 0)
}
#endif /* CONFIG_RTSP_DEMUXER || CONFIG_RTSP_MUXER */
+#if CONFIG_RTPDEC
static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
uint8_t *buf, int buf_size, int64_t wait_end)
{
if (tcp_fd != -1 && FD_ISSET(tcp_fd, &rfds)) {
RTSPMessageHeader reply;
- ret = ff_rtsp_read_reply(s, &reply, NULL, 0);
+ ret = ff_rtsp_read_reply(s, &reply, NULL, 0, NULL);
if (ret < 0)
return ret;
/* XXX: parse message */
}
}
-static int tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
- uint8_t *buf, int buf_size);
-
-static int rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt)
+int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt)
{
RTSPState *rt = s->priv_data;
int ret, len;
int64_t first_queue_time = 0;
for (i = 0; i < rt->nb_rtsp_streams; i++) {
RTPDemuxContext *rtpctx = rt->rtsp_streams[i]->transport_priv;
- int64_t queue_time = ff_rtp_queued_packet_time(rtpctx);
+ int64_t queue_time;
+ if (!rtpctx)
+ continue;
+ queue_time = ff_rtp_queued_packet_time(rtpctx);
if (queue_time && (queue_time - first_queue_time < 0 ||
!first_queue_time)) {
first_queue_time = queue_time;
default:
#if CONFIG_RTSP_DEMUXER
case RTSP_LOWER_TRANSPORT_TCP:
- len = tcp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE);
+ len = ff_rtsp_tcp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE);
break;
#endif
case RTSP_LOWER_TRANSPORT_UDP:
* in order to map their timestamp origin to the same ntp time
* as this one. */
int i;
+ AVStream *st = NULL;
+ if (rtsp_st->stream_index >= 0)
+ st = s->streams[rtsp_st->stream_index];
for (i = 0; i < rt->nb_rtsp_streams; i++) {
RTPDemuxContext *rtpctx2 = rt->rtsp_streams[i]->transport_priv;
- if (rtpctx2 &&
- rtpctx2->first_rtcp_ntp_time == AV_NOPTS_VALUE)
+ AVStream *st2 = NULL;
+ if (rt->rtsp_streams[i]->stream_index >= 0)
+ st2 = s->streams[rt->rtsp_streams[i]->stream_index];
+ if (rtpctx2 && st && st2 &&
+ rtpctx2->first_rtcp_ntp_time == AV_NOPTS_VALUE) {
rtpctx2->first_rtcp_ntp_time = rtpctx->first_rtcp_ntp_time;
+ rtpctx2->rtcp_ts_offset = av_rescale_q(
+ rtpctx->rtcp_ts_offset, st->time_base,
+ st2->time_base);
+ }
}
}
if (ret == -RTCP_BYE) {
return ret;
}
+#endif /* CONFIG_RTPDEC */
-#if CONFIG_RTSP_DEMUXER
-static int rtsp_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
-{
- RTSPState *rt = s->priv_data;
- int ret;
-
- ret = ff_rtsp_connect(s);
- if (ret)
- return ret;
-
- rt->real_setup_cache = av_mallocz(2 * s->nb_streams * sizeof(*rt->real_setup_cache));
- if (!rt->real_setup_cache)
- return AVERROR(ENOMEM);
- rt->real_setup = rt->real_setup_cache + s->nb_streams * sizeof(*rt->real_setup);
-
- if (ap->initial_pause) {
- /* do not start immediately */
- } else {
- if (rtsp_read_play(s) < 0) {
- ff_rtsp_close_streams(s);
- ff_rtsp_close_connections(s);
- return AVERROR_INVALIDDATA;
- }
- }
-
- return 0;
-}
-
-static int tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
- uint8_t *buf, int buf_size)
-{
- RTSPState *rt = s->priv_data;
- int id, len, i, ret;
- RTSPStream *rtsp_st;
-
-#ifdef DEBUG_RTP_TCP
- dprintf(s, "tcp_read_packet:\n");
-#endif
-redo:
- for (;;) {
- RTSPMessageHeader reply;
-
- ret = ff_rtsp_read_reply(s, &reply, NULL, 1);
- if (ret < 0)
- return ret;
- if (ret == 1) /* received '$' */
- break;
- /* XXX: parse message */
- if (rt->state != RTSP_STATE_STREAMING)
- return 0;
- }
- 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
- dprintf(s, "id=%d len=%d\n", id, len);
-#endif
- if (len > buf_size || len < 12)
- goto redo;
- /* get the data */
- ret = url_read_complete(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++) {
- rtsp_st = rt->rtsp_streams[i];
- if (id >= rtsp_st->interleaved_min &&
- id <= rtsp_st->interleaved_max)
- goto found;
- }
- goto redo;
-found:
- *prtsp_st = rtsp_st;
- return len;
-}
-static int rtsp_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
- RTSPState *rt = s->priv_data;
- int ret;
- RTSPMessageHeader reply1, *reply = &reply1;
- char cmd[1024];
-
- if (rt->server_type == RTSP_SERVER_REAL) {
- int i;
-
- for (i = 0; i < s->nb_streams; i++)
- rt->real_setup[i] = s->streams[i]->discard;
-
- if (!rt->need_subscription) {
- if (memcmp (rt->real_setup, rt->real_setup_cache,
- sizeof(enum AVDiscard) * s->nb_streams)) {
- snprintf(cmd, sizeof(cmd),
- "Unsubscribe: %s\r\n",
- rt->last_subscription);
- ff_rtsp_send_cmd(s, "SET_PARAMETER", rt->control_uri,
- cmd, reply, NULL);
- if (reply->status_code != RTSP_STATUS_OK)
- return AVERROR_INVALIDDATA;
- rt->need_subscription = 1;
- }
- }
-
- if (rt->need_subscription) {
- int r, rule_nr, first = 1;
-
- memcpy(rt->real_setup_cache, rt->real_setup,
- sizeof(enum AVDiscard) * s->nb_streams);
- rt->last_subscription[0] = 0;
-
- snprintf(cmd, sizeof(cmd),
- "Subscribe: ");
- 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);
- ff_rtsp_send_cmd(s, "SET_PARAMETER", rt->control_uri,
- cmd, reply, NULL);
- if (reply->status_code != RTSP_STATUS_OK)
- return AVERROR_INVALIDDATA;
- rt->need_subscription = 0;
-
- if (rt->state == RTSP_STATE_STREAMING)
- rtsp_read_play (s);
- }
- }
-
- ret = rtsp_fetch_packet(s, pkt);
- if (ret < 0)
- return ret;
-
- /* send dummy request to keep TCP connection alive */
- if ((av_gettime() - rt->last_cmd_time) / 1000000 >= rt->timeout / 2) {
- if (rt->server_type == RTSP_SERVER_WMS) {
- ff_rtsp_send_cmd_async(s, "GET_PARAMETER", rt->control_uri, NULL);
- } else {
- ff_rtsp_send_cmd_async(s, "OPTIONS", "*", NULL);
- }
- }
-
- return 0;
-}
-
-/* pause the stream */
-static int rtsp_read_pause(AVFormatContext *s)
-{
- RTSPState *rt = s->priv_data;
- RTSPMessageHeader reply1, *reply = &reply1;
-
- if (rt->state != RTSP_STATE_STREAMING)
- return 0;
- else if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) {
- ff_rtsp_send_cmd(s, "PAUSE", rt->control_uri, NULL, 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,
- int64_t timestamp, int flags)
-{
- RTSPState *rt = s->priv_data;
-
- rt->seek_timestamp = av_rescale_q(timestamp,
- s->streams[stream_index]->time_base,
- AV_TIME_BASE_Q);
- switch(rt->state) {
- default:
- case RTSP_STATE_IDLE:
- break;
- case RTSP_STATE_STREAMING:
- if (rtsp_read_pause(s) != 0)
- return -1;
- rt->state = RTSP_STATE_SEEKING;
- if (rtsp_read_play(s) != 0)
- return -1;
- break;
- case RTSP_STATE_PAUSED:
- rt->state = RTSP_STATE_IDLE;
- break;
- }
- return 0;
-}
-
-static int rtsp_read_close(AVFormatContext *s)
-{
- RTSPState *rt = s->priv_data;
-
-#if 0
- /* NOTE: it is valid to flush the buffer here */
- if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
- url_fclose(&rt->rtsp_gb);
- }
-#endif
- ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL);
-
- ff_rtsp_close_streams(s);
- ff_rtsp_close_connections(s);
- ff_network_close();
- rt->real_setup = NULL;
- av_freep(&rt->real_setup_cache);
- return 0;
-}
-
-AVInputFormat rtsp_demuxer = {
- "rtsp",
- NULL_IF_CONFIG_SMALL("RTSP input format"),
- sizeof(RTSPState),
- rtsp_probe,
- rtsp_read_header,
- rtsp_read_packet,
- rtsp_read_close,
- rtsp_read_seek,
- .flags = AVFMT_NOFILE,
- .read_play = rtsp_read_play,
- .read_pause = rtsp_read_pause,
-};
-#endif /* CONFIG_RTSP_DEMUXER */
-
+#if CONFIG_SDP_DEMUXER
static int sdp_probe(AVProbeData *p1)
{
const char *p = p1->buf, *p_end = p1->buf + p1->buf_size;
}
content[size] ='\0';
- sdp_parse(s, content);
+ ff_sdp_parse(s, content);
av_free(content);
/* open each RTP stream */
sizeof(RTSPState),
sdp_probe,
sdp_read_header,
- rtsp_fetch_packet,
+ ff_rtsp_fetch_packet,
sdp_read_close,
};
+#endif /* CONFIG_SDP_DEMUXER */
+#if CONFIG_RTP_DEMUXER
static int rtp_probe(AVProbeData *p)
{
if (av_strstart(p->filename, "rtp:", NULL))
sizeof(RTSPState),
rtp_probe,
rtp_read_header,
- rtsp_fetch_packet,
+ ff_rtsp_fetch_packet,
sdp_read_close,
.flags = AVFMT_NOFILE,
};
+#endif /* CONFIG_RTP_DEMUXER */
projects / ffmpeg / blobdiff