From patchwork Wed Mar 1 08:38:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2708 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp1832583vsf; Wed, 1 Mar 2017 00:39:15 -0800 (PST) X-Received: by 10.28.211.200 with SMTP id k191mr2069637wmg.137.1488357555147; Wed, 01 Mar 2017 00:39:15 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s27si4248156wrb.195.2017.03.01.00.39.13; Wed, 01 Mar 2017 00:39:15 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0ACC688396; Wed, 1 Mar 2017 10:38:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 172D6688389 for ; Wed, 1 Mar 2017 10:38:54 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cizmp-0007zZ-Rd for ffmpeg-devel@ffmpeg.org; Wed, 01 Mar 2017 09:39:03 +0100 Received: from [192.168.1.3] ([80.110.115.245]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id qYey1u01e5Hkk6g01Yezz2; Wed, 01 Mar 2017 09:38:59 +0100 X-SourceIP: 80.110.115.245 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Wed, 1 Mar 2017 09:38:58 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201703010938.58604.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/flacdec: Return maximum score if a valid streaminfo header was found X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! I implemented this patch to fix ticket #6208 but it turned out the flac probe function wasn't the issue. Still looks like a good idea to me. Please comment, Carl Eugen From acc7558a3585d99776523ed670747597c4de99fb Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 1 Mar 2017 09:34:37 +0100 Subject: [PATCH 1/2] lavf/flacdec: Return maximum score if the streaminfo header is valid. --- libavformat/flacdec.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 66baba5..c75eba8 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -233,7 +233,14 @@ static int flac_probe(AVProbeData *p) return raw_flac_probe(p); if (p->buf_size < 4 || memcmp(p->buf, "fLaC", 4)) return 0; - return AVPROBE_SCORE_EXTENSION; + if ( p->buf[4] & 0x7f != FLAC_METADATA_TYPE_STREAMINFO + || AV_RB24(p->buf + 5) != FLAC_STREAMINFO_SIZE + || AV_RB16(p->buf + 8) < 16 + || AV_RB16(p->buf + 8) > AV_RB16(p->buf + 10) + || !(AV_RB24(p->buf + 18) >> 4) + || AV_RB24(p->buf + 18) >> 4 > 655350) + return AVPROBE_SCORE_EXTENSION / 8; + return AVPROBE_SCORE_MAX; } static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_index,