| Message ID | CAPYw7P40pW-TtapFEpakovXUhCCC5h0WOwfBq06Xv5ghd3UE3A@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] avocdec/flac_parser: another fix | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/configure_loongarch64 | warning | Failed to apply patch |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Mon, Sep 5, 2022 at 8:16 PM Paul B Mahol <onemda@gmail.com> wrote: > Patch attached. > Thanks and can confirm that the patch produces the same samples as the flac reference decoder for the original file in https://trac.ffmpeg.org/ticket/9621 that I could not share. But I'm not sure I follow how the patch works. I read it as we skip checking CRC if the current frame or sample number is the expected next one? + if ((fpc->last_fi.frame_or_sample_num + 1 == header_fi->frame_or_sample_num) || + (fpc->last_fi.frame_or_sample_num + fpc->last_fi.blocksize == header_fi->frame_or_sample_num)) { Would it make sense to look at the blocking strategy bit to know which one to check?
On Wed, Sep 7, 2022 at 12:31 PM Mattias Wadman <mattias.wadman@gmail.com> wrote: > On Mon, Sep 5, 2022 at 8:16 PM Paul B Mahol <onemda@gmail.com> wrote: > > > Patch attached. > > > > Thanks and can confirm that the patch produces the same samples as the flac > reference decoder for the original file in > https://trac.ffmpeg.org/ticket/9621 that I could not share. > > But I'm not sure I follow how the patch works. I read it as we skip > checking CRC if the current frame or sample number is the expected next > one? > It always force CRC check if they do not match, previously code would do that sometimes. > > + if ((fpc->last_fi.frame_or_sample_num + 1 == > header_fi->frame_or_sample_num) || > + (fpc->last_fi.frame_or_sample_num + fpc->last_fi.blocksize == > header_fi->frame_or_sample_num)) { > > Would it make sense to look at the blocking strategy bit to know which one > to check? > Could be.
From 01e931d2c7f50727d8893268cdc3ae0dbe75c250 Mon Sep 17 00:00:00 2001 From: Paul B Mahol <onemda@gmail.com> Date: Mon, 5 Sep 2022 20:16:13 +0200 Subject: [PATCH] avcodec/flac_parser: add missed opportunity to check crc Fixes #9621 Signed-off-by: Paul B Mahol <onemda@gmail.com> --- libavcodec/flac_parser.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 11cd5540cf..dd70721696 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -455,7 +455,7 @@ static int check_header_mismatch(FLACParseContext *fpc, int log_level_offset) { FLACFrameInfo *header_fi = &header->fi, *child_fi = &child->fi; - int deduction, deduction_expected = 0, i; + int check_crc, deduction, deduction_expected = 0, i; deduction = check_header_fi_mismatch(fpc, header_fi, child_fi, log_level_offset); /* Check sample and frame numbers. */ @@ -491,8 +491,15 @@ static int check_header_mismatch(FLACParseContext *fpc, "sample/frame number mismatch in adjacent frames\n"); } + if ((fpc->last_fi.frame_or_sample_num + 1 == header_fi->frame_or_sample_num) || + (fpc->last_fi.frame_or_sample_num + fpc->last_fi.blocksize == header_fi->frame_or_sample_num)) { + check_crc = 0; + } else { + check_crc = !deduction && !deduction_expected; + } + /* If we have suspicious headers, check the CRC between them */ - if (deduction && !deduction_expected) { + if (check_crc || (deduction && !deduction_expected)) { FLACHeaderMarker *curr; int read_len; uint8_t *buf; -- 2.37.2