//#define DEBUG
//#define DEBUG_RTP_TCP
-static int rtsp_read_play(AVFormatContext *s);
-
#if LIBAVFORMAT_VERSION_INT < (53 << 16)
int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP);
#endif
-static int rtsp_probe(AVProbeData *p)
-{
- if (av_strstart(p->filename, "rtsp:", NULL))
- return AVPROBE_SCORE_MAX;
- return 0;
-}
-
#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'. */
get_word_until_chars(buf, buf_size, SPACE_CHARS, pp);
}
-/* parse the rtpmap description: <codec_name>/<clock_rate>[/<other
- params>] */
-static int sdp_parse_rtpmap(AVCodecContext *codec, RTSPStream *rtsp_st, int payload_type, const char *p)
+/* parse the rtpmap description: <codec_name>/<clock_rate>[/<other params>] */
+static int sdp_parse_rtpmap(AVFormatContext *s,
+ AVCodecContext *codec, RTSPStream *rtsp_st,
+ int payload_type, const char *p)
{
char buf[256];
int i;
const char *c_name;
/* Loop into AVRtpDynamicPayloadTypes[] and AVRtpPayloadTypes[] and
- see if we can handle this kind of payload */
- get_word_sep(buf, sizeof(buf), "/", &p);
+ * see if we can handle this kind of payload.
+ * The space should normally not be there but some Real streams or
+ * particular servers ("RealServer Version 6.1.3.970", see issue 1658)
+ * have a trailing space. */
+ get_word_sep(buf, sizeof(buf), "/ ", &p);
if (payload_type >= RTP_PT_PRIVATE) {
- RTPDynamicProtocolHandler *handler= RTPFirstDynamicPayloadHandler;
- while(handler) {
- 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();
- }
+ 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;
}
- handler= handler->next;
}
} else {
- /* We are in a standard case ( from http://www.iana.org/assignments/rtp-parameters) */
+ /* We are in a standard case
+ * (from http://www.iana.org/assignments/rtp-parameters). */
/* search into AVRtpPayloadTypes[] */
codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type);
}
if (c && c->name)
c_name = c->name;
else
- c_name = (char *)NULL;
+ c_name = (char *) NULL;
if (c_name) {
get_word_sep(buf, sizeof(buf), "/", &p);
i = atoi(buf);
switch (codec->codec_type) {
- case CODEC_TYPE_AUDIO:
- av_log(codec, AV_LOG_DEBUG, " audio codec set to : %s\n", c_name);
- codec->sample_rate = RTSP_DEFAULT_AUDIO_SAMPLERATE;
- codec->channels = RTSP_DEFAULT_NB_AUDIO_CHANNELS;
- if (i > 0) {
- codec->sample_rate = i;
- get_word_sep(buf, sizeof(buf), "/", &p);
- i = atoi(buf);
- if (i > 0)
- codec->channels = i;
- // TODO: there is a bug here; if it is a mono stream, and less than 22000Hz, faad upconverts to stereo and twice the
- // frequency. No problem, but the sample rate is being set here by the sdp line. Upcoming patch forthcoming. (rdm)
- }
- av_log(codec, AV_LOG_DEBUG, " audio samplerate set to : %i\n", codec->sample_rate);
- av_log(codec, AV_LOG_DEBUG, " audio channels set to : %i\n", codec->channels);
- break;
- case CODEC_TYPE_VIDEO:
- av_log(codec, AV_LOG_DEBUG, " video codec set to : %s\n", c_name);
- break;
- default:
- break;
+ case CODEC_TYPE_AUDIO:
+ av_log(s, AV_LOG_DEBUG, "audio codec set to: %s\n", c_name);
+ codec->sample_rate = RTSP_DEFAULT_AUDIO_SAMPLERATE;
+ codec->channels = RTSP_DEFAULT_NB_AUDIO_CHANNELS;
+ if (i > 0) {
+ codec->sample_rate = i;
+ get_word_sep(buf, sizeof(buf), "/", &p);
+ i = atoi(buf);
+ if (i > 0)
+ codec->channels = i;
+ // TODO: there is a bug here; if it is a mono stream, and
+ // less than 22000Hz, faad upconverts to stereo and twice
+ // the frequency. No problem, but the sample rate is being
+ // set here by the sdp line. Patch on its way. (rdm)
+ }
+ av_log(s, AV_LOG_DEBUG, "audio samplerate set to: %i\n",
+ codec->sample_rate);
+ av_log(s, AV_LOG_DEBUG, "audio channels set to: %i\n",
+ codec->channels);
+ break;
+ case CODEC_TYPE_VIDEO:
+ av_log(s, AV_LOG_DEBUG, "video codec set to: %s\n", c_name);
+ break;
+ default:
+ break;
}
return 0;
}
return -1;
}
-/* return the length and optionnaly the data */
+/* return the length and optionally the data */
static int hex_to_data(uint8_t *data, const char *p)
{
int c, len, v;
len = 0;
v = 1;
- for(;;) {
+ for (;;) {
skip_spaces(&p);
if (*p == '\0')
break;
- c = toupper((unsigned char)*p++);
+ c = toupper((unsigned char) *p++);
if (c >= '0' && c <= '9')
c = c - '0';
else if (c >= 'A' && c <= 'F')
char *attr, char *value)
{
switch (codec->codec_id) {
- case CODEC_ID_MPEG4:
- case CODEC_ID_AAC:
- 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;
- codec->extradata_size = len;
- hex_to_data(codec->extradata, value);
- }
- break;
- case CODEC_ID_VORBIS:
- ff_vorbis_parse_fmtp_config(codec, ctx, attr, value);
- break;
- default:
- break;
+ case CODEC_ID_MPEG4:
+ case CODEC_ID_AAC:
+ 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;
+ codec->extradata_size = len;
+ 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 {
const char *str;
- uint16_t type;
- uint32_t offset;
+ uint16_t type;
+ uint32_t offset;
} AttrNameMap;
/* All known fmtp parmeters and the corresping RTPAttrTypeEnum */
#define ATTR_NAME_TYPE_STR 1
static const AttrNameMap attr_names[]=
{
- {"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},
+ { "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 },
};
-/** parse the attribute line from the fmtp a line of an sdp resonse. This is broken out as a function
-* because it is used in rtp_h264.c, which is forthcoming.
-*/
-int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size)
+/* parse the attribute line from the fmtp a line of an sdp resonse. This
+ * is broken out as a function because it is used in rtp_h264.c, which is
+ * forthcoming. */
+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)++;
* encoded, giving a 12KB * (4/3) = 16KB FMTP line. */
char value[16384];
int i;
-
RTSPStream *rtsp_st = st->priv_data;
AVCodecContext *codec = st->codec;
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 */
+ 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, 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)) {
- if (attr_names[i].type == ATTR_NAME_TYPE_INT)
- *(int *)((char *)rtp_payload_data + attr_names[i].offset) = atoi(value);
- else if (attr_names[i].type == ATTR_NAME_TYPE_STR)
- *(char **)((char *)rtp_payload_data + attr_names[i].offset) = av_strdup(value);
+ if (attr_names[i].type == ATTR_NAME_TYPE_INT) {
+ *(int *)((char *)rtp_payload_data +
+ attr_names[i].offset) = atoi(value);
+ } else if (attr_names[i].type == ATTR_NAME_TYPE_STR)
+ *(char **)((char *)rtp_payload_data +
+ attr_names[i].offset) = av_strdup(value);
}
}
}
}
-/** Parse a string \p in the form of Range:npt=xx-xx, and determine the start
+/** Parse a string p in the form of Range:npt=xx-xx, and determine the start
* and end time.
* Used for seeking in the rtp stream.
*/
typedef struct SDPParseState {
/* SDP only */
struct in_addr default_ip;
- int default_ttl;
- int skip_media; ///< set if an unknown m= line occurs
+ int default_ttl;
+ int skip_media; ///< set if an unknown m= line occurs
} SDPParseState;
static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
p = buf;
if (s1->skip_media && letter != 'm')
return;
- switch(letter) {
+ switch (letter) {
case 'c':
get_word(buf1, sizeof(buf1), &p);
if (strcmp(buf1, "IN") != 0)
}
}
/* put a default control url */
- av_strlcpy(rtsp_st->control_url, s->filename, sizeof(rtsp_st->control_url));
+ av_strlcpy(rtsp_st->control_url, rt->control_uri,
+ sizeof(rtsp_st->control_url));
break;
case 'a':
- if (av_strstart(p, "control:", &p) && s->nb_streams > 0) {
+ if (av_strstart(p, "control:", &p)) {
+ if (s->nb_streams == 0) {
+ if (!strncmp(p, "rtsp://", 7))
+ 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;
/* XXX: may need to add full url resolution */
- url_split(proto, sizeof(proto), NULL, 0, NULL, 0, NULL, NULL, 0, p);
+ url_split(proto, sizeof(proto), NULL, 0, NULL, 0,
+ NULL, NULL, 0, p);
if (proto[0] == '\0') {
/* relative control URL */
- 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));
+ 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(st->codec, rtsp_st, payload_type, p);
+ sdp_parse_rtpmap(s, 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);
payload_type = atoi(buf1);
- for(i = 0; i < s->nb_streams;i++) {
- st = s->streams[i];
+ 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) {
- if(rtsp_st->dynamic_handler && rtsp_st->dynamic_handler->parse_sdp_a_line) {
- if(!rtsp_st->dynamic_handler->parse_sdp_a_line(s, i, rtsp_st->dynamic_protocol_context, buf)) {
- sdp_parse_fmtp(st, p);
- }
- } else {
+ if (!(rtsp_st->dynamic_handler &&
+ rtsp_st->dynamic_handler->parse_sdp_a_line &&
+ rtsp_st->dynamic_handler->parse_sdp_a_line(s,
+ i, rtsp_st->dynamic_protocol_context, buf)))
sdp_parse_fmtp(st, p);
- }
}
}
- } else if(av_strstart(p, "framesize:", &p)) {
+ } else if (av_strstart(p, "framesize:", &p)) {
// let dynamic protocol handlers have a stab at the line.
get_word(buf1, sizeof(buf1), &p);
payload_type = atoi(buf1);
- for(i = 0; i < s->nb_streams;i++) {
- st = s->streams[i];
+ 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) {
- if(rtsp_st->dynamic_handler && rtsp_st->dynamic_handler->parse_sdp_a_line) {
- rtsp_st->dynamic_handler->parse_sdp_a_line(s, i, rtsp_st->dynamic_protocol_context, buf);
- }
- }
+ if (rtsp_st->sdp_payload_type == payload_type &&
+ rtsp_st->dynamic_handler &&
+ rtsp_st->dynamic_handler->parse_sdp_a_line)
+ rtsp_st->dynamic_handler->parse_sdp_a_line(s, i,
+ rtsp_st->dynamic_protocol_context, buf);
}
- } else if(av_strstart(p, "range:", &p)) {
+ } else if (av_strstart(p, "range:", &p)) {
int64_t start, end;
// this is so that seeking on a streamed file can work.
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)
+ s->start_time = start;
+ /* AV_NOPTS_VALUE means live broadcast (and can't seek) */
+ s->duration = (end == AV_NOPTS_VALUE) ?
+ AV_NOPTS_VALUE : end - start;
} else if (av_strstart(p, "IsRealDataType:integer;",&p)) {
if (atoi(p) == 1)
rt->transport = RTSP_TRANSPORT_RDT;
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_handler->parse_sdp_a_line(s,
+ s->nb_streams - 1,
rtsp_st->dynamic_protocol_context, buf);
}
}
memset(s1, 0, sizeof(SDPParseState));
p = content;
- for(;;) {
+ for (;;) {
skip_spaces(&p);
letter = *p;
if (letter == '\0')
return 0;
}
+/* close and free RTSP streams */
+static void rtsp_close_streams(RTSPState *rt)
+{
+ int i;
+ RTSPStream *rtsp_st;
+
+ for (i = 0; i < rt->nb_rtsp_streams; i++) {
+ rtsp_st = rt->rtsp_streams[i];
+ if (rtsp_st) {
+ if (rtsp_st->transport_priv) {
+ if (rt->transport == RTSP_TRANSPORT_RDT)
+ ff_rdt_parse_close(rtsp_st->transport_priv);
+ else
+ rtp_parse_close(rtsp_st->transport_priv);
+ }
+ if (rtsp_st->rtp_handle)
+ url_close(rtsp_st->rtp_handle);
+ if (rtsp_st->dynamic_handler && rtsp_st->dynamic_protocol_context)
+ rtsp_st->dynamic_handler->close(
+ rtsp_st->dynamic_protocol_context);
+ }
+ }
+ av_free(rt->rtsp_streams);
+ if (rt->asf_ctx) {
+ av_close_input_stream (rt->asf_ctx);
+ rt->asf_ctx = NULL;
+ }
+ av_freep(&rt->auth_b64);
+}
+
+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->transport_priv = ff_rdt_parse_open(s, st->index,
+ rtsp_st->dynamic_protocol_context,
+ rtsp_st->dynamic_handler);
+ else
+ 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->transport_priv) {
+ return AVERROR(ENOMEM);
+ } else if (rt->transport != RTSP_TRANSPORT_RDT) {
+ if (rtsp_st->dynamic_handler) {
+ rtp_parse_set_dynamic_protocol(rtsp_st->transport_priv,
+ rtsp_st->dynamic_protocol_context,
+ rtsp_st->dynamic_handler);
+ }
+ }
+
+ return 0;
+}
+
+#if CONFIG_RTSP_DEMUXER
+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;
reply->nb_transports = 0;
- for(;;) {
+ for (;;) {
skip_spaces(&p);
if (*p == '\0')
break;
} else if (av_stristart(p, "Notice:", &p) ||
av_stristart(p, "X-Notice:", &p)) {
reply->notice = strtol(p, NULL, 10);
+ } else if (av_stristart(p, "Location:", &p)) {
+ skip_spaces(&p);
+ av_strlcpy(reply->location, p , sizeof(reply->location));
}
}
* @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)
+ * be stored (length is in 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
* @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)
+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;
/* parse reply (XXX: use buffers) */
rt->last_reply[0] = '\0';
- for(;;) {
+ for (;;) {
q = buf;
- for(;;) {
+ for (;;) {
ret = url_read_complete(rt->rtsp_hd, &ch, 1);
#ifdef DEBUG_RTP_TCP
dprintf(s, "ret=%d c=%02x [%c]\n", ret, ch, ch);
/* EOS */
if (reply->notice == 2101 /* End-of-Stream Reached */ ||
reply->notice == 2104 /* Start-of-Stream Reached */ ||
- reply->notice == 2306 /* Continuous Feed Terminated */)
+ reply->notice == 2306 /* Continuous Feed Terminated */) {
rt->state = RTSP_STATE_IDLE;
- else if (reply->notice >= 4400 && reply->notice < 5500)
+ } else if (reply->notice >= 4400 && reply->notice < 5500) {
return AVERROR(EIO); /* data or server error */
- else if (reply->notice == 2401 /* Ticket Expired */ ||
+ } 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)
+static void rtsp_send_cmd_async(AVFormatContext *s, const char *cmd)
{
RTSPState *rt = s->priv_data;
char buf[4096], buf1[1024];
rt->last_cmd_time = av_gettime();
}
-static void rtsp_send_cmd (AVFormatContext *s,
- const char *cmd, RTSPMessageHeader *reply,
- unsigned char **content_ptr)
+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_send_cmd_async(s, cmd);
rtsp_read_reply(s, reply, content_ptr, 0);
}
-
-/* close and free RTSP streams */
-static void rtsp_close_streams(RTSPState *rt)
-{
- int i;
- RTSPStream *rtsp_st;
-
- for(i=0;i<rt->nb_rtsp_streams;i++) {
- rtsp_st = rt->rtsp_streams[i];
- if (rtsp_st) {
- if (rtsp_st->transport_priv) {
- if (rt->transport == RTSP_TRANSPORT_RDT)
- ff_rdt_parse_close(rtsp_st->transport_priv);
- else
- rtp_parse_close(rtsp_st->transport_priv);
- }
- if (rtsp_st->rtp_handle)
- url_close(rtsp_st->rtp_handle);
- if (rtsp_st->dynamic_handler && rtsp_st->dynamic_protocol_context)
- rtsp_st->dynamic_handler->close(rtsp_st->dynamic_protocol_context);
- }
- }
- av_free(rt->rtsp_streams);
- if (rt->asf_ctx) {
- av_close_input_stream (rt->asf_ctx);
- rt->asf_ctx = NULL;
- }
- av_freep(&rt->auth_b64);
-}
-
-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->transport_priv = ff_rdt_parse_open(s, st->index,
- rtsp_st->dynamic_protocol_context,
- rtsp_st->dynamic_handler);
- else
- 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->transport_priv) {
- return AVERROR(ENOMEM);
- } else if (rt->transport != RTSP_TRANSPORT_RDT) {
- if(rtsp_st->dynamic_handler) {
- rtp_parse_set_dynamic_protocol(rtsp_st->transport_priv,
- 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 lower_transport, const char *real_challenge)
+static int make_setup_request(AVFormatContext *s, const char *host, int port,
+ int lower_transport, const char *real_challenge)
{
RTSPState *rt = s->priv_data;
int rtx, j, i, err, interleave = 0;
/* for each stream, make the setup request */
/* XXX: we assume the same server is used for the control of each
- RTSP stream */
+ * RTSP stream */
- for(j = RTSP_RTP_PORT_MIN, i = 0; i < rt->nb_rtsp_streams; ++i) {
+ for (j = RTSP_RTP_PORT_MIN, i = 0; i < rt->nb_rtsp_streams; ++i) {
char transport[2048];
/**
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"))
+ !strcmp(rt->rtsp_streams[rtx]->control_url + len - 4,
+ "/rtx"))
break;
}
if (rtx == rt->nb_rtsp_streams)
/* first try in specified port range */
if (RTSP_RTP_PORT_MIN != 0) {
- while(j <= RTSP_RTP_PORT_MAX) {
- snprintf(buf, sizeof(buf), "rtp://%s?localport=%d", host, j);
- j += 2; /* we will use two port by rtp stream (rtp and rtcp) */
- if (url_open(&rtsp_st->rtp_handle, buf, URL_RDWR) == 0) {
+ while (j <= RTSP_RTP_PORT_MAX) {
+ snprintf(buf, sizeof(buf), "rtp://%s?localport=%d",
+ host, j);
+ /* we will use two ports per rtp stream (rtp and rtcp) */
+ j += 2;
+ if (url_open(&rtsp_st->rtp_handle, buf, URL_RDWR) == 0)
goto rtp_opened;
- }
}
}
-/* then try on any port
-** if (url_open(&rtsp_st->rtp_handle, "rtp://", URL_RDONLY) < 0) {
-** err = AVERROR_INVALIDDATA;
-** goto fail;
-** }
-*/
+#if 0
+ /* then try on any port */
+ if (url_open(&rtsp_st->rtp_handle, "rtp://", URL_RDONLY) < 0) {
+ err = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+#endif
rtp_opened:
port = rtp_get_local_port(rtsp_st->rtp_handle);
* 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)
+ s->streams[rtsp_st->stream_index]->codec->codec_type ==
+ CODEC_TYPE_DATA)
continue;
snprintf(transport, sizeof(transport) - 1,
"%s/TCP;", trans_pref);
rtsp_st->interleaved_max = reply->transports[0].interleaved_max;
break;
- case RTSP_LOWER_TRANSPORT_UDP:
- {
- char url[1024];
-
- /* XXX: also use address if specified */
- snprintf(url, sizeof(url), "rtp://%s:%d",
- host, reply->transports[0].server_port_min);
- if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) &&
- rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) {
- err = AVERROR_INVALIDDATA;
- goto fail;
- }
+ case RTSP_LOWER_TRANSPORT_UDP: {
+ char url[1024];
+
+ /* XXX: also use address if specified */
+ snprintf(url, sizeof(url), "rtp://%s:%d",
+ host, reply->transports[0].server_port_min);
+ if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) &&
+ rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) {
+ err = AVERROR_INVALIDDATA;
+ goto fail;
}
break;
- case RTSP_LOWER_TRANSPORT_UDP_MULTICAST:
- {
- char url[1024];
- struct in_addr in;
- int port, ttl;
-
- if (reply->transports[0].destination) {
- in.s_addr = htonl(reply->transports[0].destination);
- port = reply->transports[0].port_min;
- ttl = reply->transports[0].ttl;
- } else {
- in = rtsp_st->sdp_ip;
- port = rtsp_st->sdp_port;
- ttl = rtsp_st->sdp_ttl;
- }
- snprintf(url, sizeof(url), "rtp://%s:%d?ttl=%d",
- inet_ntoa(in), port, ttl);
- if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) {
- err = AVERROR_INVALIDDATA;
- goto fail;
- }
+ }
+ case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: {
+ char url[1024];
+ struct in_addr in;
+ int port, ttl;
+
+ if (reply->transports[0].destination) {
+ in.s_addr = htonl(reply->transports[0].destination);
+ port = reply->transports[0].port_min;
+ ttl = reply->transports[0].ttl;
+ } else {
+ in = rtsp_st->sdp_ip;
+ port = rtsp_st->sdp_port;
+ ttl = rtsp_st->sdp_ttl;
+ }
+ snprintf(url, sizeof(url), "rtp://%s:%d?ttl=%d",
+ inet_ntoa(in), port, ttl);
+ if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) {
+ err = AVERROR_INVALIDDATA;
+ goto fail;
}
break;
}
+ }
if ((err = rtsp_open_transport_ctx(s, rtsp_st)))
goto fail;
return 0;
fail:
- for (i=0; i<rt->nb_rtsp_streams; i++) {
+ for (i = 0; i < rt->nb_rtsp_streams; i++) {
if (rt->rtsp_streams[i]->rtp_handle) {
url_close(rt->rtsp_streams[i]->rtp_handle);
rt->rtsp_streams[i]->rtp_handle = NULL;
return err;
}
+static int rtsp_read_play(AVFormatContext *s)
+{
+ RTSPState *rt = s->priv_data;
+ RTSPMessageHeader reply1, *reply = &reply1;
+ char cmd[1024];
+
+ av_log(s, AV_LOG_DEBUG, "hello state=%d\n", rt->state);
+
+ 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",
+ rt->control_uri);
+ } else {
+ snprintf(cmd, sizeof(cmd),
+ "PLAY %s RTSP/1.0\r\n"
+ "Range: npt=%0.3f-\r\n",
+ rt->control_uri,
+ (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;
+}
+
static int rtsp_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
RTSPState *rt = s->priv_data;
- char host[1024], path[1024], tcpname[1024], cmd[2048], auth[128], *option_list, *option;
+ char host[1024], path[1024], tcpname[1024], cmd[2048], auth[128];
+ char *option_list, *option, *filename;
URLContext *rtsp_hd;
int port, ret, err;
RTSPMessageHeader reply1, *reply = &reply1;
unsigned char *content = NULL;
int lower_transport_mask = 0;
char real_challenge[64];
-
+redirect:
/* extract hostname and port */
url_split(NULL, 0, auth, sizeof(auth),
host, sizeof(host), &port, path, sizeof(path), s->filename);
/* search for options */
option_list = strchr(path, '?');
if (option_list) {
- /* remove the options from the path */
- *option_list++ = 0;
- while(option_list) {
+ filename = strchr(s->filename, '?');
+ while (option_list) {
/* move the option pointer */
- option = option_list;
+ option = ++option_list;
option_list = strchr(option_list, '&');
if (option_list)
- *(option_list++) = 0;
+ *option_list = 0;
+
/* handle the options */
- if (strcmp(option, "udp") == 0)
+ if (!strcmp(option, "udp")) {
lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_UDP);
- else if (strcmp(option, "multicast") == 0)
+ } else if (!strcmp(option, "multicast")) {
lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_UDP_MULTICAST);
- else if (strcmp(option, "tcp") == 0)
+ } else if (!strcmp(option, "tcp")) {
lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_TCP);
+ } else {
+ strcpy(++filename, option);
+ filename += strlen(option);
+ if (option_list) *filename = '&';
+ }
}
+ *filename = 0;
}
if (!lower_transport_mask)
rt->rtsp_hd = rtsp_hd;
rt->seq = 0;
- /* request options supported by the server; this also detects server type */
+ /* request options supported by the server; this also detects server
+ * type */
+ av_strlcpy(rt->control_uri, s->filename,
+ sizeof(rt->control_uri));
for (rt->server_type = RTSP_SERVER_RTP;;) {
snprintf(cmd, sizeof(cmd),
"OPTIONS %s RTSP/1.0\r\n", s->filename);
continue;
} else if (!strncasecmp(reply->server, "WMServer/", 9)) {
rt->server_type = RTSP_SERVER_WMS;
- } else if (rt->server_type == RTSP_SERVER_REAL) {
+ } else if (rt->server_type == RTSP_SERVER_REAL)
strcpy(real_challenge, reply->real_challenge);
- }
break;
}
}
do {
- int lower_transport = ff_log2_tab[lower_transport_mask & ~(lower_transport_mask - 1)];
+ int lower_transport = ff_log2_tab[lower_transport_mask &
+ ~(lower_transport_mask - 1)];
err = make_setup_request(s, host, port, lower_transport,
rt->server_type == RTSP_SERVER_REAL ?
} while (err);
rt->state = RTSP_STATE_IDLE;
- rt->seek_timestamp = 0; /* default is to start stream at position
- zero */
+ rt->seek_timestamp = 0; /* default is to start stream at position zero */
if (ap->initial_pause) {
/* do not start immediately */
} else {
rtsp_close_streams(rt);
av_freep(&content);
url_close(rt->rtsp_hd);
- av_freep(&rt->auth_b64);
- return err;
-}
-
-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 = rtsp_read_reply(s, &reply, NULL, 1);
- if (ret == -1)
- return -1;
- if (ret == 1) /* received '$' */
- break;
- /* XXX: parse message */
- if (rt->state != RTSP_STATE_PLAYING)
- 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;
+ if (reply->status_code >=300 && reply->status_code < 400) {
+ av_strlcpy(s->filename, reply->location, sizeof(s->filename));
+ av_log(s, AV_LOG_INFO, "Status %d: Redirecting to %s\n",
+ reply->status_code,
+ s->filename);
+ goto redirect;
}
- goto redo;
- found:
- *prtsp_st = rtsp_st;
- return len;
+ return err;
}
static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
int fd, fd_max, n, i, ret, tcp_fd;
struct timeval tv;
- for(;;) {
+ for (;;) {
if (url_interrupt_cb())
return AVERROR(EINTR);
FD_ZERO(&rfds);
fd_max = 0;
tcp_fd = -1;
}
- for(i = 0; i < rt->nb_rtsp_streams; i++) {
+ 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
tv.tv_usec = 100 * 1000;
n = select(fd_max + 1, &rfds, NULL, NULL, &tv);
if (n > 0) {
- for(i = 0; i < rt->nb_rtsp_streams; i++) {
+ for (i = 0; i < rt->nb_rtsp_streams; i++) {
rtsp_st = rt->rtsp_streams[i];
if (rtsp_st->rtp_handle) {
fd = url_get_file_handle(rtsp_st->rtp_handle);
}
}
}
+#if CONFIG_RTSP_DEMUXER
if (FD_ISSET(tcp_fd, &rfds)) {
RTSPMessageHeader reply;
if (rt->state != RTSP_STATE_PLAYING)
return 0;
}
+#endif
}
}
}
-static int rtsp_read_packet(AVFormatContext *s,
- AVPacket *pkt)
+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 = rtsp_read_reply(s, &reply, NULL, 1);
+ if (ret == -1)
+ return -1;
+ if (ret == 1) /* received '$' */
+ break;
+ /* XXX: parse message */
+ if (rt->state != RTSP_STATE_PLAYING)
+ 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_fetch_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ RTSPState *rt = s->priv_data;
int ret, len;
uint8_t buf[10 * RTP_MAX_PACKET_LENGTH];
+ RTSPStream *rtsp_st;
+
+ /* get next frames from the same RTP packet */
+ if (rt->cur_transport_priv) {
+ if (rt->transport == RTSP_TRANSPORT_RDT) {
+ ret = ff_rdt_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
+ } else
+ ret = rtp_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
+ if (ret == 0) {
+ rt->cur_transport_priv = NULL;
+ return 0;
+ } else if (ret == 1) {
+ return 0;
+ } else
+ rt->cur_transport_priv = NULL;
+ }
+
+ /* read next RTP packet */
+ redo:
+ switch(rt->lower_transport) {
+ default:
+#if CONFIG_RTSP_DEMUXER
+ case RTSP_LOWER_TRANSPORT_TCP:
+ len = tcp_read_packet(s, &rtsp_st, buf, sizeof(buf));
+ break;
+#endif
+ 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->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->transport_priv, pkt, buf, len);
+ } else
+ 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_transport_priv = rtsp_st->transport_priv;
+
+ return ret;
+}
+
+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->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);
+ snprintf(cmd, sizeof(cmd),
+ "SET_PARAMETER %s RTSP/1.0\r\n"
+ "Unsubscribe: %s\r\n",
+ rt->control_uri, rt->last_subscription);
rtsp_send_cmd(s, cmd, reply, NULL);
if (reply->status_code != RTSP_STATUS_OK)
return AVERROR_INVALIDDATA;
snprintf(cmd, sizeof(cmd),
"SET_PARAMETER %s RTSP/1.0\r\n"
"Subscribe: ",
- s->filename);
+ rt->control_uri);
for (i = 0; i < rt->nb_rtsp_streams; i++) {
rule_nr = 0;
for (r = 0; r < s->nb_streams; r++) {
}
}
- /* get next frames from the same RTP packet */
- if (rt->cur_transport_priv) {
- if (rt->transport == RTSP_TRANSPORT_RDT)
- ret = ff_rdt_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
- else
- ret = rtp_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
- if (ret == 0) {
- rt->cur_transport_priv = NULL;
- return 0;
- } else if (ret == 1) {
- return 0;
- } else {
- rt->cur_transport_priv = NULL;
- }
- }
-
- /* read next RTP packet */
- redo:
- switch(rt->lower_transport) {
- default:
- case RTSP_LOWER_TRANSPORT_TCP:
- len = tcp_read_packet(s, &rtsp_st, buf, sizeof(buf));
- break;
- 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->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->transport_priv, pkt, buf, len);
- else
- ret = rtp_parse_packet(rtsp_st->transport_priv, pkt, buf, len);
+ ret = rtsp_fetch_packet(s, pkt);
if (ret < 0)
- goto redo;
- if (ret == 1) {
- /* more packets may follow, so we save the RTP context */
- rt->cur_transport_priv = rtsp_st->transport_priv;
- }
+ return ret;
/* send dummy request to keep TCP connection alive */
if ((rt->server_type == RTSP_SERVER_WMS ||
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);
+ rt->control_uri);
+ rtsp_send_cmd_async(s, cmd);
} else {
- rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n",
- reply, NULL);
+ rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n");
}
}
return 0;
}
-static int rtsp_read_play(AVFormatContext *s)
-{
- RTSPState *rt = s->priv_data;
- RTSPMessageHeader reply1, *reply = &reply1;
- char cmd[1024];
-
- av_log(s, AV_LOG_DEBUG, "hello state=%d\n", rt->state);
-
- 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 */
static int rtsp_read_pause(AVFormatContext *s)
{
else if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) {
snprintf(cmd, sizeof(cmd),
"PAUSE %s RTSP/1.0\r\n",
- s->filename);
+ rt->control_uri);
rtsp_send_cmd(s, cmd, reply, NULL);
if (reply->status_code != RTSP_STATUS_OK) {
return -1;
{
RTSPState *rt = s->priv_data;
- rt->seek_timestamp = av_rescale_q(timestamp, s->streams[stream_index]->time_base, AV_TIME_BASE_Q);
+ 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:
static int rtsp_read_close(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
- RTSPMessageHeader reply1, *reply = &reply1;
char cmd[1024];
#if 0
snprintf(cmd, sizeof(cmd),
"TEARDOWN %s RTSP/1.0\r\n",
s->filename);
- rtsp_send_cmd(s, cmd, reply, NULL);
+ rtsp_send_cmd_async(s, cmd);
rtsp_close_streams(rt);
url_close(rt->rtsp_hd);
return 0;
}
-#if CONFIG_RTSP_DEMUXER
AVInputFormat rtsp_demuxer = {
"rtsp",
NULL_IF_CONFIG_SMALL("RTSP input format"),
/* we look for a line beginning "c=IN IP4" */
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 IP4") - 1 < p_end &&
+ av_strstart(p, "c=IN IP4", NULL))
return AVPROBE_SCORE_MAX / 2;
- while(p < p_end - 1 && *p != '\n') p++;
+ while (p < p_end - 1 && *p != '\n') p++;
if (++p >= p_end)
break;
if (*p == '\r')
#define SDP_MAX_SIZE 8192
-static int sdp_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+static int sdp_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
RTSPState *rt = s->priv_data;
RTSPStream *rtsp_st;
av_free(content);
/* open each RTP stream */
- for(i=0;i<rt->nb_rtsp_streams;i++) {
+ for (i = 0; i < rt->nb_rtsp_streams; i++) {
rtsp_st = rt->rtsp_streams[i];
snprintf(url, sizeof(url), "rtp://%s:%d?localport=%d&ttl=%d",
goto fail;
}
return 0;
- fail:
+fail:
rtsp_close_streams(rt);
return err;
}
-static int sdp_read_packet(AVFormatContext *s,
- AVPacket *pkt)
-{
- return rtsp_read_packet(s, pkt);
-}
-
static int sdp_read_close(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
return 0;
}
-#if CONFIG_SDP_DEMUXER
AVInputFormat sdp_demuxer = {
"sdp",
NULL_IF_CONFIG_SMALL("SDP"),
sizeof(RTSPState),
sdp_probe,
sdp_read_header,
- sdp_read_packet,
+ rtsp_fetch_packet,
sdp_read_close,
};
-#endif
projects / ffmpeg / blobdiff