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 1ECD44D186 for ; Mon, 17 Feb 2025 18:42:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9886268C069; Mon, 17 Feb 2025 20:42:39 +0200 (EET) Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09D3568B864 for ; Mon, 17 Feb 2025 20:42:33 +0200 (EET) Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-6f6c90b51c3so40400247b3.2 for ; Mon, 17 Feb 2025 10:42:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739817751; x=1740422551; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WOlQHsxRy8dA9DwE+rJVpTW3CvZta5SBcMcMvm2tnhw=; b=RCplaPvcWti9yA5ch8zrsQZnPXGZ+TwcVbJYKTkyGUOlGYUgRORepRPRjdnfXhuQhe pKXrbGviOl5dlTr+HdqAz3Ps3zbJ8TibejDSrbhpTWowqKZ5RRPquwVW1nspZhldpbDR +0hkpakdBcWnlUKiW5oVK2r1wXVXF4bc3V87pZUcmvEo770rIv3ve2YTkOtVYVjEKyyP eVp8g29tUy1eqU605OYd0S6inmxgzhpsJx2QObC+JF8Jw4dZU0t0pG72g6lJucdG2iJw +AoM3Nrw7dgRdlzwzLYjj1xS5m8ujPCyxKh/YPtlojIBUXuT+w2uqrlkX03N302KBf7q yYng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739817751; x=1740422551; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WOlQHsxRy8dA9DwE+rJVpTW3CvZta5SBcMcMvm2tnhw=; b=N6y8wr3UKIqn4zi4/IG67HTuh+vGDq1+dGxGfbChvVGZ1DJuWmV4aVFlGsvr1yTiTv VIFWSwNFeGY++RZeMF/DrIVlPdU5p+AXMRcg7D014s/6EiydQOidnodXofTHLJxxR5qf ECabvXHvaw9NiycZTJMhF/oYcZdDFCSaEgq/JeOHpakQHI1SH4tRTGQAmdRrZjWoUyXc oXwEBaia9TS6qMJ1dHBh8aRmXdWMD34t+zYz+v4A3SN2ES1fJ7UyEASjgHsFrWzrgLo7 1jhpVzbZTSS9Y9OXhSgxwSD31DPXdCErVpE7AJyrCtUeAWBKYie+/4crsnx9+MIHMH7l XPzQ== X-Gm-Message-State: AOJu0YxJ6ToAJ8t+uOI5rDgYomizHpJMY14yjYVsKOUNVZPq8rlATxXZ cT5e+z0jjW2AHZB43COtRYAfH3W5M3wGgX3WclkR8MYX7KOUofAviK9BSe+8 X-Gm-Gg: ASbGncuUU6Wo4fVYVj867O/Ht4Zpu7pvVrw2NxguVyp+2ruwodHJc1Z38rkP8OHOjeE +Gj7lnt2nXWD5PD+s1zpwxVnfvXDn61i95m+SDkET2Izel99Dyr8sxAUoNohDAt5nLJ1aTUfiYL Edebz9Y9G0uz5i2ekXhN8zUbxMlAP2+1Ea36GVyVPt0Fh9ypRBIdWvu4LItXy9eC3r3ztF86YDs tLZ2K1otO7h/N4Vww059x8wT72TGzW117Lpu/JzvnrqNPfCgqMfUMmEuNKxNPaoywPcB3mVd8Rk KfmblVxUPo8OOZjR+tG6aHD/ryXfsIq9XhroSfYJX91iVIaLRgM1qeFmgPWzcmJF+7aRirjMDMs m3Q4iLBTqzQ== X-Google-Smtp-Source: AGHT+IESoFKbKwlFf3tMzluNOMaN7oppG96HdaCToR7R+As1H16qTFuL2mz9pZ44801z5tVZKG3Rjg== X-Received: by 2002:a05:690c:6e01:b0:6f9:97f7:a5c3 with SMTP id 00721157ae682-6fb582a3b6amr93187677b3.18.1739817750777; Mon, 17 Feb 2025 10:42:30 -0800 (PST) Received: from localhost.localdomain (108-65-109-112.lightspeed.tukrga.sbcglobal.net. [108.65.109.112]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6fb3619cb1fsm22068157b3.90.2025.02.17.10.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 10:42:30 -0800 (PST) From: Rashad Tatum To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 13:41:29 -0500 Message-ID: <20250217184149.921456-1-tatum.rashad@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 Cc: Rashad Tatum Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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. --- 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".