From patchwork Wed Apr 4 22:45:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 8332 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5398010jad; Wed, 4 Apr 2018 15:45:29 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/luZpIDuQNCd2JHXZkxxnI2a3NVZUiVSPaienFmM6h1/v2hUm6haIiRBS3vZDxoHn/XIbh X-Received: by 10.28.51.6 with SMTP id z6mr8143342wmz.63.1522881929400; Wed, 04 Apr 2018 15:45:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522881929; cv=none; d=google.com; s=arc-20160816; b=PKmU3b8YqrjM9kB4ugVJZRRQ/YcxyZ913jBwLu7JUvgRPNmxPb4bmIYq/EAbE98wIJ k8TvjK5kkvVfRVJ7KJyviTxkfJGKv8mlRBPtOdKYdJu8XFvrCBk2Hpv+vWPa3WG6QNg7 oKQbD1123Pu5pDpEw3VZzMM8o2YxwbUWnr58rzRXV3jqBBmcNdy2OhWIJuyn6OeX0jwL VGCJjFUGAPtcVikEUsdcS0dYF4Zf8dlPAGoiQyVCB5l7QD/8ViDmkNXoKwfM7qUi7M89 ExRlKmCkWiZ7mUZB+oD1tbq71NnsYahsZolAF3pnAeJgkrFHS0duYiT+FO759xcc+oMb dRlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=SAhHFAzl1iV9IpsBGcLZAOKKlMKW9fjFVOwJzbKiuGg=; b=SPgltb7cp0lQ/rmGCc/l13G8fLDC186Q4h7RFoJMknzzkclfpQ8QTKitxZWWXR+Jyx kGFdvIz/r2Bm34DKt18gY7j0wcz/B5LhAyQWk0EjygOMq4MJPgyPUabAS7guqc4bXOoH TFJwS1k9VsLV+sMOJz/P3RgGLQO54DjQLBPEH86IQpzdN+kG7NDqcpabixqu0rMq/nvZ PeDmCfyuS5sTvnDBOws04uNbIgp+6oAwqpCeU8zzJgXIfL3m5li2xM3Np/+CraRIY35b qli7tESNm6Vc9A3H+PnlOWJJqUhrQKHlNGdvjbn/YIYmkuwxnlt4d5GPojBMwm3bLIgU lNrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CP0jJxjn; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f18si4292689wre.45.2018.04.04.15.45.28; Wed, 04 Apr 2018 15:45:29 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CP0jJxjn; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96CAB689C93; Thu, 5 Apr 2018 01:45:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f46.google.com (mail-it0-f46.google.com [209.85.214.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D25C689C25 for ; Thu, 5 Apr 2018 01:44:59 +0300 (EEST) Received: by mail-it0-f46.google.com with SMTP id r19-v6so599422itc.0 for ; Wed, 04 Apr 2018 15:45:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=NmG0o+APyBlphwVFRJ2MTdOuvFlH+2kzWqK3fIWAoFc=; b=CP0jJxjnJ4VBwEaDx1+HZnD7RQN6XOudwdjFjrz6qcUwULrGwjh2JWmaw9xTHJDv1o mO5FFep5KbtYrin7HwPBQ33HiTzy4mkSK6x37jIPDMdR7io521mI6LH61gFwOdmulfyt t6IANjgLS8qpXJsjnNsAsGgzCae+ByRawcScP0UBGcd83g2lfuGbVCV8KuyDXQUP4Epa JxO73cGspAZzPt0nh2eRB1bNaY9FtNWEdZr6kGtL3ar/WvBBJjRXwZJk3/Gpqrx5wf2v +oF4LGKCNJEKjSX2bJTGDIHYJEHi0n7W8MjAJpRSsyAHmo+/3gn/M4E9Q7o0BL95z1gb gSHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=NmG0o+APyBlphwVFRJ2MTdOuvFlH+2kzWqK3fIWAoFc=; b=nsyIJqNJRwPqvHAHszwSBTwUmFI9X1vms4l9bXfJPW1FDmxX5ROcQebXZMtzKNK/VN F4r9lOxGEozerZDScGFWy2u++SGnQUOmJQHy6IcMWlnKEYMXjaf6pZYiGhGd8Xz2mCsU q/+mqzTgad36TsG8tqlEMIkIznmZK665JtWSILaomxlIed45kcdbXEJQWmdX/LW2q+Is YuvcON+ajGgLE7/8x+/AQv9Bt5ZhFZuz6Wa6R3/8cbjOLlg18l6DtoD/Fg1XYDTjeIFO sGA65aI2poWBH1AnZyMPmd9kvr9CuZublP6i6KxVDeQ+fqcCpr8vq8gCaxSCeJC+5deh BISQ== X-Gm-Message-State: ALQs6tCXK0Eus9YyOqHTsR1xjXsv0lAgn/Rg/wtVccg5CzQjaVsDk+Nc qYD7h4apUU1Ybd3/hgX2oEsJU1svZxXxlphJ1JM= X-Received: by 2002:a24:33c3:: with SMTP id k186-v6mr12103309itk.5.1522881918860; Wed, 04 Apr 2018 15:45:18 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.3.78 with HTTP; Wed, 4 Apr 2018 15:45:18 -0700 (PDT) From: Carl Eugen Hoyos Date: Thu, 5 Apr 2018 00:45:18 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/amr: Stricter heuristic for auto-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes ticket #7125, the jpg file in question contains a repeated pattern up to PROBE_SIZE that plays as amr_nb: 000d3290 05 14 51 40 05 14 51 40 05 14 51 40 05 14 51 40 |..Q@..Q@..Q@..Q@| * 00112900 1f ff d9 |...| Please comment, Carl Eugen From 26712381d7dc3d3dfc623a77a80a697ffcd54124 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 5 Apr 2018 00:41:55 +0200 Subject: [PATCH] lavf/amr: Stricter heuristic for auto-detection. Fixes ticket #7125. --- libavformat/amr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 8b4d736..f954803 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -178,7 +178,7 @@ AVInputFormat ff_amr_demuxer = { #if CONFIG_AMRNB_DEMUXER static int amrnb_probe(AVProbeData *p) { - int mode, i = 0, valid = 0; + int mode, i = 0, valid = 0, invalid = 0; const uint8_t *b = p->buf; while (i < p->buf_size) { @@ -197,10 +197,11 @@ static int amrnb_probe(AVProbeData *p) } } else { valid = 0; + invalid++; i++; } } - if (valid > 100) + if (valid > 100 && valid > invalid) return AVPROBE_SCORE_EXTENSION / 2 + 1; return 0; } @@ -234,7 +235,7 @@ AVInputFormat ff_amrnb_demuxer = { #if CONFIG_AMRWB_DEMUXER static int amrwb_probe(AVProbeData *p) { - int mode, i = 0, valid = 0; + int mode, i = 0, valid = 0, invalid = 0; const uint8_t *b = p->buf; while (i < p->buf_size) { @@ -253,10 +254,11 @@ static int amrwb_probe(AVProbeData *p) } } else { valid = 0; + invalid++; i++; } } - if (valid > 100) + if (valid > 100 && valid > invalid) return AVPROBE_SCORE_EXTENSION / 2 - 1; return 0; } -- 1.7.10.4