This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 80b2dcc991a0e28e262681f8982ace1ebc66bd58 Author: Romain Beauxis <[email protected]> AuthorDate: Sat Mar 14 11:20:34 2026 -0500 Commit: toots <[email protected]> CommitDate: Thu Jun 11 14:06:20 2026 +0000 libavformat/riffdec.c: correct invalid bit_rate when possible. --- libavformat/riffdec.c | 56 +++++++++++++++++++++++++ tests/ref/fate/wav-bad-avg-byterate | 28 ++++++------- tests/ref/fate/wav-enc-adpcm-ima-wav-bitrate | 2 +- tests/ref/fate/wav-enc-adpcm-ms-bitrate | 2 +- tests/ref/fate/wav-pcm-alaw-wrong-avg-byterate | 2 +- tests/ref/fate/wav-pcm-mulaw-wrong-avg-byterate | 2 +- tests/ref/fate/wav-pcm-s16le-wrong-avg-byterate | 2 +- tests/ref/fate/wav-pcm-s24le-wrong-avg-byterate | 2 +- tests/ref/fate/wav-pcm-u8-wrong-avg-byterate | 2 +- tests/ref/seek/acodec-adpcm-ima_wav | 36 ++++++++-------- tests/ref/seek/acodec-adpcm-ima_wav-trellis | 36 ++++++++-------- tests/ref/seek/acodec-adpcm-ms | 36 ++++++++-------- tests/ref/seek/acodec-adpcm-ms-trellis | 36 ++++++++-------- 13 files changed, 147 insertions(+), 95 deletions(-) diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 30835d5f36..ffa3fa1100 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -91,6 +91,52 @@ static void parse_waveformatex(void *logctx, AVIOContext *pb, AVCodecParameters } } +/* + * Compute the expected bit_rate for codecs with a deterministic block + * structure. Returns 0 when the codec is not handled or the parameters + * are not sufficient to derive a reliable value. + */ +static int64_t compute_bitrate(const AVCodecParameters *par) +{ + if (par->sample_rate <= 0 || par->block_align <= 0 || + par->ch_layout.nb_channels <= 0) + return 0; + + switch (par->codec_id) { + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_U16LE: + case AV_CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_S64LE: + case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F64LE: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: { + int block_align = ((par->bits_per_coded_sample + 7) / 8) * + par->ch_layout.nb_channels; + if (par->block_align != block_align) + return 0; + return (int64_t)par->sample_rate * block_align * 8; + } + case AV_CODEC_ID_ADPCM_MS: + case AV_CODEC_ID_ADPCM_IMA_WAV: { + int frame_size = av_get_audio_frame_duration2((AVCodecParameters *)par, + par->block_align); + if (frame_size <= 0) + return 0; + return 8LL * par->sample_rate * par->block_align / frame_size; + } + default: + return 0; + } +} + /* "big_endian" values are needed for RIFX file format */ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int size, int big_endian) @@ -198,6 +244,7 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, "Invalid sample rate: %d\n", par->sample_rate); return AVERROR_INVALIDDATA; } + if (par->codec_id == AV_CODEC_ID_AAC_LATM) { /* Channels and sample_rate values are those prior to applying SBR * and/or PS. */ @@ -215,6 +262,15 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, par->ch_layout.nb_channels = channels; } + int64_t expected_bitrate = compute_bitrate(par); + if (expected_bitrate && par->bit_rate / 8 != expected_bitrate / 8) { + av_log(s, AV_LOG_WARNING, + "nAvgBytesPerSec %"PRId64" inconsistent with other fields" + " (expected %"PRId64"), overriding.\n", + par->bit_rate / 8, expected_bitrate / 8); + par->bit_rate = expected_bitrate; + } + return 0; } diff --git a/tests/ref/fate/wav-bad-avg-byterate b/tests/ref/fate/wav-bad-avg-byterate index 3d23bbaa8b..85e7882a7a 100644 --- a/tests/ref/fate/wav-bad-avg-byterate +++ b/tests/ref/fate/wav-bad-avg-byterate @@ -1,10 +1,9 @@ -ret:-EOF +ret: 0 st: 0 flags:1 dts: 0.062500 pts: 0.062500 pos: 1078 size: 1024 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 78 size: 1024 ret: 0 st:-1 flags:1 ts: 1.894167 -ret:-EOF -ret: 0 st: 0 flags:0 ts: 0.788375 -ret:-EOF +ret: 0 st: 0 flags:1 dts: 0.448000 pts: 0.448000 pos: 7246 size: 832 +ret:-1 st: 0 flags:0 ts: 0.788375 ret: 0 st: 0 flags:1 ts:-0.317500 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 78 size: 1024 ret: 0 st:-1 flags:0 ts: 2.576668 @@ -12,13 +11,12 @@ ret:-EOF ret: 0 st:-1 flags:1 ts: 1.470835 ret:-EOF ret: 0 st: 0 flags:0 ts: 0.365000 -ret:-EOF +ret: 0 st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos: 5918 size: 1024 ret: 0 st: 0 flags:1 ts:-0.740875 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 78 size: 1024 -ret: 0 st:-1 flags:0 ts: 2.153336 -ret:-EOF +ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret:-EOF +ret: 0 st: 0 flags:1 dts: 0.448000 pts: 0.448000 pos: 7246 size: 832 ret: 0 st: 0 flags:0 ts:-0.058375 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 78 size: 1024 ret: 0 st: 0 flags:1 ts: 2.835875 @@ -30,17 +28,15 @@ ret:-EOF ret: 0 st: 0 flags:0 ts:-0.481625 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 78 size: 1024 ret: 0 st: 0 flags:1 ts: 2.412500 -ret:-EOF -ret: 0 st:-1 flags:0 ts: 1.306672 -ret:-EOF +ret: 0 st: 0 flags:1 dts: 0.448000 pts: 0.448000 pos: 7246 size: 832 +ret:-1 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:1 ts: 0.200839 -ret:-EOF +ret: 0 st: 0 flags:1 dts: 0.200875 pts: 0.200875 pos: 3292 size: 1024 ret: 0 st: 0 flags:0 ts:-0.905000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 78 size: 1024 ret: 0 st: 0 flags:1 ts: 1.989125 -ret:-EOF -ret: 0 st:-1 flags:0 ts: 0.883340 -ret:-EOF +ret: 0 st: 0 flags:1 dts: 0.448000 pts: 0.448000 pos: 7246 size: 832 +ret:-1 st:-1 flags:0 ts: 0.883340 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 78 size: 1024 ret: 0 st: 0 flags:0 ts: 2.671625 @@ -48,6 +44,6 @@ ret:-EOF ret: 0 st: 0 flags:1 ts: 1.565875 ret:-EOF ret: 0 st:-1 flags:0 ts: 0.460008 -ret:-EOF +ret: 0 st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 7438 size: 640 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 78 size: 1024 diff --git a/tests/ref/fate/wav-enc-adpcm-ima-wav-bitrate b/tests/ref/fate/wav-enc-adpcm-ima-wav-bitrate index f0fefe44f0..574f871809 100644 --- a/tests/ref/fate/wav-enc-adpcm-ima-wav-bitrate +++ b/tests/ref/fate/wav-enc-adpcm-ima-wav-bitrate @@ -1,6 +1,6 @@ [STREAM] adpcm_ima_wav -128000 +355228 [/STREAM] [FORMAT] 6.000000 diff --git a/tests/ref/fate/wav-enc-adpcm-ms-bitrate b/tests/ref/fate/wav-enc-adpcm-ms-bitrate index ee789d49b0..55e6a256b5 100644 --- a/tests/ref/fate/wav-enc-adpcm-ms-bitrate +++ b/tests/ref/fate/wav-enc-adpcm-ms-bitrate @@ -1,6 +1,6 @@ [STREAM] adpcm_ms -128000 +356983 [/STREAM] [FORMAT] 6.000000 diff --git a/tests/ref/fate/wav-pcm-alaw-wrong-avg-byterate b/tests/ref/fate/wav-pcm-alaw-wrong-avg-byterate index c4fafb276e..211b06b6ca 100644 --- a/tests/ref/fate/wav-pcm-alaw-wrong-avg-byterate +++ b/tests/ref/fate/wav-pcm-alaw-wrong-avg-byterate @@ -1,4 +1,4 @@ [STREAM] pcm_alaw -352800 +705600 [/STREAM] diff --git a/tests/ref/fate/wav-pcm-mulaw-wrong-avg-byterate b/tests/ref/fate/wav-pcm-mulaw-wrong-avg-byterate index 1029e46452..716bd5718b 100644 --- a/tests/ref/fate/wav-pcm-mulaw-wrong-avg-byterate +++ b/tests/ref/fate/wav-pcm-mulaw-wrong-avg-byterate @@ -1,4 +1,4 @@ [STREAM] pcm_mulaw -352800 +705600 [/STREAM] diff --git a/tests/ref/fate/wav-pcm-s16le-wrong-avg-byterate b/tests/ref/fate/wav-pcm-s16le-wrong-avg-byterate index 12068f4cf9..76fc8eb220 100644 --- a/tests/ref/fate/wav-pcm-s16le-wrong-avg-byterate +++ b/tests/ref/fate/wav-pcm-s16le-wrong-avg-byterate @@ -1,4 +1,4 @@ [STREAM] pcm_s16le -705600 +1411200 [/STREAM] diff --git a/tests/ref/fate/wav-pcm-s24le-wrong-avg-byterate b/tests/ref/fate/wav-pcm-s24le-wrong-avg-byterate index 66ed2affd1..8638430e5e 100644 --- a/tests/ref/fate/wav-pcm-s24le-wrong-avg-byterate +++ b/tests/ref/fate/wav-pcm-s24le-wrong-avg-byterate @@ -1,4 +1,4 @@ [STREAM] pcm_s24le -1411200 +2116800 [/STREAM] diff --git a/tests/ref/fate/wav-pcm-u8-wrong-avg-byterate b/tests/ref/fate/wav-pcm-u8-wrong-avg-byterate index a5b2d2a41d..6ade567c50 100644 --- a/tests/ref/fate/wav-pcm-u8-wrong-avg-byterate +++ b/tests/ref/fate/wav-pcm-u8-wrong-avg-byterate @@ -1,4 +1,4 @@ [STREAM] pcm_u8 -352800 +705600 [/STREAM] diff --git a/tests/ref/seek/acodec-adpcm-ima_wav b/tests/ref/seek/acodec-adpcm-ima_wav index b6517c5438..362293fb0f 100644 --- a/tests/ref/seek/acodec-adpcm-ima_wav +++ b/tests/ref/seek/acodec-adpcm-ima_wav @@ -2,52 +2,52 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.856009 pts: 1.856009 pos: 29756 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.891043 pts: 1.891043 pos: 84028 size: 4096 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.831995 pts: 0.831995 pos: 13372 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.807143 pts: 0.807143 pos: 35900 size: 4096 ret: 0 st: 0 flags:1 ts:-0.317506 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 2.623991 pts: 2.623991 pos: 42044 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.582880 pts: 2.582880 pos: 114748 size: 4096 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.408005 pts: 1.408005 pos: 22588 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.452880 pts: 1.452880 pos: 64572 size: 4096 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos: 6204 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.368980 pts: 0.368980 pos: 16444 size: 4096 ret: 0 st: 0 flags:1 ts:-0.740839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos: 34876 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.167778 pts: 2.167778 pos: 96316 size: 4096 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos: 16444 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.037778 pts: 1.037778 pos: 46140 size: 4096 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos: 45116 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.813515 pts: 2.813515 pos: 124988 size: 4096 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.791995 pts: 1.791995 pos: 28732 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.752676 pts: 1.752676 pos: 77884 size: 4096 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.576009 pts: 0.576009 pos: 9276 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.622653 pts: 0.622653 pos: 27708 size: 4096 ret: 0 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 2.368005 pts: 2.368005 pos: 37948 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.398390 pts: 2.398390 pos: 106556 size: 4096 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.343991 pts: 1.343991 pos: 21564 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.314512 pts: 1.314512 pos: 58428 size: 4096 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos: 3132 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.184490 pts: 0.184490 pos: 8252 size: 4096 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos: 31804 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.983288 pts: 1.983288 pos: 88124 size: 4096 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos: 14396 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.899388 pts: 0.899388 pos: 39996 size: 4096 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st: 0 flags:0 ts: 2.671678 -ret: 0 st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos: 43068 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.675125 pts: 2.675125 pos: 118844 size: 4096 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos: 24636 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.545125 pts: 1.545125 pos: 68668 size: 4096 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.511995 pts: 0.511995 pos: 8252 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.461224 pts: 0.461224 pos: 20540 size: 4096 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 diff --git a/tests/ref/seek/acodec-adpcm-ima_wav-trellis b/tests/ref/seek/acodec-adpcm-ima_wav-trellis index b6517c5438..362293fb0f 100644 --- a/tests/ref/seek/acodec-adpcm-ima_wav-trellis +++ b/tests/ref/seek/acodec-adpcm-ima_wav-trellis @@ -2,52 +2,52 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.856009 pts: 1.856009 pos: 29756 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.891043 pts: 1.891043 pos: 84028 size: 4096 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.831995 pts: 0.831995 pos: 13372 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.807143 pts: 0.807143 pos: 35900 size: 4096 ret: 0 st: 0 flags:1 ts:-0.317506 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 2.623991 pts: 2.623991 pos: 42044 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.582880 pts: 2.582880 pos: 114748 size: 4096 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.408005 pts: 1.408005 pos: 22588 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.452880 pts: 1.452880 pos: 64572 size: 4096 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos: 6204 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.368980 pts: 0.368980 pos: 16444 size: 4096 ret: 0 st: 0 flags:1 ts:-0.740839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos: 34876 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.167778 pts: 2.167778 pos: 96316 size: 4096 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos: 16444 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.037778 pts: 1.037778 pos: 46140 size: 4096 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos: 45116 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.813515 pts: 2.813515 pos: 124988 size: 4096 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.791995 pts: 1.791995 pos: 28732 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.752676 pts: 1.752676 pos: 77884 size: 4096 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.576009 pts: 0.576009 pos: 9276 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.622653 pts: 0.622653 pos: 27708 size: 4096 ret: 0 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 2.368005 pts: 2.368005 pos: 37948 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.398390 pts: 2.398390 pos: 106556 size: 4096 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.343991 pts: 1.343991 pos: 21564 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.314512 pts: 1.314512 pos: 58428 size: 4096 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos: 3132 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.184490 pts: 0.184490 pos: 8252 size: 4096 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos: 31804 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.983288 pts: 1.983288 pos: 88124 size: 4096 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos: 14396 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.899388 pts: 0.899388 pos: 39996 size: 4096 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 ret: 0 st: 0 flags:0 ts: 2.671678 -ret: 0 st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos: 43068 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.675125 pts: 2.675125 pos: 118844 size: 4096 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos: 24636 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.545125 pts: 1.545125 pos: 68668 size: 4096 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.511995 pts: 0.511995 pos: 8252 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.461224 pts: 0.461224 pos: 20540 size: 4096 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 60 size: 4096 diff --git a/tests/ref/seek/acodec-adpcm-ms b/tests/ref/seek/acodec-adpcm-ms index 579be7f416..924a8aa994 100644 --- a/tests/ref/seek/acodec-adpcm-ms +++ b/tests/ref/seek/acodec-adpcm-ms @@ -2,52 +2,52 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.856009 pts: 1.856009 pos: 29786 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.881769 pts: 1.881769 pos: 84058 size: 4096 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.831995 pts: 0.831995 pos: 13402 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.803197 pts: 0.803197 pos: 35930 size: 4096 ret: 0 st: 0 flags:1 ts:-0.317506 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 2.623991 pts: 2.623991 pos: 42074 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.593152 pts: 2.593152 pos: 115802 size: 4096 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.408005 pts: 1.408005 pos: 22618 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.468685 pts: 1.468685 pos: 65626 size: 4096 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos: 6234 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.367166 pts: 0.367166 pos: 16474 size: 4096 ret: 0 st: 0 flags:1 ts:-0.740839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos: 34906 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.157143 pts: 2.157143 pos: 96346 size: 4096 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos: 16474 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.032676 pts: 1.032676 pos: 46170 size: 4096 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos: 45146 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.822653 pts: 2.822653 pos: 126042 size: 4096 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.791995 pts: 1.791995 pos: 28762 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.744082 pts: 1.744082 pos: 77914 size: 4096 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.576009 pts: 0.576009 pos: 9306 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.619615 pts: 0.619615 pos: 27738 size: 4096 ret: 0 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 2.368005 pts: 2.368005 pos: 37978 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.409569 pts: 2.409569 pos: 107610 size: 4096 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.343991 pts: 1.343991 pos: 21594 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.308050 pts: 1.308050 pos: 58458 size: 4096 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos: 3162 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.183583 pts: 0.183583 pos: 8282 size: 4096 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos: 31834 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.973560 pts: 1.973560 pos: 88154 size: 4096 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos: 14426 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.894989 pts: 0.894989 pos: 40026 size: 4096 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st: 0 flags:0 ts: 2.671678 -ret: 0 st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos: 43098 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.684943 pts: 2.684943 pos: 119898 size: 4096 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos: 24666 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.560476 pts: 1.560476 pos: 69722 size: 4096 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.511995 pts: 0.511995 pos: 8282 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.481905 pts: 0.481905 pos: 21594 size: 4096 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 diff --git a/tests/ref/seek/acodec-adpcm-ms-trellis b/tests/ref/seek/acodec-adpcm-ms-trellis index 579be7f416..924a8aa994 100644 --- a/tests/ref/seek/acodec-adpcm-ms-trellis +++ b/tests/ref/seek/acodec-adpcm-ms-trellis @@ -2,52 +2,52 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.856009 pts: 1.856009 pos: 29786 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.881769 pts: 1.881769 pos: 84058 size: 4096 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.831995 pts: 0.831995 pos: 13402 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.803197 pts: 0.803197 pos: 35930 size: 4096 ret: 0 st: 0 flags:1 ts:-0.317506 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 2.623991 pts: 2.623991 pos: 42074 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.593152 pts: 2.593152 pos: 115802 size: 4096 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.408005 pts: 1.408005 pos: 22618 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.468685 pts: 1.468685 pos: 65626 size: 4096 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos: 6234 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.367166 pts: 0.367166 pos: 16474 size: 4096 ret: 0 st: 0 flags:1 ts:-0.740839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos: 34906 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.157143 pts: 2.157143 pos: 96346 size: 4096 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos: 16474 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.032676 pts: 1.032676 pos: 46170 size: 4096 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos: 45146 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.822653 pts: 2.822653 pos: 126042 size: 4096 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.791995 pts: 1.791995 pos: 28762 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.744082 pts: 1.744082 pos: 77914 size: 4096 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.576009 pts: 0.576009 pos: 9306 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.619615 pts: 0.619615 pos: 27738 size: 4096 ret: 0 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 2.368005 pts: 2.368005 pos: 37978 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.409569 pts: 2.409569 pos: 107610 size: 4096 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.343991 pts: 1.343991 pos: 21594 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.308050 pts: 1.308050 pos: 58458 size: 4096 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos: 3162 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.183583 pts: 0.183583 pos: 8282 size: 4096 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos: 31834 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.973560 pts: 1.973560 pos: 88154 size: 4096 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos: 14426 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.894989 pts: 0.894989 pos: 40026 size: 4096 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 ret: 0 st: 0 flags:0 ts: 2.671678 -ret: 0 st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos: 43098 size: 4096 +ret: 0 st: 0 flags:1 dts: 2.684943 pts: 2.684943 pos: 119898 size: 4096 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos: 24666 size: 4096 +ret: 0 st: 0 flags:1 dts: 1.560476 pts: 1.560476 pos: 69722 size: 4096 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.511995 pts: 0.511995 pos: 8282 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.481905 pts: 0.481905 pos: 21594 size: 4096 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size: 4096 _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
