#include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
#include "avformat.h"
#include "internal.h"
#include "rdt.h"
#include "url.h"
-//#define DEBUG
-//#define DEBUG_RTP_TCP
-
static int rtsp_read_play(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
rtpctx->last_rtcp_ntp_time = AV_NOPTS_VALUE;
rtpctx->first_rtcp_ntp_time = AV_NOPTS_VALUE;
rtpctx->base_timestamp = 0;
+ rtpctx->timestamp = 0;
+ rtpctx->unwrapped_timestamp = 0;
rtpctx->rtcp_ts_offset = 0;
}
}
return AVERROR(ENOMEM);
rt->real_setup = rt->real_setup_cache + s->nb_streams;
- if (ap->initial_pause) {
+ if (rt->initial_pause) {
/* do not start immediately */
} else {
if (rtsp_read_play(s) < 0) {
int id, len, i, ret;
RTSPStream *rtsp_st;
-#ifdef DEBUG_RTP_TCP
av_dlog(s, "tcp_read_packet:\n");
-#endif
redo:
for (;;) {
RTSPMessageHeader reply;
return -1;
id = buf[0];
len = AV_RB16(buf + 1);
-#ifdef DEBUG_RTP_TCP
av_dlog(s, "id=%d len=%d\n", id, len);
-#endif
if (len > buf_size || len < 12)
goto redo;
/* get the data */
{
RTSPState *rt = s->priv_data;
-#if 0
- /* NOTE: it is valid to flush the buffer here */
- if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
- avio_close(&rt->rtsp_gb);
- }
-#endif
ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL);
ff_rtsp_close_streams(s);
return 0;
}
+const AVClass rtsp_demuxer_class = {
+ .class_name = "RTSP demuxer",
+ .item_name = av_default_item_name,
+ .option = ff_rtsp_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
AVInputFormat ff_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,
+ .name = "rtsp",
+ .long_name = NULL_IF_CONFIG_SMALL("RTSP input format"),
+ .priv_data_size = sizeof(RTSPState),
+ .read_probe = rtsp_probe,
+ .read_header = rtsp_read_header,
+ .read_packet = rtsp_read_packet,
+ .read_close = rtsp_read_close,
+ .read_seek = rtsp_read_seek,
.flags = AVFMT_NOFILE,
.read_play = rtsp_read_play,
.read_pause = rtsp_read_pause,
+ .priv_class = &rtsp_demuxer_class,
};