From 0b4949b51816bc2fd23ba4c4de183b877b58aa25 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 9 May 2011 20:11:16 +0300 Subject: rtsp: Only do keepalive using GET_PARAMETER if the server supports it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is more like what VLC does. If the server doesn't mention supporting GET_PARAMETER in response to an OPTIONS request, VLC doesn't send any keepalive requests at all. After this patch, libavformat will still send OPTIONS keepalives if GET_PARAMETER isn't explicitly said to be supported. Some RTSP cameras don't support GET_PARAMETER, and will close the connection if this is sent as keepalive request (but support OPTIONS just fine, but probably don't need any keepalive at all). Some other cameras don't support using OPTIONS as keepalive, but require GET_PARAMETER instead. Signed-off-by: Martin Storsjö --- libavformat/rtsp.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavformat/rtsp.h') diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index e1f1df990e..ff66502626 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -331,6 +331,11 @@ typedef struct RTSPState { * Polling array for udp */ struct pollfd *p; + + /** + * Whether the server supports the GET_PARAMETER method. + */ + int get_parameter_supported; } RTSPState; /** -- cgit v1.2.3