diff mbox series

[FFmpeg-devel] avformat/aviobuf: let avio_read can retry when timeout

Message ID ME3PR01MB56242404224967469DF55396DA549@ME3PR01MB5624.ausprd01.prod.outlook.com
State New
Headers show
Series [FFmpeg-devel] avformat/aviobuf: let avio_read can retry when timeout
Related show

Checks

Context Check Description
andriy/configurex86 warning Failed to apply patch
andriy/configureppc warning Failed to apply patch
andriy/configureaarch64_jetson warning Failed to apply patch

Commit Message

Wang Chuan Jan. 14, 2022, 2:42 a.m. UTC
If we meet timeout when reading network resource, avio_read will set
[eof_reached] to 1. And this prevent caller to retry since avio_read
do nothing and just return if eof_reached == 1.

Signed-off-by: Wang Chuan <ouchuanm@outlook.com>
---
  libavformat/aviobuf.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

Comments

zhilizhao(赵志立) Jan. 14, 2022, 3:21 a.m. UTC | #1
> On Jan 14, 2022, at 10:42 AM, Wang Chuan <ouchuanm@outlook.com> wrote:
> 
> If we meet timeout when reading network resource, avio_read will set
> [eof_reached] to 1. And this prevent caller to retry since avio_read
> do nothing and just return if eof_reached == 1.

If timeout was triggered by a small ‘timeout’ setting from user, just
change the ‘timeout' configuration. If it was triggered by a system call,
it’s likely to be in a state of not recoverable. Could you share more
details about the issue this patch trying to solve?

> 
> Signed-off-by: Wang Chuan <ouchuanm@outlook.com>
> ---
> libavformat/aviobuf.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
> index 29d4bd7510..38cb21debf 100644
> --- a/libavformat/aviobuf.c
> +++ b/libavformat/aviobuf.c
> @@ -580,8 +580,9 @@ static void fill_buffer(AVIOContext *s)
>            be done without rereading data */
>         s->eof_reached = 1;
>     } else if (len < 0) {
> -        s->eof_reached = 1;
> -        s->error= len;
> +        s->error = len;
> +        if (s->error != AVERROR(ETIMEDOUT))
> +            s->eof_reached = 1;
>     } else {
>         s->pos += len;
>         s->buf_ptr = dst;
> -- 
> 2.29.2
> 
> _______________________________________________
> 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".
Wang Chuan Jan. 14, 2022, 4:50 a.m. UTC | #2
I just try to use avio to read stream by http protocol.

But if the server responds too late, avio_read will return timeout, and 
the only way I can do is close it and reopen.

Of course I can set a large timeout, but it's hard to decide which 
timeout value is large enough.

On 2022/1/14 11:21, "zhilizhao(赵志立)" wrote:
>
>> On Jan 14, 2022, at 10:42 AM, Wang Chuan <ouchuanm@outlook.com> wrote:
>>
>> If we meet timeout when reading network resource, avio_read will set
>> [eof_reached] to 1. And this prevent caller to retry since avio_read
>> do nothing and just return if eof_reached == 1.
> If timeout was triggered by a small ‘timeout’ setting from user, just
> change the ‘timeout' configuration. If it was triggered by a system call,
> it’s likely to be in a state of not recoverable. Could you share more
> details about the issue this patch trying to solve?
>
>> Signed-off-by: Wang Chuan <ouchuanm@outlook.com>
>> ---
>> libavformat/aviobuf.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
>> index 29d4bd7510..38cb21debf 100644
>> --- a/libavformat/aviobuf.c
>> +++ b/libavformat/aviobuf.c
>> @@ -580,8 +580,9 @@ static void fill_buffer(AVIOContext *s)
>>             be done without rereading data */
>>          s->eof_reached = 1;
>>      } else if (len < 0) {
>> -        s->eof_reached = 1;
>> -        s->error= len;
>> +        s->error = len;
>> +        if (s->error != AVERROR(ETIMEDOUT))
>> +            s->eof_reached = 1;
>>      } else {
>>          s->pos += len;
>>          s->buf_ptr = dst;
>> -- 
>> 2.29.2
>>
>> _______________________________________________
>> 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".
zhilizhao(赵志立) Jan. 14, 2022, 5:07 a.m. UTC | #3
> On Jan 14, 2022, at 12:50 PM, Wang Chuan <ouchuanm@outlook.com> wrote:
> 
> I just try to use avio to read stream by http protocol.
> 
> But if the server responds too late, avio_read will return timeout, and the only way I can do is close it and reopen.
> 
> Of course I can set a large timeout, but it's hard to decide which timeout value is large enough.

Then don’t set it, use the default infinite value.

> 
> On 2022/1/14 11:21, "zhilizhao(赵志立)" wrote:
>> 
>>> On Jan 14, 2022, at 10:42 AM, Wang Chuan <ouchuanm@outlook.com> wrote:
>>> 
>>> If we meet timeout when reading network resource, avio_read will set
>>> [eof_reached] to 1. And this prevent caller to retry since avio_read
>>> do nothing and just return if eof_reached == 1.
>> If timeout was triggered by a small ‘timeout’ setting from user, just
>> change the ‘timeout' configuration. If it was triggered by a system call,
>> it’s likely to be in a state of not recoverable. Could you share more
>> details about the issue this patch trying to solve?
>> 
>>> Signed-off-by: Wang Chuan <ouchuanm@outlook.com>
>>> ---
>>> libavformat/aviobuf.c | 5 +++--
>>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
>>> index 29d4bd7510..38cb21debf 100644
>>> --- a/libavformat/aviobuf.c
>>> +++ b/libavformat/aviobuf.c
>>> @@ -580,8 +580,9 @@ static void fill_buffer(AVIOContext *s)
>>>            be done without rereading data */
>>>         s->eof_reached = 1;
>>>     } else if (len < 0) {
>>> -        s->eof_reached = 1;
>>> -        s->error= len;
>>> +        s->error = len;
>>> +        if (s->error != AVERROR(ETIMEDOUT))
>>> +            s->eof_reached = 1;
>>>     } else {
>>>         s->pos += len;
>>>         s->buf_ptr = dst;
>>> -- 
>>> 2.29.2
>>> 
>>> _______________________________________________
>>> 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".
> _______________________________________________
> 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/aviobuf.c b/libavformat/aviobuf.c
index 29d4bd7510..38cb21debf 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -580,8 +580,9 @@  static void fill_buffer(AVIOContext *s)
             be done without rereading data */
          s->eof_reached = 1;
      } else if (len < 0) {
-        s->eof_reached = 1;
-        s->error= len;
+        s->error = len;
+        if (s->error != AVERROR(ETIMEDOUT))
+            s->eof_reached = 1;
      } else {
          s->pos += len;
          s->buf_ptr = dst;