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 E3C3D4D8A1 for ; Wed, 26 Feb 2025 03:40:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1087A68CF11; Wed, 26 Feb 2025 05:40:11 +0200 (EET) Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9039868CF15 for ; Wed, 26 Feb 2025 05:40:04 +0200 (EET) Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-6fb73240988so41971397b3.3 for ; Tue, 25 Feb 2025 19:40:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740541203; x=1741146003; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MSlbuDtc6BtyN/QXGtOr68hXteiYkYUPWo8aVjkf228=; b=ADMjgCD/sxsIQJUeBFVnocr+MJVGM8bt3Z6zrlS1/bGhvYGydxWnfPOTyCSSAnCtXH 7IE3ZMXcJKWfNAeekYSQjHeGTJvkUEyhPRyQ+q/9raOBmIi4LyY/P3rxT007d7EKDqga 6SsgnlvT5k8zbPOjWey+flysfpwQsx9jb1trfMlECFkbZKeqgMdto+47XgszygK0IG9u ItmlAjEBs9RBZoWPh8IKAp6tHaKSu2psCo7aDE1BD/TyF8xqM/648mFl73Wcy5aXwDR0 DOvTZOVTrxBYEjitAiv/K1UYAkWD8g1W/1MUZGRmDhKCyXWO5R3nx6K6/WuRcIWgr7BG jmWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740541203; x=1741146003; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MSlbuDtc6BtyN/QXGtOr68hXteiYkYUPWo8aVjkf228=; b=uC7wdTud7pNps/1UWClOLz1pxPYUI1LXrHKiFF8NPCwG285qn1Xk/5lI7I2k34XOAU dlJmkdOVTftNRS5LVTo03uOgLk9DV9m9PCRgo/oWHpj/SEvOAZGPqjFRhhmJRk7s4zRi xr2pRl5p1SAvrxLECsyFbel1VKbEkswzBXWy3GA8PSM+SOHtPFHQrxQIuySeZ6aGYgiF 5kJ7u2UPYNDlvSq62xCXdI7HbUV1b4bE96ND+JtqeUBsDgz9s3J/+z8jYsYum58lRTdh SJ7zLUtMNJA8MLwrNuaUadApiMKYXi1rMXAbnf2EkBsTrmd/mQ2iHann/pm4H1N57duU p7xQ== X-Gm-Message-State: AOJu0Yxtv1IDHwgz3DwF0DrkYNFj5ZKXmzRH/+sZ1nM0ntirF15eec0R Y7jo2nuzPs/jXIC3NntRiGhm0aro5LULigUyssWf3mDwxhl3geVsEGypRA== X-Gm-Gg: ASbGncuNeiIAhh+PlgPX1wZefCvucPfSayy+vgw+oCr87NgZFXiChgSlkuRemlOdfOq kMZ1dF/tgTYsXLBa4X1c8+OHUEwod+pkzQbMWyQlTRwViCmj4MzwNiB6r3Sdk1CkUQcuWEvD71/ 2MChB+4/MNz6NMboUEQ1pPyPzRdqOgMr2r9jnxix1QO156Kl3b5dB6wZc3taqup8dYhvF8ZnJ86 5Qf3ccyDPuGCcKDk5M/52qLqVCZM2QMZBDggpwjskSgkssROvQW5lxUo9kvC87yB2D2DN3JZEJk TQnpWblanQgUQcnIGcD/rgymDnyXZopa+5K54j/pAsqFielIo46H5gfwspeGYPgyOfRjQQymia6 PX0s39zveQK6oj0+vim/n X-Google-Smtp-Source: AGHT+IF9OvBnhWUynGq5R/r3fMAyhVCKUsV0W8dSWd3pYk0EDn2vw0/5oazDz/4354r/bvtCO+wtTQ== X-Received: by 2002:a05:690c:640d:b0:6ef:90a7:16ec with SMTP id 00721157ae682-6fd22085096mr17750657b3.28.1740541202849; Tue, 25 Feb 2025 19:40:02 -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-6fd1162f3fasm7926057b3.25.2025.02.25.19.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 19:40:01 -0800 (PST) From: Rashad Tatum To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Feb 2025 22:38:53 -0500 Message-ID: <20250226033912.1031239-3-tatum.rashad@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250226033912.1031239-1-tatum.rashad@gmail.com> References: <20250226033912.1031239-1-tatum.rashad@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/3] libavformat/rtsp: Fix playback of sdp files from http urls. 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: Support wildcard source-filter destinations. Revamp source-filter processing to only happen after the first media description was processed and either when the next one starts or when we have reached the end of the sdp. This handles a wider variety of cases and doesn't rely on any optional media descriptions. --- libavformat/rtsp.c | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index ac17717195..3f9196a385 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "config_components.h" #include "libavutil/avassert.h" @@ -393,9 +395,10 @@ static void copy_default_source_addrs(struct RTSPSource **addrs, int count, { RTSPSource *rtsp_src, *rtsp_src2; int i; + const char* wildcard_dest = "*"; for (i = 0; i < count; i++) { rtsp_src = addrs[i]; - if (strcmp(rtsp_src->dest_addr, sdp_ip_str) == 0) { + if ((strcmp(rtsp_src->dest_addr, sdp_ip_str) == 0) || (strcmp(rtsp_src->dest_addr, wildcard_dest) == 0)) { rtsp_src2 = av_memdup(rtsp_src, sizeof(*rtsp_src)); if (!rtsp_src2) continue; @@ -425,7 +428,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, { RTSPState *rt = s->priv_data; char buf1[64], st_type[64]; - const char *p, *sdp_ip_str, *dest_addr; + const char *p, *dest_addr; enum AVMediaType codec_type; int payload_type; AVStream *st; @@ -451,7 +454,6 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, if (get_sockaddr(s, buf1, &sdp_ip)) return; - sdp_ip_str = av_strdup(buf1); ttl = 16; if (*p == '/') { p++; @@ -466,19 +468,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, 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); - } - av_freep(&sdp_ip_str); break; case 's': av_dict_set(&s->metadata, "title", p, 0); @@ -521,6 +511,8 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, rtsp_st->sdp_ip = s1->default_ip; rtsp_st->sdp_ttl = s1->default_ttl; + + get_word(buf1, sizeof(buf1), &p); /* port */ rtsp_st->sdp_port = atoi(buf1); @@ -728,13 +720,31 @@ int ff_sdp_parse(AVFormatContext *s, const char *content) { const char *p; int letter, i; - char buf[SDP_MAX_SIZE], *q; + char buf[SDP_MAX_SIZE], sdp_ip_str[50], *q; + bool parsed_first_media_desc = false; SDPParseState sdp_parse_state = { { 0 } }, *s1 = &sdp_parse_state; p = content; for (;;) { p += strspn(p, SPACE_CHARS); letter = *p; + if(parsed_first_media_desc && (letter == 'm' || letter == '\0')) { + RTSPState *rt = s->priv_data; + RTSPStream *rtsp_st = rt->rtsp_streams[rt->nb_rtsp_streams - 1]; + getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, + sizeof(rtsp_st->sdp_ip), + sdp_ip_str, sizeof(sdp_ip_str), NULL, 0, NI_NUMERICHOST); + 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); + } if (letter == '\0') break; p++; @@ -749,7 +759,11 @@ int ff_sdp_parse(AVFormatContext *s, const char *content) p++; } *q = '\0'; + sdp_parse_line(s, s1, letter, buf); + if(letter == 'm') + parsed_first_media_desc = true; + next_line: while (*p != '\n' && *p != '\0') p++; -- 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".