Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Mon, Sep 21, 2020 at 1:27 AM Gyan Doshi wrote: > > > > On 17-09-2020 01:07 pm, Gyan Doshi wrote: > > > > > > On 15-09-2020 12:47 pm, myp...@gmail.com wrote: > >> On Tue, Sep 15, 2020 at 2:23 PM Gyan Doshi wrote: > >>> This should be backported to 4.3 and other releases whose builds fail. > >>> > >>> Gyan > >> Will backporting, thx > > > > Ping. > > > > 4.3.1 build with libsrt remains broken. > > I'll test and apply this myself, I guess. > Done, thx ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Mon, Sep 21, 2020 at 1:27 AM Gyan Doshi wrote: > > > > On 17-09-2020 01:07 pm, Gyan Doshi wrote: > > > > > > On 15-09-2020 12:47 pm, myp...@gmail.com wrote: > >> On Tue, Sep 15, 2020 at 2:23 PM Gyan Doshi wrote: > >>> This should be backported to 4.3 and other releases whose builds fail. > >>> > >>> Gyan > >> Will backporting, thx > > > > Ping. > > > > 4.3.1 build with libsrt remains broken. > > I'll test and apply this myself, I guess. > Busy with other urgent things last week， sorry， will test /back porting then push to 4.3.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-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On 17-09-2020 01:07 pm, Gyan Doshi wrote: On 15-09-2020 12:47 pm, myp...@gmail.com wrote: On Tue, Sep 15, 2020 at 2:23 PM Gyan Doshi wrote: This should be backported to 4.3 and other releases whose builds fail. Gyan Will backporting, thx Ping. 4.3.1 build with libsrt remains broken. I'll test and apply this myself, I guess. Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On 15-09-2020 12:47 pm, myp...@gmail.com wrote: On Tue, Sep 15, 2020 at 2:23 PM Gyan Doshi wrote: This should be backported to 4.3 and other releases whose builds fail. Gyan Will backporting, thx Ping. 4.3.1 build with libsrt remains broken. Thanks, Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Tue, Sep 15, 2020 at 2:23 PM Gyan Doshi wrote: > > This should be backported to 4.3 and other releases whose builds fail. > > Gyan Will backporting, thx ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
This should be backported to 4.3 and other releases whose builds fail.
Gyan
On 12-07-2020 11:33 am, Jun Zhao wrote:
From: Jun Zhao
libsrt 1.4.1 changed the:
SRTO_SMOOTHER -> SRTO_CONGESTION
SRTO_STRICTENC -> SRTO_ENFORCEDENCRYPTION
SRTO_TSBPDDELAY -> SRTO_LATENCY
and removed the front of deprecated option, it's lead to build fail
fix #8760
Signed-off-by: Jun Zhao
---
libavformat/libsrt.c | 8
1 file changed, 8 insertions(+)
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
index 4de575b..4719ce0 100644
--- a/libavformat/libsrt.c
+++ b/libavformat/libsrt.c
@@ -313,8 +313,12 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
(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 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) ||
+#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) ||
+#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) ||
#endif
@@ -333,7 +337,11 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
(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) ||
+#if SRT_VERSION_VALUE >= 0x010401
+(s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION, "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) ||
+#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)) {
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Mon, Jul 27, 2020 at 7:37 PM myp...@gmail.com wrote: > > On Sat, Jul 18, 2020 at 8:31 PM myp...@gmail.com wrote: > > > > On Thu, Jul 16, 2020 at 9:35 AM myp...@gmail.com wrote: > > > > > > On Tue, Jul 14, 2020 at 9:47 PM Moritz Barsnick wrote: > > > > > > > > On Sun, Jul 12, 2020 at 22:44:46 +0800, myp...@gmail.com wrote: > > > > > Maybe I give an inaccurate description in the commit message, in fact, > > > > > libsrt 1.4.1 remove the SRTO_STRICTENC/SRTO_SMOOTHER option, it's will > > > > > lead to FFmpeg build fail when using libsrt version >= 1.4.1 > > > > > > > > I don't mind you description. Yet your code change references 1.4.1: > > > > SRT_VERSION_VALUE >= 0x010401 > > > > while I am trying to make the point that 1.4.0 also needs this change > > > > (or 1.3.0 in one case, which is already ensured by #if). > > > > > > > > > > After double-check, I think the patch is Ok, in fact, libsrt keeps the > > > deprecated SRTO_STRICTENC/SRTO_SMOOTHER options in srt.h (inclued the > > > options in libsrt 1.3.3/1.3.4/1.4.0) until commit > > > 0e2201aff6b379979cec43fee5e8f162717f6346 , so FFmpeg build with libsrt > > > 1.3.3/1.3.4/1.4.0 is OK with the patch. > > Ping > I'll apply it tomorrow if don't object, thx Pushed, thx ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Sat, Jul 18, 2020 at 8:31 PM myp...@gmail.com wrote: > > On Thu, Jul 16, 2020 at 9:35 AM myp...@gmail.com wrote: > > > > On Tue, Jul 14, 2020 at 9:47 PM Moritz Barsnick wrote: > > > > > > On Sun, Jul 12, 2020 at 22:44:46 +0800, myp...@gmail.com wrote: > > > > Maybe I give an inaccurate description in the commit message, in fact, > > > > libsrt 1.4.1 remove the SRTO_STRICTENC/SRTO_SMOOTHER option, it's will > > > > lead to FFmpeg build fail when using libsrt version >= 1.4.1 > > > > > > I don't mind you description. Yet your code change references 1.4.1: > > > SRT_VERSION_VALUE >= 0x010401 > > > while I am trying to make the point that 1.4.0 also needs this change > > > (or 1.3.0 in one case, which is already ensured by #if). > > > > > > > After double-check, I think the patch is Ok, in fact, libsrt keeps the > > deprecated SRTO_STRICTENC/SRTO_SMOOTHER options in srt.h (inclued the > > options in libsrt 1.3.3/1.3.4/1.4.0) until commit > > 0e2201aff6b379979cec43fee5e8f162717f6346 , so FFmpeg build with libsrt > > 1.3.3/1.3.4/1.4.0 is OK with the patch. > Ping I'll apply it tomorrow if don't object, thx ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Sat, Jul 18, 2020 at 9:24 AM myp...@gmail.com wrote: > > On Thu, Jul 16, 2020 at 9:35 AM myp...@gmail.com wrote: > > > > On Tue, Jul 14, 2020 at 9:47 PM Moritz Barsnick wrote: > > > > > > On Sun, Jul 12, 2020 at 22:44:46 +0800, myp...@gmail.com wrote: > > > > Maybe I give an inaccurate description in the commit message, in fact, > > > > libsrt 1.4.1 remove the SRTO_STRICTENC/SRTO_SMOOTHER option, it's will > > > > lead to FFmpeg build fail when using libsrt version >= 1.4.1 > > > > > > I don't mind you description. Yet your code change references 1.4.1: > > > SRT_VERSION_VALUE >= 0x010401 > > > while I am trying to make the point that 1.4.0 also needs this change > > > (or 1.3.0 in one case, which is already ensured by #if). > > > > > > > After double-check, I think the patch is Ok, in fact, libsrt keeps the > > deprecated SRTO_STRICTENC/SRTO_SMOOTHER options in srt.h (inclued the > > options in libsrt 1.3.3/1.3.4/1.4.0) until commit > > 0e2201aff6b379979cec43fee5e8f162717f6346 , so FFmpeg build with libsrt > > 1.3.3/1.3.4/1.4.0 is OK with the patch. > Ping > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". Ping ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Thu, Jul 16, 2020 at 9:35 AM myp...@gmail.com wrote: > > On Tue, Jul 14, 2020 at 9:47 PM Moritz Barsnick wrote: > > > > On Sun, Jul 12, 2020 at 22:44:46 +0800, myp...@gmail.com wrote: > > > Maybe I give an inaccurate description in the commit message, in fact, > > > libsrt 1.4.1 remove the SRTO_STRICTENC/SRTO_SMOOTHER option, it's will > > > lead to FFmpeg build fail when using libsrt version >= 1.4.1 > > > > I don't mind you description. Yet your code change references 1.4.1: > > SRT_VERSION_VALUE >= 0x010401 > > while I am trying to make the point that 1.4.0 also needs this change > > (or 1.3.0 in one case, which is already ensured by #if). > > > > After double-check, I think the patch is Ok, in fact, libsrt keeps the > deprecated SRTO_STRICTENC/SRTO_SMOOTHER options in srt.h (inclued the > options in libsrt 1.3.3/1.3.4/1.4.0) until commit > 0e2201aff6b379979cec43fee5e8f162717f6346 , so FFmpeg build with libsrt > 1.3.3/1.3.4/1.4.0 is OK with the patch. Ping ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Tue, Jul 14, 2020 at 9:47 PM Moritz Barsnick wrote: > > On Sun, Jul 12, 2020 at 22:44:46 +0800, myp...@gmail.com wrote: > > Maybe I give an inaccurate description in the commit message, in fact, > > libsrt 1.4.1 remove the SRTO_STRICTENC/SRTO_SMOOTHER option, it's will > > lead to FFmpeg build fail when using libsrt version >= 1.4.1 > > I don't mind you description. Yet your code change references 1.4.1: > SRT_VERSION_VALUE >= 0x010401 > while I am trying to make the point that 1.4.0 also needs this change > (or 1.3.0 in one case, which is already ensured by #if). > After double-check, I think the patch is Ok, in fact, libsrt keeps the deprecated SRTO_STRICTENC/SRTO_SMOOTHER options in srt.h (inclued the options in libsrt 1.3.3/1.3.4/1.4.0) until commit 0e2201aff6b379979cec43fee5e8f162717f6346 , so FFmpeg build with libsrt 1.3.3/1.3.4/1.4.0 is OK with the patch. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Tue, Jul 14, 2020 at 9:47 PM Moritz Barsnick wrote: > > On Sun, Jul 12, 2020 at 22:44:46 +0800, myp...@gmail.com wrote: > > Maybe I give an inaccurate description in the commit message, in fact, > > libsrt 1.4.1 remove the SRTO_STRICTENC/SRTO_SMOOTHER option, it's will > > lead to FFmpeg build fail when using libsrt version >= 1.4.1 > > I don't mind you description. Yet your code change references 1.4.1: > SRT_VERSION_VALUE >= 0x010401 Will double-check the SRT_VERSION_VALUE, thx > while I am trying to make the point that 1.4.0 also needs this change > (or 1.3.0 in one case, which is already ensured by #if). > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Sun, Jul 12, 2020 at 22:44:46 +0800, myp...@gmail.com wrote: > Maybe I give an inaccurate description in the commit message, in fact, > libsrt 1.4.1 remove the SRTO_STRICTENC/SRTO_SMOOTHER option, it's will > lead to FFmpeg build fail when using libsrt version >= 1.4.1 I don't mind you description. Yet your code change references 1.4.1: SRT_VERSION_VALUE >= 0x010401 while I am trying to make the point that 1.4.0 also needs this change (or 1.3.0 in one case, which is already ensured by #if). Moritz ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Sun, Jul 12, 2020 at 8:39 PM Moritz Barsnick wrote: > > On Sun, Jul 12, 2020 at 14:03:03 +0800, Jun Zhao wrote: > > From: Jun Zhao > > (Which thread are you replying to?) > > > libsrt 1.4.1 changed the: > > SRTO_SMOOTHER -> SRTO_CONGESTION > > AFAICT, this was changed in 1.3.3 (even though the commit doesn't > change the doc/API.md where it states 1.3.0): > https://github.com/Haivision/srt/commit/6f6b76b381ba8854fcd699908f74fae4cfce6783 > > > SRTO_STRICTENC -> SRTO_ENFORCEDENCRYPTION > > This was changed in 1.4.0. Does this codec compile with 1.4.0 after your > fix? Did it ever? > https://github.com/Haivision/srt/commit/a82e0c34b0aadcb309d9e2f322b26f8f59bf827a > > > SRTO_TSBPDDELAY -> SRTO_LATENCY > > You didn't change any code regarding these two, and anyway, > SRTO_LATENCY has existed as an alias since 1.2.0: > https://github.com/Haivision/srt/commit/508eeeb8dec6bcee123fa0d1d7f7fe3b0060eb77 > > Considering that 1.4.0 was released 10 months ago, I wonder whether > anyone compiled against a recent libsrt since then? > > Cheers, > Moritz Maybe I give an inaccurate description in the commit message, in fact, libsrt 1.4.1 remove the SRTO_STRICTENC/SRTO_SMOOTHER option, it's will lead to FFmpeg build fail when using libsrt version >= 1.4.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-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
> Considering that 1.4.0 was released 10 months ago, I wonder whether > anyone compiled against a recent libsrt since then? I can confirm that this fixes compilation errors with the latest master branch of srt https://github.com/Haivision/srt/commit/0e2201aff6b379979cec43fee5e8f162717f6346 and FFmpeg https://github.com/FFmpeg/FFmpeg/commit/3205ed31a7756ae563301e2f5a5dd2c853b20349 > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
On Sun, Jul 12, 2020 at 14:03:03 +0800, Jun Zhao wrote: > From: Jun Zhao (Which thread are you replying to?) > libsrt 1.4.1 changed the: > SRTO_SMOOTHER -> SRTO_CONGESTION AFAICT, this was changed in 1.3.3 (even though the commit doesn't change the doc/API.md where it states 1.3.0): https://github.com/Haivision/srt/commit/6f6b76b381ba8854fcd699908f74fae4cfce6783 > SRTO_STRICTENC -> SRTO_ENFORCEDENCRYPTION This was changed in 1.4.0. Does this codec compile with 1.4.0 after your fix? Did it ever? https://github.com/Haivision/srt/commit/a82e0c34b0aadcb309d9e2f322b26f8f59bf827a > SRTO_TSBPDDELAY -> SRTO_LATENCY You didn't change any code regarding these two, and anyway, SRTO_LATENCY has existed as an alias since 1.2.0: https://github.com/Haivision/srt/commit/508eeeb8dec6bcee123fa0d1d7f7fe3b0060eb77 Considering that 1.4.0 was released 10 months ago, I wonder whether anyone compiled against a recent libsrt since then? Cheers, Moritz ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
From: Jun Zhao
libsrt 1.4.1 changed the:
SRTO_SMOOTHER -> SRTO_CONGESTION
SRTO_STRICTENC -> SRTO_ENFORCEDENCRYPTION
SRTO_TSBPDDELAY -> SRTO_LATENCY
and removed the front of deprecated option, it's lead to build fail
fix #8760
Signed-off-by: Jun Zhao
---
libavformat/libsrt.c | 8
1 file changed, 8 insertions(+)
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
index 4de575b..4719ce0 100644
--- a/libavformat/libsrt.c
+++ b/libavformat/libsrt.c
@@ -313,8 +313,12 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
(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 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) ||
+#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) ||
+#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) ||
#endif
@@ -333,7 +337,11 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
(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) ||
+#if SRT_VERSION_VALUE >= 0x010401
+(s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION,
"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) ||
+#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)) {
--
2.7.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
