From ccfa8aa26f666372f47d69bc49e420a9b4239626 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 19 Mar 2012 20:40:23 +0200 Subject: rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This enables reordering of UDP packets by default, unless the caller explicitly sets -max_delay 0. Signed-off-by: Martin Storsjö --- libavformat/rtsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 7afd106cfb..07cf80992e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -56,6 +56,7 @@ #define MAX_TIMEOUTS READ_PACKET_TIMEOUT_S * 1000 / POLL_TIMEOUT_MS #define SDP_MAX_SIZE 16384 #define RECVBUF_SIZE 10 * RTP_MAX_PACKET_LENGTH +#define DEFAULT_REORDERING_DELAY 100000 #define OFFSET(x) offsetof(RTSPState, x) #define DEC AV_OPT_FLAG_DECODING_PARAM @@ -1427,7 +1428,7 @@ int ff_rtsp_connect(AVFormatContext *s) return AVERROR(EIO); if (s->max_delay < 0) /* Not set by the caller */ - s->max_delay = 0; + s->max_delay = s->iformat ? DEFAULT_REORDERING_DELAY : 0; rt->control_transport = RTSP_MODE_PLAIN; if (rt->lower_transport_mask & (1 << RTSP_LOWER_TRANSPORT_HTTP)) { @@ -1870,7 +1871,7 @@ static int sdp_read_header(AVFormatContext *s) return AVERROR(EIO); if (s->max_delay < 0) /* Not set by the caller */ - s->max_delay = 0; + s->max_delay = DEFAULT_REORDERING_DELAY; /* read the whole sdp file */ /* XXX: better loading */ -- cgit v1.2.3