From patchwork Fri Apr 3 06:53:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Haupt X-Patchwork-Id: 18584 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 EC1A544A70D for ; Fri, 3 Apr 2020 09:59:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5DA968A315; Fri, 3 Apr 2020 09:59:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 996FF68A315 for ; Fri, 3 Apr 2020 09:59:44 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id c7so7164246wrx.5 for ; Thu, 02 Apr 2020 23:59: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; bh=rsO5i+5Cev/gMcHy/c35ntaJW+2Ai+mooZ0WHFie6IE=; b=fasBrszwjXDadTmDt3nfZTx8YEY28K5IGGH0Fmcp6mdjsRw9BjhKEqxzuTD3HXLSQ4 EvPb0mHeYgwjgDtEtR1CQKAAK+NBSIvAnlS9yYAyvCwKn3GFWSMrWnLeUSuJIalM89AJ R6kZ3GKJoPm+76BxTjOoOq12c3CFDfJYvkqMDoXZT/0U9dEHos8+PU9/zXTYL8yMgRqe fhcmDt5oWKZvckylnMf1A6gOX20eN5cI9fmlDWUkWtmA0RgbGClLxucGN6sGnYXKcvcy Y7hDp4e3gZcaZ0+GkOnE+GYge70jwPgpmx9uSL8QCoUGoCov8b0coSplWdwJtLsSjKnO aX0Q== 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=rsO5i+5Cev/gMcHy/c35ntaJW+2Ai+mooZ0WHFie6IE=; b=ayDK1l1Iua1Ly5LKCXVE27XUNzN6EK7r0PzOg7Ak2bENeG/OVQqTd64p6k8UKUq4Bd foxguMeWjc7UJdQsQvv7fywR3NpT+42G+6EDExnAscOfehoNSUZBHl5kn8D0hYaR4D2M cFRJK11AFcTuyRWRRM5IB0S8LmXRdc/60INbLkXdr4bVDCAKG0klsBdZ5jLWJYz9XLkb AMEI2ljl+8YJjy2+bdbToZhd2gB2cvFkthtB/4/fUjwxS64unk2K7m6sZcfFP7LcZUhQ lupa1t+Vbt0BYynxW+bDLdNuoTQ4JOQ7fnhAv6EgzuO0d0X6IM/YZteSTNel5zUl1nMg Kuiw== X-Gm-Message-State: AGi0PuZldR7bAs1iYJCm5pZT/phoHcdUjBCju6CuY2HScGNpp45MIePa L0oOXVOkfYKfWsFyZ7XU4XvrsU8hbz8= X-Google-Smtp-Source: APiQypI7bcVBWpGtgRKuqzkfTRz7ziQcyjga52c3uOtk1Ru465FlipUHvQxHI0cFFhbZB52XRfBBIg== X-Received: by 2002:a05:6000:1205:: with SMTP id e5mr7760105wrx.73.1585896848076; Thu, 02 Apr 2020 23:54:08 -0700 (PDT) Received: from a1rwulf-t480s.airwulf.net (77.117.197.254.wireless.dyn.drei.com. [77.117.197.254]) by smtp.gmail.com with ESMTPSA id v186sm10302050wme.24.2020.04.02.23.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 23:54:07 -0700 (PDT) From: Wolfgang Haupt To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Apr 2020 08:53:50 +0200 Message-Id: <20200403065350.31671-1-haupt.wolfgang@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/1] 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a69484d78b..dbf626eb13 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1616,6 +1616,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,10 +1634,12 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, 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) { + &s->interrupt_callback, &opts, s->protocol_whitelist, s->protocol_blacklist, NULL) < 0) { err = AVERROR_INVALIDDATA; + av_dict_free(&opts); goto fail; } + av_dict_free(&opts); break; } }