From patchwork Sun Feb 7 11:46:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 25477 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 AAA9044B0DA for ; Sun, 7 Feb 2021 13:46:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D1F8687F4E; Sun, 7 Feb 2021 13:46:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-251-73.mail.qq.com [203.205.251.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D6D5687F4E for ; Sun, 7 Feb 2021 13:46:23 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1612698378; bh=+PIT+w83RSkoygYWBLIOzGrOlWtabH5XjvXLgUuUDlM=; h=From:To:Cc:Subject:Date; b=DKOOJ6UsbUEYEVs9y94ENcUb3M63yl07cLFmtdE3S7R+K/T1f05cnH7RiVkV2yiaO D8PRZto+AAqDanH7jqg7oSvL31I2gcT3a9zl+7J0PQFPH+KTtIhPijXDNAB+FGPkmp 4IA8MAF9fPeWuNPB+xuLCDEedYlZpyI1AMhlGbos= Received: from ZHILIZHAO-MB2.tencent.com ([59.37.125.48]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id B8E2C6F9; Sun, 07 Feb 2021 19:46:14 +0800 X-QQ-mid: xmsmtpt1612698374tekrkuybr Message-ID: X-QQ-XMAILINFO: NAQCntfS4znsxR9dDTpYhJjYcxwQrv31L8HcT0pWY8m8ObSgcZ0vmCpZgg1FDj 2ndGgUoDS9VE26yFMYMPYcY3t2dJvA5H+O9VFxLUO1nru3G+DtV8aSjmjN31L/TUFjCf4Y0pW2ks MWgLH+gGCOiXOd3z/9JszYImDR6/PbyBx3ipz1dLfhoCqtJYDGnKE2/F8ZeaRlsu0+FVh81u/KZ6 ho22bIqHGvx+Gc0F1GKtxbCkn6qOiLqciSB0fFDpwl7bA3RrkC7sOkxiSvngd1JhPZ38+Zim6Mfe wJ7lyj0uCLW1ulDhZ5S1Q4SAWiSQM0Fifi4k3S22RAD0QSJP92L6jI/nIX7oFVrdmX34MqVMCxSz joQuingVkvqfVvako6svwuASmeDtBieQ2h7tDkXHU30E03arpNBHEJF21Y6vNOL+CQyLXR1fE4bc CSbA8KlGoz7EkmS//RdaPTxw7jd88xHlJBm+Zcoh5M02U22B0cPbqKgtl1XIWFQGZO4v9kpZ3EIq 8Br0Xe63PHu19OF1cxto+5ENZuKPDHegvn8betfrUkTcpDzW5Sj+OqqzCoonvUiyqZWQwPGlFaHw d7YzFxdRj/XFjqZMuS4qEHTTAC8uLex9iL19p5azQ04+xaHtp4ibSFCpVz91F3XiYGAIXbHDAIca ZlSXgRgXPjASZ87WeWQAxx3pT3tyFCLLju1l+Ar2GsNitJj9U1Hub7oVFDTmdx//Jeza0CUazpSY 7k2ohiASfAlbShiJlCETHlF/vkCGut2XEMrNwySJkrYb7mNajefR3keC8/DHOFcvpbxUP5k8k2pv UXnZvfy/dGgkbLV1/B6Azb From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Feb 2021 19:46:11 +0800 X-OQ-MSGID: <20210207114612.38865-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/libsrt: add LIBSRT_SETSOCKOPT/GETSOCKOPT helper 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" To avoid duplicate between optname and optnamestr. --- libavformat/libsrt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index f73e7dbfa5..557ab9e6e3 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -272,6 +272,9 @@ static int libsrt_setsockopt(URLContext *h, int fd, SRT_SOCKOPT optname, const c return 0; } +#define LIBSRT_SETSOCKOPT(h, fd, optname, optval, optlen) \ + libsrt_setsockopt((h), (fd), (optname), AV_TOSTRING(optname), (optval), (optlen)) + static int libsrt_getsockopt(URLContext *h, int fd, SRT_SOCKOPT optname, const char * optnamestr, void * optval, int * optlen) { if (srt_getsockopt(fd, 0, optname, optval, optlen) < 0) { @@ -281,6 +284,9 @@ static int libsrt_getsockopt(URLContext *h, int fd, SRT_SOCKOPT optname, const c return 0; } +#define LIBSRT_GETSOCKOPT(h, fd, optname, optval, optlen) \ + libsrt_getsockopt((h), (fd), (optname), AV_TOSTRING(optname), (optval), (optlen)) + /* - The "POST" options can be altered any time on a connected socket. They MAY have also some meaning when set prior to connecting; such option is SRTO_RCVSYN, which makes connect/accept call asynchronous. From patchwork Sun Feb 7 11:46:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 25478 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 C61B844B0DA for ; Sun, 7 Feb 2021 13:46:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A94B8689D16; Sun, 7 Feb 2021 13:46:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-209.mail.qq.com [203.205.221.209]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1328687FDA for ; Sun, 7 Feb 2021 13:46:24 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1612698378; bh=K7qTrsetepVuOIhGGWFqzqwSMLF7fryNKlVxwUCYOas=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YOaw51fVcFQIpD26csyPeA4F/N3RO5GDIdMinPWXUy5T92RM5ySocV0Va/fHJiT1L zfq0rqQpHAn8elOX0ipYbmIXX0va5/S5Y+ufFNhHF+yoygQcnZRfg1InL5BLtjETze UuIODO0X3JMtC9qHhZbp5Si18dumtEThpvTKVbqI= Received: from ZHILIZHAO-MB2.tencent.com ([59.37.125.48]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id B8E2C6F9; Sun, 07 Feb 2021 19:46:14 +0800 X-QQ-mid: xmsmtpt1612698375tl7uju1fg Message-ID: X-QQ-XMAILINFO: MB+SFuOmSM045CbUyBBfbzD0d1yhGXrhBe3ChANDSy9+lbDe4GbItCvnCZCIJt vFEAgjA3RH0YBz3EjxKcYkHU5qfSVbcT4ZiYF5h4wVdce2PxNkwMVrsz9daTS4pw5me6xJfb6ADV woNs892L4pVMx1tDupcj0F5f2pzvlQN1ZRNK9mqkUp6sgbQOvOW+0c4AbKo4Q9EzWCPYFKnsv+mt 5gP0xgVKzWHxJa2k8HqydoeswawvKsl3E2yNj5nLWMzyJHji3Q64dTEOErqMPhDgCVNdSBwMEaFI 8cJquYk/4bnhUWRIBFOLW7Yr8vkoMsEueqa4MMffacBBvnz+4K6jIxJpikRWsgu3ktyxUXxvF2xl g9UTrQzJx+PJ4c5Hn/XRf4SC/8FDeoCUKySpGHOTJMuOrWwPqhFlyXQ/yMx82XahMIY0CVR9LT7g 3zwwEZcNL7RBzwU0jz+nqSNluNPCmXGijXJdpKCgTvmzHwessJ+R5tvkH2NGP888lMLDygAHKWyL vO99i3Fdag8Ur3WRbyJ6A69rSQls5yTT9zodwWxNMKfvCXIuJUkUBtennp5OHkSKLZ/EHOguNfjm cITirYbtoDkmnyy5nRfAjHQk30g9T62pVJBhJSjZUdnpZi/9pgFo3Ez2q0XPU7Q7RWwbXAhwnSVT egJvJwIQGVYxSkBsAsTB5lqhb4LhibYQ+IV6aNDDmViqf8CZF60LuqVahzcSEjreficYnI6sZN1Q YNVXAZ64/dtsGIOOOIxPDLWjPDZGPpme9DomCkZRBuZOrb2mZY2xoFWO9KYZ9hoPJ0sDeTUtdePN cETXtp8FpRBIGbAGd5Z9WqylFuOMYtusdtkDRkIIMeHXy4OWZKVc1C From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Feb 2021 19:46:12 +0800 X-OQ-MSGID: <20210207114612.38865-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210207114612.38865-1-quinkblack@foxmail.com> References: <20210207114612.38865-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/libsrt: use LIBSRT_SETSOCKOPT/GETSOCKOPT helper to reduce duplication 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/libsrt.c | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 557ab9e6e3..d3c661d9d8 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -295,8 +295,8 @@ static int libsrt_set_options_post(URLContext *h, int fd) { SRTContext *s = h->priv_data; - if ((s->inputbw >= 0 && libsrt_setsockopt(h, fd, SRTO_INPUTBW, "SRTO_INPUTBW", &s->inputbw, sizeof(s->inputbw)) < 0) || - (s->oheadbw >= 0 && libsrt_setsockopt(h, fd, SRTO_OHEADBW, "SRTO_OHEADBW", &s->oheadbw, sizeof(s->oheadbw)) < 0)) { + if ((s->inputbw >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_INPUTBW, &s->inputbw, sizeof(s->inputbw)) < 0) || + (s->oheadbw >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_OHEADBW, &s->oheadbw, sizeof(s->oheadbw)) < 0)) { return AVERROR(EIO); } return 0; @@ -314,44 +314,44 @@ static int libsrt_set_options_pre(URLContext *h, int fd) int peerlatency = s->peerlatency / 1000; int connect_timeout = s->connect_timeout; - if ((s->mode == SRT_MODE_RENDEZVOUS && libsrt_setsockopt(h, fd, SRTO_RENDEZVOUS, "SRTO_RENDEZVOUS", &yes, sizeof(yes)) < 0) || - (s->transtype != SRTT_INVALID && libsrt_setsockopt(h, fd, SRTO_TRANSTYPE, "SRTO_TRANSTYPE", &s->transtype, sizeof(s->transtype)) < 0) || - (s->maxbw >= 0 && libsrt_setsockopt(h, fd, SRTO_MAXBW, "SRTO_MAXBW", &s->maxbw, sizeof(s->maxbw)) < 0) || - (s->pbkeylen >= 0 && libsrt_setsockopt(h, fd, SRTO_PBKEYLEN, "SRTO_PBKEYLEN", &s->pbkeylen, sizeof(s->pbkeylen)) < 0) || - (s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE, "SRTO_PASSPHRASE", s->passphrase, strlen(s->passphrase)) < 0) || + if ((s->mode == SRT_MODE_RENDEZVOUS && LIBSRT_SETSOCKOPT(h, fd, SRTO_RENDEZVOUS, &yes, sizeof(yes)) < 0) || + (s->transtype != SRTT_INVALID && LIBSRT_SETSOCKOPT(h, fd, SRTO_TRANSTYPE, &s->transtype, sizeof(s->transtype)) < 0) || + (s->maxbw >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_MAXBW, &s->maxbw, sizeof(s->maxbw)) < 0) || + (s->pbkeylen >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_PBKEYLEN, &s->pbkeylen, sizeof(s->pbkeylen)) < 0) || + (s->passphrase && LIBSRT_SETSOCKOPT(h, fd, SRTO_PASSPHRASE, s->passphrase, strlen(s->passphrase)) < 0) || #if SRT_VERSION_VALUE >= 0x010302 #if SRT_VERSION_VALUE >= 0x010401 - (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_ENFORCEDENCRYPTION, "SRTO_ENFORCEDENCRYPTION", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) || + (s->enforced_encryption >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_ENFORCEDENCRYPTION, &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) || #else /* SRTO_STRICTENC == SRTO_ENFORCEDENCRYPTION (53), but for compatibility, we used SRTO_STRICTENC */ - (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_STRICTENC, "SRTO_STRICTENC", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) || + (s->enforced_encryption >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_STRICTENC, &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) || #endif - (s->kmrefreshrate >= 0 && libsrt_setsockopt(h, fd, SRTO_KMREFRESHRATE, "SRTO_KMREFRESHRATE", &s->kmrefreshrate, sizeof(s->kmrefreshrate)) < 0) || - (s->kmpreannounce >= 0 && libsrt_setsockopt(h, fd, SRTO_KMPREANNOUNCE, "SRTO_KMPREANNOUNCE", &s->kmpreannounce, sizeof(s->kmpreannounce)) < 0) || + (s->kmrefreshrate >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_KMREFRESHRATE, &s->kmrefreshrate, sizeof(s->kmrefreshrate)) < 0) || + (s->kmpreannounce >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_KMPREANNOUNCE, &s->kmpreannounce, sizeof(s->kmpreannounce)) < 0) || #endif - (s->mss >= 0 && libsrt_setsockopt(h, fd, SRTO_MSS, "SRTO_MSS", &s->mss, sizeof(s->mss)) < 0) || - (s->ffs >= 0 && libsrt_setsockopt(h, fd, SRTO_FC, "SRTO_FC", &s->ffs, sizeof(s->ffs)) < 0) || - (s->ipttl >= 0 && libsrt_setsockopt(h, fd, SRTO_IPTTL, "SRTO_IPTTL", &s->ipttl, sizeof(s->ipttl)) < 0) || - (s->iptos >= 0 && libsrt_setsockopt(h, fd, SRTO_IPTOS, "SRTO_IPTOS", &s->iptos, sizeof(s->iptos)) < 0) || - (s->latency >= 0 && libsrt_setsockopt(h, fd, SRTO_LATENCY, "SRTO_LATENCY", &latency, sizeof(latency)) < 0) || - (s->rcvlatency >= 0 && libsrt_setsockopt(h, fd, SRTO_RCVLATENCY, "SRTO_RCVLATENCY", &rcvlatency, sizeof(rcvlatency)) < 0) || - (s->peerlatency >= 0 && libsrt_setsockopt(h, fd, SRTO_PEERLATENCY, "SRTO_PEERLATENCY", &peerlatency, sizeof(peerlatency)) < 0) || - (s->tlpktdrop >= 0 && libsrt_setsockopt(h, fd, SRTO_TLPKTDROP, "SRTO_TLPKDROP", &s->tlpktdrop, sizeof(s->tlpktdrop)) < 0) || - (s->nakreport >= 0 && libsrt_setsockopt(h, fd, SRTO_NAKREPORT, "SRTO_NAKREPORT", &s->nakreport, sizeof(s->nakreport)) < 0) || - (connect_timeout >= 0 && libsrt_setsockopt(h, fd, SRTO_CONNTIMEO, "SRTO_CONNTIMEO", &connect_timeout, sizeof(connect_timeout)) <0 ) || - (s->sndbuf >= 0 && libsrt_setsockopt(h, fd, SRTO_SNDBUF, "SRTO_SNDBUF", &s->sndbuf, sizeof(s->sndbuf)) < 0) || - (s->rcvbuf >= 0 && libsrt_setsockopt(h, fd, SRTO_RCVBUF, "SRTO_RCVBUF", &s->rcvbuf, sizeof(s->rcvbuf)) < 0) || - (s->lossmaxttl >= 0 && libsrt_setsockopt(h, fd, SRTO_LOSSMAXTTL, "SRTO_LOSSMAXTTL", &s->lossmaxttl, sizeof(s->lossmaxttl)) < 0) || - (s->minversion >= 0 && libsrt_setsockopt(h, fd, SRTO_MINVERSION, "SRTO_MINVERSION", &s->minversion, sizeof(s->minversion)) < 0) || - (s->streamid && libsrt_setsockopt(h, fd, SRTO_STREAMID, "SRTO_STREAMID", s->streamid, strlen(s->streamid)) < 0) || + (s->mss >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_MSS, &s->mss, sizeof(s->mss)) < 0) || + (s->ffs >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_FC, &s->ffs, sizeof(s->ffs)) < 0) || + (s->ipttl >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_IPTTL, &s->ipttl, sizeof(s->ipttl)) < 0) || + (s->iptos >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_IPTOS, &s->iptos, sizeof(s->iptos)) < 0) || + (s->latency >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_LATENCY, &latency, sizeof(latency)) < 0) || + (s->rcvlatency >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_RCVLATENCY, &rcvlatency, sizeof(rcvlatency)) < 0) || + (s->peerlatency >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_PEERLATENCY, &peerlatency, sizeof(peerlatency)) < 0) || + (s->tlpktdrop >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_TLPKTDROP, &s->tlpktdrop, sizeof(s->tlpktdrop)) < 0) || + (s->nakreport >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_NAKREPORT, &s->nakreport, sizeof(s->nakreport)) < 0) || + (connect_timeout >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_CONNTIMEO, &connect_timeout, sizeof(connect_timeout)) <0 ) || + (s->sndbuf >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_SNDBUF, &s->sndbuf, sizeof(s->sndbuf)) < 0) || + (s->rcvbuf >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_RCVBUF, &s->rcvbuf, sizeof(s->rcvbuf)) < 0) || + (s->lossmaxttl >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_LOSSMAXTTL, &s->lossmaxttl, sizeof(s->lossmaxttl)) < 0) || + (s->minversion >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_MINVERSION, &s->minversion, sizeof(s->minversion)) < 0) || + (s->streamid && LIBSRT_SETSOCKOPT(h, fd, SRTO_STREAMID, s->streamid, strlen(s->streamid)) < 0) || #if SRT_VERSION_VALUE >= 0x010401 - (s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION, "SRTO_CONGESTION", s->smoother, strlen(s->smoother)) < 0) || + (s->smoother && LIBSRT_SETSOCKOPT(h, fd, SRTO_CONGESTION, s->smoother, strlen(s->smoother)) < 0) || #else - (s->smoother && libsrt_setsockopt(h, fd, SRTO_SMOOTHER, "SRTO_SMOOTHER", s->smoother, strlen(s->smoother)) < 0) || + (s->smoother && LIBSRT_SETSOCKOPT(h, fd, SRTO_SMOOTHER, s->smoother, strlen(s->smoother)) < 0) || #endif - (s->messageapi >= 0 && libsrt_setsockopt(h, fd, SRTO_MESSAGEAPI, "SRTO_MESSAGEAPI", &s->messageapi, sizeof(s->messageapi)) < 0) || - (s->payload_size >= 0 && libsrt_setsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size, sizeof(s->payload_size)) < 0) || - ((h->flags & AVIO_FLAG_WRITE) && libsrt_setsockopt(h, fd, SRTO_SENDER, "SRTO_SENDER", &yes, sizeof(yes)) < 0)) { + (s->messageapi >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_MESSAGEAPI, &s->messageapi, sizeof(s->messageapi)) < 0) || + (s->payload_size >= 0 && LIBSRT_SETSOCKOPT(h, fd, SRTO_PAYLOADSIZE, &s->payload_size, sizeof(s->payload_size)) < 0) || + ((h->flags & AVIO_FLAG_WRITE) && LIBSRT_SETSOCKOPT(h, fd, SRTO_SENDER, &yes, sizeof(yes)) < 0)) { return AVERROR(EIO); } @@ -359,7 +359,7 @@ static int libsrt_set_options_pre(URLContext *h, int fd) struct linger lin; lin.l_linger = s->linger; lin.l_onoff = lin.l_linger > 0 ? 1 : 0; - if (libsrt_setsockopt(h, fd, SRTO_LINGER, "SRTO_LINGER", &lin, sizeof(lin)) < 0) + if (LIBSRT_SETSOCKOPT(h, fd, SRTO_LINGER, &lin, sizeof(lin)) < 0) return AVERROR(EIO); } return 0; @@ -470,7 +470,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) if (flags & AVIO_FLAG_WRITE) { int packet_size = 0; int optlen = sizeof(packet_size); - ret = libsrt_getsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &packet_size, &optlen); + ret = LIBSRT_GETSOCKOPT(h, fd, SRTO_PAYLOADSIZE, &packet_size, &optlen); if (ret < 0) goto fail1; if (packet_size > 0)