From patchwork Sun Apr 19 17:02:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Haupt X-Patchwork-Id: 19089 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 E2CC744BDC1 for ; Sun, 19 Apr 2020 20:02:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFF3C68B95A; Sun, 19 Apr 2020 20:02:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECA7368B912 for ; Sun, 19 Apr 2020 20:02:44 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id e26so8223666wmk.5 for ; Sun, 19 Apr 2020 10:02:44 -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:in-reply-to:references; bh=VIZDlA9TOAjlX1/jxqpWmbEoAJUqLUl7BpouxhTeG6s=; b=bKYFjxelUHmJygbgU8Nmg67CBm/uCbRuGB65qkanAOcCsRq9QvgKXHDNYIPFF68cv9 TQSUsGQK8MQSyX0i+jCYMK+AiFqDK2ggr1S7rQyy3mZioPyZEUTmFgTRNZtrTFyqp14B JBudpL1F9SfF3FO8sVVRTLJhwD2Vm1ifEE9GzyM7fFexdAyI6XWOnBY6dr+0bSrFKb4m AaMPmYl2vkjZ7NG0Rn6uygNbUIfLqZ8nnAR8y6xF/KsNio9uDXLFI3b+NZkp597qik+w fHKvxHjgvat6ipw+7helrR5KzDwAaF/sS8RqA7mwEEGf5+WBwK/w4TPg/eTEWF7aV1EP oB7Q== 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:in-reply-to :references; bh=VIZDlA9TOAjlX1/jxqpWmbEoAJUqLUl7BpouxhTeG6s=; b=HfBG0E5sVqzd9zHmUpB97eMQzrzEex8alh5dN3HWO/AKyeSJECb6I5rNJMvROFw4wW tnRZ5+3FFLhlGLRKHrp6i1hRHGB2h5H/J/+0UZIKXmBbuVTxTSIzdFXjYyRgmcEZnlp/ 1/VPoSeN6ZWHVj1mC3sDnMT4e3XeW+U0Dx5v5yT+BP0ICwshIMhED4T5/YaZaJKkqtZU qPsNYTRjypaaiEHaSgWoz5trmjyqOfoW1smnGBVp8qfFjZA+EGmOeRfr770Fu+aCT4D/ hs5e/paC+PCA1OW4o8IZq/Hf8MqYU6Pj6xbHJx+ZClhmin0QQkFYYg7mYokuu5wvEM02 zCkg== X-Gm-Message-State: AGi0Pub5QX4kytX2Wh3c/DRuthALkuZ4gmXGhBqBjoY+75yoc3/fc2d5 vK9tXSPW9pWlgv5zzPlVs5mH/7vbNjJnzA== X-Google-Smtp-Source: APiQypLO+vKQwGDr6riz8Fsxbx8bpZsCLVNiGx5ip3Ytcd6Iq0fpP3duXTpUTqlkgFqd2nPGO0DfqQ== X-Received: by 2002:a7b:c0d5:: with SMTP id s21mr13355972wmh.107.1587315764081; Sun, 19 Apr 2020 10:02:44 -0700 (PDT) Received: from a1rwulf-t480s.airwulf.net (77.116.207.246.wireless.dyn.drei.com. [77.116.207.246]) by smtp.gmail.com with ESMTPSA id s30sm15594856wrb.67.2020.04.19.10.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Apr 2020 10:02:43 -0700 (PDT) From: Wolfgang Haupt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 19:02:33 +0200 Message-Id: <20200419170233.26992-1-haupt.wolfgang@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] libavformat/rtsp: Pass protocol options for udp multicast 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" Protocol options like buffer_size need to be passed to the underlying transport implementation for udp multicasts as well. --- libavformat/rtsp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 07ac371903..b56bebfde6 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1617,6 +1617,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, char url[1024], namebuf[50], optbuf[20] = ""; struct sockaddr_storage addr; int port, ttl; + AVDictionary *opts = map_to_opts(rt); if (reply->transports[0].destination.ss_family) { addr = reply->transports[0].destination; @@ -1633,8 +1634,12 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); ff_url_join(url, sizeof(url), "rtp", NULL, namebuf, port, "%s", optbuf); - if (ffurl_open_whitelist(&rtsp_st->rtp_handle, url, AVIO_FLAG_READ_WRITE, - &s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist, NULL) < 0) { + err = ffurl_open_whitelist(&rtsp_st->rtp_handle, url, AVIO_FLAG_READ_WRITE, + &s->interrupt_callback, &opts, s->protocol_whitelist, s->protocol_blacklist, NULL); + av_dict_free(&opts); + + if (err < 0) + { err = AVERROR_INVALIDDATA; goto fail; }