dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-08-09 09:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/shared: add -retry_corrupt option

Browse Source 
Similar to -retry_errors, this retries blocks whose only crime is failing
the CRC self-check.

Sponsored-by: nxtedition AB
Signed-off-by: Niklas Haas <git@haasn.dev>
This commit is contained in:
Niklas Haas
2026-06-29 17:56:24 +02:00
committed by Niklas Haas
parent e85c0e0ab1
commit aa8fc9f946
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/protocols.texi
View File

@@ -1621,6 +1621,11 @@ If true (the default), transient read errors from the underlying input stream
are ignored and retried again. If false, any blocks that previously failed
being read from will be treated as permanently inaccessible.
@item retry_corrupt
If true (the default), blocks whose contents fail the CRC integrity check are
re-fetched from the underlying input stream, overwriting the corrupt cached
data. If false, cache corruption is treated as a fatal read error.
@end table
URL Syntax is

12
libavformat/shared.c
View File

@@ -152,6 +152,7 @@ typedef struct SharedContext {
int read_only;
int64_t timeout;
int retry_errors;
int retry_corrupt;
int verify;
/* misc state */
@@ -627,6 +628,8 @@ retry:
av_log(h, AV_LOG_ERROR, "Cache corruption detected for block 0x%"PRIx64" at "
"offset 0x%"PRIx64": expected CRC: 0x%08X, got: 0x%08X\n",
block_id, block_pos, state, crc);
if (s->retry_corrupt)
goto read_block;
return AVERROR(EIO);
}
@@ -643,9 +646,11 @@ retry:
return size;
case BLOCK_FAILED:
if (!s->retry_errors)
return AVERROR(EIO);
av_fallthrough;
if (s->retry_errors)
goto read_block;
return AVERROR(EIO);
read_block:
case BLOCK_NONE:
if (s->read_only)
break; /* don't mark block as pending */
@@ -874,6 +879,7 @@ static const AVOption options[] = {
{ "cache_verify", "Verify correctness of the cache against the source", OFFSET(verify), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, .flags = D },
{ "cache_timeout", "Time in us to wait before re-fetching pending blocks", OFFSET(timeout), AV_OPT_TYPE_INT64, {.i64 = 10000}, 0, INT64_MAX, .flags = D },
{ "retry_errors", "Re-request blocks even if they previously failed", OFFSET(retry_errors), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, .flags = D },
{ "retry_corrupt", "Re-request blocks that fail the CRC check", OFFSET(retry_corrupt), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, .flags = D },
{0},
};