diff mbox series

[FFmpeg-devel,v2,1/9] avformat/libsrt: fix timeout unit confusion between milisec and microsec

Message ID 20200217003653.20027-1-cus@passwd.hu
State Accepted
Headers show
Series [FFmpeg-devel,v2,1/9] avformat/libsrt: fix timeout unit confusion between milisec and microsec | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Marton Balint Feb. 17, 2020, 12:36 a.m. UTC 
Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavformat/libsrt.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Marton Balint Feb. 22, 2020, 6:23 p.m. UTC | #1 
On Mon, 17 Feb 2020, Marton Balint wrote:

> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> libavformat/libsrt.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)

Ping for the series, will apply soon.

Regards,
Marton

>
> diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
> index d7faa603f5..1d748f0e81 100644
> --- a/libavformat/libsrt.c
> +++ b/libavformat/libsrt.c
> @@ -210,7 +210,7 @@ static int libsrt_network_wait_fd_timeout(URLContext *h, int eid, int fd, int wr
>     }
> }
> 
> -static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t addrlen, URLContext *h, int timeout)
> +static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t addrlen, URLContext *h, int64_t timeout)
> {
>     int ret;
>     int reuse = 1;
> @@ -243,7 +243,7 @@ static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t
>     return ret;
> }
> 
> -static int libsrt_listen_connect(int eid, int fd, const struct sockaddr *addr, socklen_t addrlen, int timeout, URLContext *h, int will_try_next)
> +static int libsrt_listen_connect(int eid, int fd, const struct sockaddr *addr, socklen_t addrlen, int64_t timeout, URLContext *h, int will_try_next)
> {
>     int ret;
> 
> @@ -447,7 +447,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags)
>     }
>     if (s->mode == SRT_MODE_LISTENER) {
>         // multi-client
> -        if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, open_timeout / 1000)) < 0)
> +        if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, open_timeout)) < 0)
>             goto fail1;
>         fd = ret;
>     } else {
> @@ -458,7 +458,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags)
>         }
>
>         if ((ret = libsrt_listen_connect(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
> -                                          open_timeout / 1000, h, !!cur_ai->ai_next)) < 0) {
> +                                          open_timeout, h, !!cur_ai->ai_next)) < 0) {
>             if (ret == AVERROR_EXIT)
>                 goto fail1;
>             else
> -- 
> 2.16.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-request@ffmpeg.org with subject "unsubscribe".
Marton Balint Feb. 23, 2020, 11:16 p.m. UTC | #2 
On Sat, 22 Feb 2020, Marton Balint wrote:

>
>
> On Mon, 17 Feb 2020, Marton Balint wrote:
>
>> Signed-off-by: Marton Balint <cus@passwd.hu>
>> ---
>> libavformat/libsrt.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Ping for the series, will apply soon.

Applied the series.

Regards,
Marton

>
> Regards,
> Marton
>
>>
>> diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
>> index d7faa603f5..1d748f0e81 100644
>> --- a/libavformat/libsrt.c
>> +++ b/libavformat/libsrt.c
>> @@ -210,7 +210,7 @@ static int libsrt_network_wait_fd_timeout(URLContext 
> *h, int eid, int fd, int wr
>>     }
>> }
>> 
>> -static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, 
> socklen_t addrlen, URLContext *h, int timeout)
>> +static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, 
> socklen_t addrlen, URLContext *h, int64_t timeout)
>> {
>>     int ret;
>>     int reuse = 1;
>> @@ -243,7 +243,7 @@ static int libsrt_listen(int eid, int fd, const struct 
> sockaddr *addr, socklen_t
>>     return ret;
>> }
>> 
>> -static int libsrt_listen_connect(int eid, int fd, const struct sockaddr 
> *addr, socklen_t addrlen, int timeout, URLContext *h, int will_try_next)
>> +static int libsrt_listen_connect(int eid, int fd, const struct sockaddr 
> *addr, socklen_t addrlen, int64_t timeout, URLContext *h, int will_try_next)
>> {
>>     int ret;
>> 
>> @@ -447,7 +447,7 @@ static int libsrt_setup(URLContext *h, const char *uri, 
> int flags)
>>     }
>>     if (s->mode == SRT_MODE_LISTENER) {
>>         // multi-client
>> -        if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, 
> cur_ai->ai_addrlen, h, open_timeout / 1000)) < 0)
>> +        if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, 
> cur_ai->ai_addrlen, h, open_timeout)) < 0)
>>             goto fail1;
>>         fd = ret;
>>     } else {
>> @@ -458,7 +458,7 @@ static int libsrt_setup(URLContext *h, const char *uri, 
> int flags)
>>         }
>>
>>         if ((ret = libsrt_listen_connect(s->eid, fd, cur_ai->ai_addr, 
> cur_ai->ai_addrlen,
>> -                                          open_timeout / 1000, h, 
> !!cur_ai->ai_next)) < 0) {
>> +                                          open_timeout, h, 
> !!cur_ai->ai_next)) < 0) {
>>             if (ret == AVERROR_EXIT)
>>                 goto fail1;
>>             else
>> -- 
>> 2.16.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-request@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-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
index d7faa603f5..1d748f0e81 100644
--- a/libavformat/libsrt.c
+++ b/libavformat/libsrt.c
@@ -210,7 +210,7 @@  static int libsrt_network_wait_fd_timeout(URLContext *h, int eid, int fd, int wr
     }
 }
 
-static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t addrlen, URLContext *h, int timeout)
+static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t addrlen, URLContext *h, int64_t timeout)
 {
     int ret;
     int reuse = 1;
@@ -243,7 +243,7 @@  static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t
     return ret;
 }
 
-static int libsrt_listen_connect(int eid, int fd, const struct sockaddr *addr, socklen_t addrlen, int timeout, URLContext *h, int will_try_next)
+static int libsrt_listen_connect(int eid, int fd, const struct sockaddr *addr, socklen_t addrlen, int64_t timeout, URLContext *h, int will_try_next)
 {
     int ret;
 
@@ -447,7 +447,7 @@  static int libsrt_setup(URLContext *h, const char *uri, int flags)
     }
     if (s->mode == SRT_MODE_LISTENER) {
         // multi-client
-        if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, open_timeout / 1000)) < 0)
+        if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, open_timeout)) < 0)
             goto fail1;
         fd = ret;
     } else {
@@ -458,7 +458,7 @@  static int libsrt_setup(URLContext *h, const char *uri, int flags)
         }
 
         if ((ret = libsrt_listen_connect(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
-                                          open_timeout / 1000, h, !!cur_ai->ai_next)) < 0) {
+                                          open_timeout, h, !!cur_ai->ai_next)) < 0) {
             if (ret == AVERROR_EXIT)
                 goto fail1;
             else