From patchwork Wed Feb 12 19:40:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 17764 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 0B26C449F11 for ; Wed, 12 Feb 2020 21:46:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D994B68AEE8; Wed, 12 Feb 2020 21:46:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D195268A764 for ; Wed, 12 Feb 2020 21:46:44 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id a9so3970757wmj.3 for ; Wed, 12 Feb 2020 11:46:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4zqmpOY1VpjO9JjD67CEKqJcrj7FLIc29KiKBhUI9Ek=; b=HawvFvnY9rTUr81OKC5dgLiFIHHBsPKbPh/uBOTuYHTM1mrqEF8/m/YtGPCb/C3XFu LQJc5/dPumuJ1SHrZV97jQAFBpjbcufwiYACpxeFqv6gR95XmcBBVM2U9S9YakOvSt8t /r/h4f+CXSYyMhzp5USz3VX4pmMNl8LVuPk9ru3JVn1iXL4Ba203K1FOBazJYuYF62rB pFTTZi800MAFrqb2w2MwLHgM/rJVV8XU4taRpRYjmRixlrmHeGkiiq17W24LYCkTkaWZ BdpR84QkgRpNHK1KFtjESueUSjTYCIRNLNfEASk93cw86sstOY85MFrnwiz3Hcxpqpi9 dmyw== 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:mime-version :content-transfer-encoding; bh=4zqmpOY1VpjO9JjD67CEKqJcrj7FLIc29KiKBhUI9Ek=; b=e2XI4Vjy4eSNN38rvH9wgy2h4wgVoOS7TJD/BMDjVzyIexDk+5L+puaIVWiSU7+aOk tcEkSshp02YfddyhGlnaVWM84I3QPrTcKD+38zIJgfgoAav7+forMkA3BHflvkgwsqdV UlHiHQVWw/0CHtTM4JIZOH7wecjt3Awx+LOmIJrW86SjU3qeBLN5aCnuhdGGT2xY3x8N p2igJdSNDA9HHFoJ20jZk5Gpemp1AfFNLXjtV2oMeLkxhIpZN5tqLkQaAWkfTApGR5GE 1AuCtyuaV29kviYVvuZnm/gpkyzgLL8tBt7oYiI/e8G9T4Y4N+g/4JJavECLEuMk0UyI +4Yg== X-Gm-Message-State: APjAAAXX1dWxBgAy9dP3luG7cobb2Msfnaj0TQt7m6R2LHvRbn3rhT13 n/hkGmanqz4HdF6mmlsjIUPjTa1WdXc= X-Google-Smtp-Source: APXvYqwBi90Isphg4+uzyMm5GN/Mtwmy7HJZ39GqDDWaiZP+1gZIwpyy0vWPtvCXMnHa4kfF4+ESPg== X-Received: by 2002:a1c:1b4d:: with SMTP id b74mr674175wmb.33.1581536439025; Wed, 12 Feb 2020 11:40:39 -0800 (PST) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id x10sm1684677wrv.60.2020.02.12.11.40.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Feb 2020 11:40:38 -0800 (PST) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Feb 2020 19:40:34 +0000 Message-Id: <20200212194034.20472-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [avfomat/rtp: source ips lost when specified as URL options] Patch for ffmpeg using rtp protocol where sources option is not retained 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: phunkyfish Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/rtsp.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 859defa592..f922055134 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2334,7 +2334,9 @@ static int sdp_read_header(AVFormatContext *s) RTSPStream *rtsp_st; int size, i, err; char *content; + const char *p, *sp="", *sources="", *sp2, *sources2; char url[1024]; + char sources_buf[1024]; if (!ff_network_init()) return AVERROR(EIO); @@ -2360,6 +2362,16 @@ static int sdp_read_header(AVFormatContext *s) av_freep(&content); if (err) goto fail; + /* Search for sources= tag in original URL for rtp protocol only */ + if (strncmp(s->url, "rtp://", 6) == 0) { + p = strchr(s->url, '?'); + if (p && av_find_info_tag(sources_buf, sizeof(sources_buf), "sources", p)) { + /* av_log(s, AV_LOG_VERBOSE, "sdp_read_header found sources %s\n", sources_buf); */ + sp = sources_buf; + sources = "&sources="; + } + } + /* open each RTP stream */ for (i = 0; i < rt->nb_rtsp_streams; i++) { char namebuf[50]; @@ -2377,12 +2389,22 @@ static int sdp_read_header(AVFormatContext *s) av_dict_free(&opts); goto fail; } + + /* Prepare to add sources to the url to be opened. + Otherwise the join to the source specific muliticast will be missing */ + sources2 = sources; + sp2 = sp; + /* ignore sources from original URL, when sources are already set in rtsp_st */ + if (rtsp_st->nb_include_source_addrs > 0) + sources2 = sp2 = ""; + ff_url_join(url, sizeof(url), "rtp", NULL, namebuf, rtsp_st->sdp_port, - "?localport=%d&ttl=%d&connect=%d&write_to_source=%d", + "?localport=%d&ttl=%d&connect=%d&write_to_source=%d%s%s", rtsp_st->sdp_port, rtsp_st->sdp_ttl, rt->rtsp_flags & RTSP_FLAG_FILTER_SRC ? 1 : 0, - rt->rtsp_flags & RTSP_FLAG_RTCP_TO_SOURCE ? 1 : 0); + rt->rtsp_flags & RTSP_FLAG_RTCP_TO_SOURCE ? 1 : 0, + sources2, sp2); append_source_addrs(url, sizeof(url), "sources", rtsp_st->nb_include_source_addrs,