[vlc-devel] [PATCH] Restore compatibility with recent SRT library

[Alexandre Janniaux]

Hi,

LGTM, will merge this!

I've changed the commit message to better match what you added
in following reviews, if that's ok with you:

```
    srt: fix build issue with recent SRT library

    The deprecated macro `SRTO_TSBPDDELAY` has been deleted from SRT.
    This prevents the compilation with SRT versions >= v1.4.2.

    See the corresponding SRT commit 0e2201aff6b379979cec43fee5e8f162717f6346.
    ```
    -   SRTO_TSBPDDELAY = 23,     // DEPRECATED. ALIAS: SRTO_LATENCY
    ```

    The (unrecommended) `SRTO_LATENCY` should be used instead, which was
    already available back then. See notice next to SRTO_LATENCY in the SRT
    library source code for details on why it's not recommended.
```

Regards,
--
Alexandre Janniaux
Videolabs

On Tue, Oct 13, 2020 at 09:45:15PM +0200, Julien Montant wrote:
> The macro `SRTO_TSBPDDELAY` has been deleted from SRT.
> This prevents the compilation with SRT versions >= v1.4.2.
> The (unrecommended) `SRTO_LATENCY` should be used instead.
> See the corresponding SRT commit 0e2201aff6b379979cec43fee5e8f162717f6346.
>
> NOTE: I was not able to find the SRT version officially supported by VLC
> on the [contrib status wiki](https://wiki.videolan.org/Contrib_Status/).
> The entry should probably be added.
> ---
>  modules/access/srt.c        | 2 +-
>  modules/access_output/srt.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/modules/access/srt.c b/modules/access/srt.c
> index 499a300196..d7ef51fccf 100644
> --- a/modules/access/srt.c
> +++ b/modules/access/srt.c
> @@ -164,7 +164,7 @@ static bool srt_schedule_reconnect(stream_t *p_stream)
>
>      /* Set latency */
>      srt_set_socket_option( strm_obj, SRT_PARAM_LATENCY, p_sys->sock,
> -            SRTO_TSBPDDELAY, &i_latency, sizeof(i_latency) );
> +            SRTO_LATENCY, &i_latency, sizeof(i_latency) );
>
>      /* set passphrase */
>      if (psz_passphrase != NULL && psz_passphrase[0] != '\0') {
> diff --git a/modules/access_output/srt.c b/modules/access_output/srt.c
> index 0b66f24a8a..3d579eb1bd 100644
> --- a/modules/access_output/srt.c
> +++ b/modules/access_output/srt.c
> @@ -155,7 +155,7 @@ static bool srt_schedule_reconnect(sout_access_out_t *p_access)
>
>      /* Set latency */
>      srt_set_socket_option( access_obj, SRT_PARAM_LATENCY, p_sys->sock,
> -            SRTO_TSBPDDELAY, &i_latency, sizeof(i_latency) );
> +            SRTO_LATENCY, &i_latency, sizeof(i_latency) );
>
>      /* set passphrase */
>      if (psz_passphrase != NULL && psz_passphrase[0] != '\0') {
> --
> 2.28.0
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel