On Thu, Nov 07, 2019 at 10:25:32PM +0100, Michael Niedermayer wrote:
> From: Limin Wang <lance.lmw...@gmail.com>
>
> Fixes misdetection of zYLx.wav
>
> Co-Author: Michael Niedermayer <mich...@niedermayer.cc>
> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
why it's same?
> ---
> libavformat/mp3dec.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
> index 6848415657..eb40362548 100644
> --- a/libavformat/mp3dec.c
> +++ b/libavformat/mp3dec.c
> @@ -73,7 +73,7 @@ static int mp3_read_probe(const AVProbeData *p)
> int frames, ret;
> int framesizes, max_framesizes;
> uint32_t header;
> - const uint8_t *buf, *buf0, *buf2, *end;
> + const uint8_t *buf, *buf0, *buf2, *buf3, *end;
>
> buf0 = p->buf;
> end = p->buf + p->buf_size - sizeof(uint32_t);
> @@ -88,11 +88,19 @@ static int mp3_read_probe(const AVProbeData *p)
> buf2 = buf;
> for(framesizes = frames = 0; buf2 < end; frames++) {
> MPADecodeHeader h;
> + int header_emu = 0;
>
> header = AV_RB32(buf2);
> ret = avpriv_mpegaudio_decode_header(&h, header);
> if (ret != 0 || end - buf2 < h.frame_size)
> break;
> +
> + for (buf3 = buf2 + 4; buf3 < buf2 + h.frame_size; buf3++) {
Sorry, please ignore my comments for the first patch, with patch2, it's
necessary.
The patch looks good to me, I have tested and OK.
> + uint32_t next_sync = AV_RB32(buf3);
> + header_emu += (next_sync & MP3_MASK) == (header & MP3_MASK);
> + }
> + if (header_emu > 2)
> + break;
> buf2 += h.frame_size;
> framesizes += h.frame_size;
> }
> --
> 2.23.0
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
