From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 591A04D00C for ; Fri, 14 Feb 2025 17:08:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57E5D68BFEF; Fri, 14 Feb 2025 19:08:35 +0200 (EET) Received: from mail-yw1-f177.google.com (mail-yw1-f177.google.com [209.85.128.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80CA068BE32 for ; Fri, 14 Feb 2025 19:08:28 +0200 (EET) Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-6f9c6d147edso21550667b3.3 for ; Fri, 14 Feb 2025 09:08:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739552906; x=1740157706; darn=ffmpeg.org; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=+PP8e6TL0FO15GBbi7rqFI8VyC1Wnowm8tRqbIbFnjM=; b=Khg8UTG5w9k2++JgvsZELKyemFvWOYhc9dDwXVT8XbFZYkgaU33k5W31Zcg62+UGFO m+ZryPsrb6k/pN0ct+TTa/dB9nElmEl1Y1hNhHmUfvTUaGIl6TNVsLtOiOtg7IwlQAks Nj0v4IEjcACHXv90kNmfobT2EUBZK+phwt6A6coK3RVpdZ1XcYhxFFgL9daxUcA8vcPA iH1+ei2Hr8KvOUoprQQP1Cr34hAzhQbQJ/i3MXnTqC1DtOWQEravKJtCOv25W0P9QYsi v2hpz6sCa9D5fL+8I2TQ3vY7ulRsur2TBlcHjR120ZoX8sAoJmOIHbgCdG4Sc3mf0QCu at+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739552906; x=1740157706; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+PP8e6TL0FO15GBbi7rqFI8VyC1Wnowm8tRqbIbFnjM=; b=ZSln9NFLTB6yvqW5iDlAiGw3x+KiILyM22+mDe/qVJMKcyBXeqLVzGSslG8gnZOm8u jOt/E6k1WcmNsuWZvAFX64gmk6H1nXEksHM8F8xKD9DNxpHjRWYVZRhlAawuMXx2/eYe /uvlNJmdub+2ldqV2pr6QmyEm3TviZH9imBhS2WaPCZp/pcdFOvLGAopMn5MtSJcQeFQ MT2NnjAATrM58dYlpA1eTtBgfZ0dTKdkV8uACj4JtrQDWJv2tD4wBy31NBfXF17ET13F eCpsu7rC7PixDTa/0dQkKohqr+C4428DFNHCc0UpcLb1LJMOBXD9HnpcGIRMKEWAiiG8 xfJg== X-Gm-Message-State: AOJu0YyxRCV+vJGauF2F4CCLsQmyenexWbrAIqtWKOhZPKN/UE9XsmWI xQt4uUUNGTTTo3TpZObdWy9IP/s8vS4xd/ci4WBzKxdJNEeecH+MriFC+2y2 X-Gm-Gg: ASbGncucNHNS4izkaNQ02jJ/hYy1/84jRNOjbFPmOGZiMf0eyGMHWHIiYk1KdaylJyf I7kzgThmw6CIxRt/XOhjrWBdyjfVYdiNau0cNM5F+O/OK1uAAHXytSN1WjrG5kaWgObPqmVYNM3 6VC3ZR7igmbWJIM703xI/lGb6jY7NYu/lqyJEQGNDq0C3N2mdMu/8KGTTHxdwNUw/K8WiaCsPoz fmUH+Vzuek/jhnvLRhdGExrWu6vRoZqCW78tzmJBDh49Dv0uc5sRSStP5fMi+hii9lIfT0+wH+U yN9cj/oymzzqWvkxMyknrZupLwFT3qxZU+SOQHfDAdv2l7d3tn/9eL2FIvKuJM5LXJDT5bPbewG 9VXg= X-Google-Smtp-Source: AGHT+IGyFTxBfVLnupSrqsevJQAM0zXqXzx1e9M961Zwh26KMxZT0FKrvbcPmdX3QNRjfDZLtlIyOw== X-Received: by 2002:a05:690c:6211:b0:6f6:b646:4f34 with SMTP id 00721157ae682-6fb5837720dmr1432997b3.30.1739552905835; Fri, 14 Feb 2025 09:08:25 -0800 (PST) Received: from [192.168.50.218] (108-65-109-112.lightspeed.tukrga.sbcglobal.net. [108.65.109.112]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6fb35d584a8sm8379837b3.11.2025.02.14.09.08.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Feb 2025 09:08:25 -0800 (PST) Message-ID: <4bc51275-6577-433d-ac02-fb034d17142f@gmail.com> Date: Fri, 14 Feb 2025 12:08:24 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta From: Rashad Tatum To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 1/2] libavformat/rtsp: Make source specific multicast work for rtsp streams X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: by first changing the RTSPSource to track the destination address obtained from the source filter. For each RTSPStream, only add the source filter from the sdp if sdp_ip string matches source-filter's destination address. Before issuing the setup request, change the lower_transport to multicast if the sdp_ip is a multicast address. Change the multicast case to append sources (from the source-filter) to the rtp url to make the source specific multicast join work. Signed-off-by: Rashad Tatum --- libavformat/rtsp.c | 88 +++++++++++++++++++++++++++++++--------------- libavformat/rtsp.h | 3 +- 2 files changed, 62 insertions(+), 29 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 5ea471b40c..0c65f8d1a4 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -389,16 +389,18 @@ typedef struct SDPParseState { } SDPParseState; static void copy_default_source_addrs(struct RTSPSource **addrs, int count, - struct RTSPSource ***dest, int *dest_count) + struct RTSPSource ***dest, int *dest_count, const char* sdp_ip_str) { RTSPSource *rtsp_src, *rtsp_src2; int i; for (i = 0; i < count; i++) { rtsp_src = addrs[i]; - rtsp_src2 = av_memdup(rtsp_src, sizeof(*rtsp_src)); - if (!rtsp_src2) - continue; - dynarray_add(dest, dest_count, rtsp_src2); + if (strcmp(rtsp_src->dest_addr, sdp_ip_str) == 0) { + rtsp_src2 = av_memdup(rtsp_src, sizeof(*rtsp_src)); + if (!rtsp_src2) + continue; + dynarray_add(dest, dest_count, rtsp_src2); + } } } @@ -423,7 +425,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, { RTSPState *rt = s->priv_data; char buf1[64], st_type[64]; - const char *p; + const char *p, *sdp_ip_str, *dest_addr; enum AVMediaType codec_type; int payload_type; AVStream *st; @@ -448,6 +450,8 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, get_word_sep(buf1, sizeof(buf1), "/", &p); if (get_sockaddr(s, buf1, &sdp_ip)) return; + + sdp_ip_str = av_strdup(buf1); ttl = 16; if (*p == '/') { p++; @@ -461,6 +465,18 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, rtsp_st = rt->rtsp_streams[rt->nb_rtsp_streams - 1]; rtsp_st->sdp_ip = sdp_ip; rtsp_st->sdp_ttl = ttl; + + copy_default_source_addrs(s1->default_include_source_addrs, + s1->nb_default_include_source_addrs, + &rtsp_st->include_source_addrs, + &rtsp_st->nb_include_source_addrs, + sdp_ip_str); + copy_default_source_addrs(s1->default_exclude_source_addrs, + s1->nb_default_exclude_source_addrs, + &rtsp_st->exclude_source_addrs, + &rtsp_st->nb_exclude_source_addrs, + sdp_ip_str); + } break; case 's': @@ -504,15 +520,6 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, rtsp_st->sdp_ip = s1->default_ip; rtsp_st->sdp_ttl = s1->default_ttl; - copy_default_source_addrs(s1->default_include_source_addrs, - s1->nb_default_include_source_addrs, - &rtsp_st->include_source_addrs, - &rtsp_st->nb_include_source_addrs); - copy_default_source_addrs(s1->default_exclude_source_addrs, - s1->nb_default_exclude_source_addrs, - &rtsp_st->exclude_source_addrs, - &rtsp_st->nb_exclude_source_addrs); - get_word(buf1, sizeof(buf1), &p); /* port */ rtsp_st->sdp_port = atoi(buf1); @@ -672,11 +679,13 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, // not checking that the destination address actually matches or is wildcard get_word(buf1, sizeof(buf1), &p); + dest_addr = av_strdup(buf1); while (*p != '\0') { rtsp_src = av_mallocz(sizeof(*rtsp_src)); if (!rtsp_src) return; - get_word(rtsp_src->addr, sizeof(rtsp_src->addr), &p); + av_strlcpy(rtsp_src->dest_addr, dest_addr, sizeof(rtsp_src->dest_addr)); + get_word(rtsp_src->src_addr, sizeof(rtsp_src->src_addr), &p); if (exclude) { if (s->nb_streams == 0) { dynarray_add(&s1->default_exclude_source_addrs, &s1->nb_default_exclude_source_addrs, rtsp_src); @@ -859,10 +868,11 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) rtsp_st->transport_priv = ff_rdt_parse_open(s, st->index, rtsp_st->dynamic_protocol_context, rtsp_st->dynamic_handler); - else if (CONFIG_RTPDEC) + else if (CONFIG_RTPDEC) { rtsp_st->transport_priv = ff_rtp_parse_open(s, st, rtsp_st->sdp_payload_type, reordering_queue_size); + } if (!rtsp_st->transport_priv) { return AVERROR(ENOMEM); @@ -1452,6 +1462,18 @@ retry: return 0; } +static void append_source_addrs(char *buf, int size, const char *name, + int count, struct RTSPSource **addrs) +{ + int i; + if (!count) + return; + av_strlcatf(buf, size, "&%s=%s", name, addrs[0]->src_addr); + for (i = 1; i < count; i++) { + av_strlcatf(buf, size, ",%s", addrs[i]->src_addr); + } +} + int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, int lower_transport, const char *real_challenge) { @@ -1510,6 +1532,11 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, } else rtsp_st = rt->rtsp_streams[i]; + /* RTP/UDP Source Specific Multicast (SSM) */ + if (ff_is_multicast_address((struct sockaddr*) &rtsp_st->sdp_ip)) { + lower_transport = RTSP_LOWER_TRANSPORT_UDP_MULTICAST; + } + /* RTP/UDP */ if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) { char buf[256]; @@ -1666,7 +1693,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, break; } case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: { - char url[MAX_URL_SIZE], namebuf[50], optbuf[20] = ""; + char url[MAX_URL_SIZE], namebuf[50], optbuf[1024] = ""; struct sockaddr_storage addr; int port, ttl; AVDictionary *opts = map_to_opts(rt); @@ -1682,6 +1709,20 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, } if (ttl > 0) snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl); + + if (rtsp_st->nb_include_source_addrs > 0) { + if(strlen(optbuf) == 0 ) { + snprintf(optbuf, sizeof(optbuf), "?"); + } + + append_source_addrs(optbuf, sizeof(optbuf), "sources", + rtsp_st->nb_include_source_addrs, + rtsp_st->include_source_addrs); + append_source_addrs(optbuf, sizeof(optbuf), "block", + rtsp_st->nb_exclude_source_addrs, + rtsp_st->exclude_source_addrs); + } + getnameinfo((struct sockaddr*) &addr, sizeof(addr), namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); ff_url_join(url, sizeof(url), "rtp", NULL, namebuf, @@ -2383,16 +2424,7 @@ static int sdp_probe(const AVProbeData *p1) return 0; } -static void append_source_addrs(char *buf, int size, const char *name, - int count, struct RTSPSource **addrs) -{ - int i; - if (!count) - return; - av_strlcatf(buf, size, "&%s=%s", name, addrs[0]->addr); - for (i = 1; i < count; i++) - av_strlcatf(buf, size, ",%s", addrs[i]->addr); -} + static int sdp_read_header(AVFormatContext *s) { diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 83b2e3f4fb..61de5cfb17 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -432,7 +432,8 @@ typedef struct RTSPState { #define RTSP_FLAG_SATIP_RAW 0x20 /**< Export SAT>IP stream as raw MPEG-TS */ typedef struct RTSPSource { - char addr[128]; /**< Source-specific multicast include source IP address (from SDP content) */ + char dest_addr[128]; /**< Source-specific multicast destination IP address (from SDP content) */ + char src_addr[128]; /**< Source-specific multicast include source IP address (from SDP content) */ } RTSPSource; /** -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".