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 ESMTP id A55F048B16 for ; Wed, 3 Jan 2024 12:51:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB97568CBF5; Wed, 3 Jan 2024 14:51:45 +0200 (EET) Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A091A68C7A2 for ; Wed, 3 Jan 2024 14:51:39 +0200 (EET) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-50e7af5f618so7636516e87.1 for ; Wed, 03 Jan 2024 04:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704286298; x=1704891098; darn=ffmpeg.org; h=in-reply-to:from:references:to:content-language:subject:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=7Y1vUU8a/vHD9GX4TSVfmGayOh1jhsv3FBLK8WzMC6Q=; b=i9A3/uShPY47XkGpNOnBdheDZToB5Izd/RgPcIf8YpkTANxCBUhNM29WAbpwALFMST UCSkreTXHu/rfi//RyCdXYXblFVMBgNmFFlEru/YxsxJuXyLmmGKZPN5n3BS8SGc/c/B uZGOT+WofJVFIYTIweN3kTvxrF8oR4UPp2oJObsWJvq0CPa9qbWEmA8hcZTV8NDkV4rx AI22eYlKw9UOJSTrPhsv0nIljFLDaMc8Kvz5dCtrMOyLtjoVNN9QeJYW5bL7cpiJzfXF U1zWqc4BzcYEIqR6QPyu8XxZGg3fOVy+JHIQ291v3z4jiNs0lYSmI5k+76tw5zHzUDJk +qgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704286298; x=1704891098; h=in-reply-to:from:references:to:content-language:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=7Y1vUU8a/vHD9GX4TSVfmGayOh1jhsv3FBLK8WzMC6Q=; b=MTFqrYQ1Fzc1DCBPMqCwJwFLP2JezFu15/TB53rP0bdkWhbnKxByds4eUmbBzQURYn eVLvrzvcaEyPJVP0PjUOInJRyY7AYDXFru+glqFIxcy6eb00O4RfKTIFDycnAWkINt2n h2QCawrF3/MaOd5CAd0vSVwVwzjZIf3WFRK/uva5T8EKMi5Y+1KLqc/3u2pLXZguneso DRE3koa4oy9i/Le6+nuc9JKz5sSjdEGwo/eRHX9CYUmOLRwsuSjuMqEA1QPu3MtgYMI3 WX0VSn4w031diHY9orsXin9BiwMPDepy1bbPo0ACh4rdDHVKAs6bF/bzjm28jcb31zUO AUnQ== X-Gm-Message-State: AOJu0YwnNl8AKKi0azxSz2OZ2GAZVS7GxOaEkvcZGJdAuBoLNV1yGtWz hXdsJE5yNmWrh3uceZ04f/PkfDrxFxY= X-Google-Smtp-Source: AGHT+IEVbOAq8FebIGwJ0zIfpx8U9mTcKJpAQafBocmZeEHfbuJZv1PvsZj+Pn1Gx9y5Jy7iL/z0HQ== X-Received: by 2002:a05:6512:e8c:b0:50e:6e41:2f2a with SMTP id bi12-20020a0565120e8c00b0050e6e412f2amr9419692lfb.6.1704286297932; Wed, 03 Jan 2024 04:51:37 -0800 (PST) Received: from [192.168.2.77] ([93.183.214.73]) by smtp.gmail.com with ESMTPSA id mf20-20020a1709071a5400b00a26ae94444csm11958656ejc.24.2024.01.03.04.51.37 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Jan 2024 04:51:37 -0800 (PST) Content-Type: multipart/mixed; boundary="------------nuGT1S09TVCY40gCv2XL9ko9" Message-ID: Date: Wed, 3 Jan 2024 14:51:36 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20231228193329.GV6420@pb2> From: Paul Orlyk In-Reply-To: <20231228193329.GV6420@pb2> Subject: Re: [FFmpeg-devel] [PATCH] avformat/rtsp: Fix server compatibility issues with rtspclientsink GStreamer plugin 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --------------nuGT1S09TVCY40gCv2XL9ko9 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/28/23 21:33, Michael Niedermayer wrote: > On Wed, Dec 27, 2023 at 03:44:09PM +0200, Paul Orlyk wrote: >> mode field in Transport header can be sent in upper case so make string >> comparison case insensitive. >> Also, GStreamer expects to see mode=record instead of mode=receive in >> Transport header in response. >> >> Signed-off-by: Paul Orlyk >> --- >> libavformat/rtsp.c | 4 ++-- >> libavformat/rtspdec.c | 4 ++-- >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c >> index 583f5338e8..61e24a5c7a 100644 >> --- a/libavformat/rtsp.c >> +++ b/libavformat/rtsp.c >> @@ -1012,8 +1012,8 @@ static void rtsp_parse_transport(AVFormatContext *s, >> if (*p == '=') { >> p++; >> get_word_sep(buf, sizeof(buf), ";, ", &p); >> - if (!strcmp(buf, "record") || >> - !strcmp(buf, "receive")) >> + if (!av_strcasecmp(buf, "record") || >> + !av_strcasecmp(buf, "receive")) >> th->mode_record = 1; >> } >> } >> diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c >> index 39fd92fb66..d6a223cbc6 100644 >> --- a/libavformat/rtspdec.c >> +++ b/libavformat/rtspdec.c >> @@ -303,7 +303,7 @@ static int rtsp_read_setup(AVFormatContext*s, char* >> host, char *controlurl) >> rtsp_st->interleaved_min = request.transports[0].interleaved_min; > patch is damaged by linebreaks > > > [...] Sorry for that. Please find it attached. --------------nuGT1S09TVCY40gCv2XL9ko9 Content-Type: text/x-patch; charset=UTF-8; name="0001-avformat-rtsp-Fix-server-compatibility-issues-with-r.patch" Content-Disposition: attachment; filename*0="0001-avformat-rtsp-Fix-server-compatibility-issues-with-r.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAxNTZjZWVkZWQ2Y2QwNzZiNzgxMjA1YWRjMDM0MTQ0MTg2YTlhN2VhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIE9ybHlrIDxwYXVsLm9ybHlrQGdtYWlsLmNv bT4KRGF0ZTogV2VkLCAyNyBEZWMgMjAyMyAxNTozMDoyMCArMDIwMApTdWJqZWN0OiBbUEFU Q0hdIGF2Zm9ybWF0L3J0c3A6IEZpeCBzZXJ2ZXIgY29tcGF0aWJpbGl0eSBpc3N1ZXMgd2l0 aAogcnRzcGNsaWVudHNpbmsgR1N0cmVhbWVyIHBsdWdpbgoKbW9kZSBmaWVsZCBpbiBUcmFu c3BvcnQgaGVhZGVyIGNhbiBiZSBzZW50IGluIHVwcGVyIGNhc2Ugc28gbWFrZSBzdHJpbmcg Y29tcGFyaXNvbiBjYXNlIGluc2Vuc2l0aXZlLgpBbHNvLCBHU3RyZWFtZXIgZXhwZWN0cyB0 byBzZWUgbW9kZT1yZWNvcmQgaW5zdGVhZCBvZiBtb2RlPXJlY2VpdmUgaW4gVHJhbnNwb3J0 IGhlYWRlciBpbiByZXNwb25zZS4KClNpZ25lZC1vZmYtYnk6IFBhdWwgT3JseWsgPHBhdWwu b3JseWtAZ21haWwuY29tPgotLS0KIGxpYmF2Zm9ybWF0L3J0c3AuYyAgICB8IDQgKystLQog bGliYXZmb3JtYXQvcnRzcGRlYy5jIHwgNCArKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDQgaW5z ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmZvcm1hdC9y dHNwLmMgYi9saWJhdmZvcm1hdC9ydHNwLmMKaW5kZXggNTgzZjUzMzhlOC4uNjFlMjRhNWM3 YSAxMDA2NDQKLS0tIGEvbGliYXZmb3JtYXQvcnRzcC5jCisrKyBiL2xpYmF2Zm9ybWF0L3J0 c3AuYwpAQCAtMTAxMiw4ICsxMDEyLDggQEAgc3RhdGljIHZvaWQgcnRzcF9wYXJzZV90cmFu c3BvcnQoQVZGb3JtYXRDb250ZXh0ICpzLAogICAgICAgICAgICAgICAgIGlmICgqcCA9PSAn PScpIHsKICAgICAgICAgICAgICAgICAgICAgcCsrOwogICAgICAgICAgICAgICAgICAgICBn ZXRfd29yZF9zZXAoYnVmLCBzaXplb2YoYnVmKSwgIjssICIsICZwKTsKLSAgICAgICAgICAg ICAgICAgICAgaWYgKCFzdHJjbXAoYnVmLCAicmVjb3JkIikgfHwKLSAgICAgICAgICAgICAg ICAgICAgICAgICFzdHJjbXAoYnVmLCAicmVjZWl2ZSIpKQorICAgICAgICAgICAgICAgICAg ICBpZiAoIWF2X3N0cmNhc2VjbXAoYnVmLCAicmVjb3JkIikgfHwKKyAgICAgICAgICAgICAg ICAgICAgICAgICFhdl9zdHJjYXNlY21wKGJ1ZiwgInJlY2VpdmUiKSkKICAgICAgICAgICAg ICAgICAgICAgICAgIHRoLT5tb2RlX3JlY29yZCA9IDE7CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvcnRzcGRlYy5jIGIvbGli YXZmb3JtYXQvcnRzcGRlYy5jCmluZGV4IDM5ZmQ5MmZiNjYuLmQ2YTIyM2NiYzYgMTAwNjQ0 Ci0tLSBhL2xpYmF2Zm9ybWF0L3J0c3BkZWMuYworKysgYi9saWJhdmZvcm1hdC9ydHNwZGVj LmMKQEAgLTMwMyw3ICszMDMsNyBAQCBzdGF0aWMgaW50IHJ0c3BfcmVhZF9zZXR1cChBVkZv cm1hdENvbnRleHQgKnMsIGNoYXIqIGhvc3QsIGNoYXIgKmNvbnRyb2x1cmwpCiAgICAgICAg IHJ0c3Bfc3QtPmludGVybGVhdmVkX21pbiA9IHJlcXVlc3QudHJhbnNwb3J0c1swXS5pbnRl cmxlYXZlZF9taW47CiAgICAgICAgIHJ0c3Bfc3QtPmludGVybGVhdmVkX21heCA9IHJlcXVl c3QudHJhbnNwb3J0c1swXS5pbnRlcmxlYXZlZF9tYXg7CiAgICAgICAgIHNucHJpbnRmKHJl c3BvbnNlaGVhZGVycywgc2l6ZW9mKHJlc3BvbnNlaGVhZGVycyksICJUcmFuc3BvcnQ6ICIK LSAgICAgICAgICAgICAgICAgIlJUUC9BVlAvVENQO3VuaWNhc3Q7bW9kZT1yZWNlaXZlO2lu dGVybGVhdmVkPSVkLSVkIgorICAgICAgICAgICAgICAgICAiUlRQL0FWUC9UQ1A7dW5pY2Fz dDttb2RlPXJlY29yZDtpbnRlcmxlYXZlZD0lZC0lZCIKICAgICAgICAgICAgICAgICAgIlxy XG4iLCByZXF1ZXN0LnRyYW5zcG9ydHNbMF0uaW50ZXJsZWF2ZWRfbWluLAogICAgICAgICAg ICAgICAgICByZXF1ZXN0LnRyYW5zcG9ydHNbMF0uaW50ZXJsZWF2ZWRfbWF4KTsKICAgICB9 IGVsc2UgewpAQCAtMzMzLDcgKzMzMyw3IEBAIHN0YXRpYyBpbnQgcnRzcF9yZWFkX3NldHVw KEFWRm9ybWF0Q29udGV4dCAqcywgY2hhciogaG9zdCwgY2hhciAqY29udHJvbHVybCkKIAog ICAgICAgICBsb2NhbHBvcnQgPSBmZl9ydHBfZ2V0X2xvY2FsX3J0cF9wb3J0KHJ0c3Bfc3Qt PnJ0cF9oYW5kbGUpOwogICAgICAgICBzbnByaW50ZihyZXNwb25zZWhlYWRlcnMsIHNpemVv ZihyZXNwb25zZWhlYWRlcnMpLCAiVHJhbnNwb3J0OiAiCi0gICAgICAgICAgICAgICAgICJS VFAvQVZQL1VEUDt1bmljYXN0O21vZGU9cmVjZWl2ZTtzb3VyY2U9JXM7IgorICAgICAgICAg ICAgICAgICAiUlRQL0FWUC9VRFA7dW5pY2FzdDttb2RlPXJlY29yZDtzb3VyY2U9JXM7Igog ICAgICAgICAgICAgICAgICAiY2xpZW50X3BvcnQ9JWQtJWQ7c2VydmVyX3BvcnQ9JWQtJWRc clxuIiwKICAgICAgICAgICAgICAgICAgaG9zdCwgcmVxdWVzdC50cmFuc3BvcnRzWzBdLmNs aWVudF9wb3J0X21pbiwKICAgICAgICAgICAgICAgICAgcmVxdWVzdC50cmFuc3BvcnRzWzBd LmNsaWVudF9wb3J0X21heCwgbG9jYWxwb3J0LAotLSAKMi4zOS4yCgo= --------------nuGT1S09TVCY40gCv2XL9ko9 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --------------nuGT1S09TVCY40gCv2XL9ko9--