From patchwork Fri Oct 18 16:59:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Haupt X-Patchwork-Id: 15840 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CEC2D448784 for ; Fri, 18 Oct 2019 20:05:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD8CD68AD03; Fri, 18 Oct 2019 20:05:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE26D68ACFC for ; Fri, 18 Oct 2019 20:05:05 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id p14so7042215wro.4 for ; Fri, 18 Oct 2019 10:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Fh/QAFLySX/b/sNguEAgEoLpY/lskswCaHoFhNE+04g=; b=rYJ3AN4z2ZhUrV0Y0cQQCjMuZPPi9wThcmmkMDgIldxyG6UeWXn6TW7uPAa3ALmAyY Ezjkoh1hBDVHm6/vl7muxLxu3UKVFFV2IS5s7jWHXFrx3GwWVnr8nCmYotm81z8FuYgz rCHqB2Uf2HLD1v43o2kbzXX/JFPAoSABg/Zs/FsdsHA+9lySFI3Ja8qTR7lAR3wviEHY iiNd1r+cH09bDclhPrcvzI293Q9X0//JC3YzD22El3E+hZ78UDgc19OFwG8ognbqfZ5T P7hJ8T81DHqqx2MM5lXwpF4ask72FAcwk9dyuPvx9Po9FkvZ1F3t9h1aUjcFBEyhQ0Zd +cHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Fh/QAFLySX/b/sNguEAgEoLpY/lskswCaHoFhNE+04g=; b=ti3xJTTewNriRPFndc+5cStn1JxEUhC2jA1o+z4qRZfySuncEdo+Znh4ijkTVkeuF7 7JzNZLH1Vjc3ACFAvgonSSgoIUUKMJPZUVqo7ewld5iwZU8oCpDzs80Cu6CgNGGHNIen 84G5Yp3MZ1dXJTzV33Z3KUOx9ybXWqgpWn0O4ong6ShQ1z/MFOVLi9Zc0oUUGIYDvPNj 18TeR12aqF/wKY1Jcq/uRdHX7z/Sve4SwBwpZYCyq3sR3qJXz7A0mKwxlliyTi9hCjJL /1Y+NxWzAi9AJIDa/v0vJt6DjNI+dDW/bf2hIo0/nCz50hwobTGpNz7dmQIjh0qIqF6H K9pQ== X-Gm-Message-State: APjAAAVV/0hzhvrwQKhEHSDWu1keKs0FhXs0MdBF8SCgjZGGb3var6jU DTOKsKSwDfYBmlqPVRCOvrdOB+bxh/Yq1g== X-Google-Smtp-Source: APXvYqxI0P8vqIDcNALskuUcG89o52d6PRfdD4YblxkRIMxcchVPsLfIX/JCnrVJEeYdZxdSk+B5gA== X-Received: by 2002:a5d:46c6:: with SMTP id g6mr8373566wrs.331.1571417991346; Fri, 18 Oct 2019 09:59:51 -0700 (PDT) Received: from a1rwulf-t480s.airwulf.net (77.116.102.114.wireless.dyn.drei.com. [77.116.102.114]) by smtp.gmail.com with ESMTPSA id u68sm7354904wmu.12.2019.10.18.09.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2019 09:59:50 -0700 (PDT) From: Wolfgang Haupt To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Oct 2019 18:59:44 +0200 Message-Id: <20191018165944.29832-1-haupt.wolfgang@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] libavformat/rtsp: fix rtsp multicasts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Wolfgang Haupt MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If an rtsp server offers a udp multicast address as response of a DESCRIBE command the rtsp client is expected to issue SETUP with "Transport: RTP/AVP/UDP;multicast". Some rtsp servers bail out otherwise. --- libavformat/rtsp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 859defa592..3f0cbfc98b 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1913,6 +1913,9 @@ redirect: && (rt->rtsp_flags & RTSP_FLAG_PREFER_TCP)) lower_transport = RTSP_LOWER_TRANSPORT_TCP; + if (ff_is_multicast_address((struct sockaddr*)&rt->rtsp_streams[rt->nb_rtsp_streams-1]->sdp_ip)) + lower_transport = RTSP_LOWER_TRANSPORT_UDP_MULTICAST; + err = ff_rtsp_make_setup_request(s, host, port, lower_transport, rt->server_type == RTSP_SERVER_REAL ? real_challenge : NULL);