From: Martin Storsjö <martin@martin.st>
Date: Mon, 7 Jan 2013 19:26:59 +0000 (+0200)
Subject: rtsp: Respect max_delay for the reordering queue when using custom IO
X-Git-Tag: android-x86-4.4-r1~364^2~2246
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f811cd2d47ade37a3e66f12260807aa63375ca50;p=android-x86%2Fexternal-ffmpeg.git

rtsp: Respect max_delay for the reordering queue when using custom IO

Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index b3e54442af..ba9b756879 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1912,7 +1912,11 @@ redo:
             ff_rtp_check_and_send_back_rr(rtsp_st->transport_priv, rtsp_st->rtp_handle, NULL, len);
         break;
     case RTSP_LOWER_TRANSPORT_CUSTOM:
-        len = ffio_read_partial(s->pb, rt->recvbuf, RECVBUF_SIZE);
+        if (first_queue_st && rt->transport == RTSP_TRANSPORT_RTP &&
+            wait_end && wait_end < av_gettime())
+            len = AVERROR(EAGAIN);
+        else
+            len = ffio_read_partial(s->pb, rt->recvbuf, RECVBUF_SIZE);
         len = pick_stream(s, &rtsp_st, rt->recvbuf, len);
         if (len > 0 && rtsp_st->transport_priv && rt->transport == RTSP_TRANSPORT_RTP)
             ff_rtp_check_and_send_back_rr(rtsp_st->transport_priv, NULL, s->pb, len);