From patchwork Sun Apr 19 17:14:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Haupt X-Patchwork-Id: 19090 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 843E7449BBF for ; Sun, 19 Apr 2020 20:14:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E63768B954; Sun, 19 Apr 2020 20:14:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D28AC68B94D for ; Sun, 19 Apr 2020 20:14:48 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id t63so7260662wmt.3 for ; Sun, 19 Apr 2020 10:14:48 -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=j/gI+fbCaIG+L45uqwf8g1dXdjDIUWGub+MvOJs6UICTsoYwq+k0gUlROd4WAi2H2+ iyLO6YBZ9Z5jxxwfs7nzl3QyMn9uI+wVGqZwXiLw9cbiPRN1RztjfTdcAGT9klGcBnaQ 2J+lEyiiRAuWBTpU2S/oj2oAfh1t6G1tXn9wyMiyZKccYVfzul8TnavgUfbygVSPRV7v 1TdDTWsXWJRJtwi2btLx+jeiFuPVuhsQ7yvMO9GNJAFzsAk2tBGvNcB6V9yK3rGXR0EF MEeByvpg2n6ykPDUaOgJZM5i+CEjepE4yGSqj955tSrN7WcXYGVjlGQB26NDiKB3bLaX 3dfw== 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=iE/XsydT5WVo8IOs4YU5qHZhx4JcI1mW2uAgM64lJhOIJ4Z3r+/5S67DVfuLoIv/H4 qdit0fip3VCGdKp9rnowN7pHOE1s3Njb9aGLsOHUlDAY5tgOZ2MCqvpxM77S/NnGS0FT 9UeZwfwZ/ghkEzCNwJSLWDyTKNfns5orZe2nrJtw+ztq1ZZxTBdcbD7YbzUAHyD/4xBX 50Wbt5n4SXInzZwgGbm8+RSFd0kubK8xu0sw3ow5jX82bf2IPkI5F9Ew09pbgbsQXqSm KhuQHpUMJw3y2RksvVMzIfjZL842ztKkXhONGZdooRy0ojVKC/l2R5/lVBO44RC6un4s HP/g== X-Gm-Message-State: AGi0PuZ8rZ62JqbjL6TUMHn5URwh5nnenHPBDIpIyEsgZVGNSaa74qPy 7TF65+Hx73muOjpt7FI0EDceV6ZpAV4JLw== X-Google-Smtp-Source: APiQypItblz6ilD1RERx2GWT2tXb7DsShtslcQxMY7j2gQYxxU4cBIN2BCNi0QUOXkhHePz1TObowQ== X-Received: by 2002:a1c:f615:: with SMTP id w21mr12883707wmc.183.1587316487958; Sun, 19 Apr 2020 10:14:47 -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 s11sm20636516wrw.71.2020.04.19.10.14.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Apr 2020 10:14:47 -0700 (PDT) From: Wolfgang Haupt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 19:14:41 +0200 Message-Id: <20200419171441.2844-1-haupt.wolfgang@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH v2] 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; }