From patchwork Wed Oct 2 18:11:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15464 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 240894488C0 for ; Wed, 2 Oct 2019 21:18:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC4E5687F2E; Wed, 2 Oct 2019 21:18:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7A9D687F2E for ; Wed, 2 Oct 2019 21:18:47 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id p7so8214181wmp.4 for ; Wed, 02 Oct 2019 11:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=4RwDr/BnSNZt5NHxJM9EbPGfyCQOFGw+G2hM+As5I34=; b=ehTMgFQmJh54qQUbZRL0uhYicRcU4Q/n2/JyPMLsiEFACnT+xOfnOxX3MleeJZDQqW AdQUyHgfAB8Zx7ADi6NB/7/CaMblC6Y0C4wo791XKctleOWdrjV641nw5IkhdnYVp+gU CYGTOrQXVMotnH6I9ENGyMhNzVG8Pmel9DIgYGK5oCy6uOwdHA/TbRl1n5nUkQf9ZV5E ++uWS1biFw+n4AWuytPbMG0n54DN309sgx9ejm1gOYwg9w9ZUldSCSt5MS5Dfa0kt2jd SpqNJIU8wNocJE3EXRrbb3PhZe4ePr3l8r2uv2p4aPIXmJT+LbOBm3RQ0rsLQWTerNT4 hW6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=4RwDr/BnSNZt5NHxJM9EbPGfyCQOFGw+G2hM+As5I34=; b=DCyq/lyBRwzBocuWFdfREay3M3GOJk3kj8jAuaWDbj+McdASaLLFzL3gVeZlKZ8cv+ fDdJknLsWndwdghQpnZ4VvqNDLY60imAgSiniW5MF7d0GMq6MbCG5nfdiASDg7uBSa8Y +qKQ7drvV6LHf99ZT4zpAeQ+YKdmiqLe60ZEOF39XY6Vflh9ixFUNHxtKjAqmdZLRJ24 q+P22jHqY1/RGK6Yx9TZLi/mQBZSUuKdlFinRGp+XRMc29Q+Em7lzk1SV3LAvCplGBuC wmmSo9JxuwYiMLlRAnPIBPcNegIlpR/fPe5Yvpkb+ScQsoDE6BQTaoLYUg7Ye27j+T++ JNRw== X-Gm-Message-State: APjAAAXz+JvIZv0Vstj4ulFKTV/M92KicHRURA0gKR1MWIx7a/5O7UyL kANvjEDYBQNrK6Zf/wnp+Mg+pXNh X-Google-Smtp-Source: APXvYqzJnJ7EnCUl56QFLXr9cL2jTPz1any/iB7a+SZ1Fp6OnxrLhE+wm8YJfkgepOD3UhfS+CpjcQ== X-Received: by 2002:a1c:f30b:: with SMTP id q11mr3926566wmq.57.1570039875847; Wed, 02 Oct 2019 11:11:15 -0700 (PDT) Received: from localhost.localdomain ([109.227.36.151]) by smtp.gmail.com with ESMTPSA id d10sm8719528wma.42.2019.10.02.11.11.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2019 11:11:14 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Oct 2019 20:11:07 +0200 Message-Id: <20191002181107.27360-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/amr: reduce raw amr false positive detection 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/amr.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 42840a50a3..600cb1b0f0 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -190,9 +190,12 @@ static int amrnb_probe(const AVProbeData *p) if (b[++i] != last) break; } - if (size > 0) { - valid++; - i += size; + while (size--) { + if (b[i]) + valid++; + else + invalid++; + i++; } } else { valid = 0; @@ -246,9 +249,12 @@ static int amrwb_probe(const AVProbeData *p) if (b[++i] != last) break; } - if (size > 0) { - valid++; - i += size; + while (size--) { + if (b[i]) + valid++; + else + invalid++; + i++; } } else { valid = 0;