[FFmpeg-devel] [PATCH 5/5] rtspdec: Retry with TCP if UDP failed

[Ronald S. Bultje]

Hi,

On Mon, Jan 24, 2011 at 4:02 PM, Martin Storsj? <martin at martin.st> wrote:
> On Mon, 24 Jan 2011, Ronald S. Bultje wrote:
>
>> On Mon, Jan 24, 2011 at 5:49 AM, Martin Storsj? <martin at martin.st> wrote:
>> > +static int resetup_tcp(AVFormatContext *s)
>> > +{
>> > + ? ?char host[1024];
>> > + ? ?int port;
>> > +
>> > + ? ?av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, NULL, 0,
>> > + ? ? ? ? ? ? ? ? s->filename);
>> > + ? ?ff_rtsp_undo_setup(s);
>> > + ? ?// TODO: Handle the real_challenge for Real-RTSP
>> > + ? ?return ff_rtsp_make_setup_request(s, host, port, RTSP_LOWER_TRANSPORT_TCP,
>> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?NULL);
>> > +}
>>
>> How do you test this?
>
> For testing, I comment out the code for sending punch packets in rtsp.c,
> which makes UDP connections not work when behind a NAT.
>
>> Can you try sending 2 SETUPs to any REAL server, see it fail, put a
>> TEARDOWN in the middle to show that that fixes it?
>
> As discussed on irc, sending a teardown works fine if making sure a new
> subscribe is sent. Updated version of patch #5 attached.

OK to all 5 patches then.

Ronald