From patchwork Sun Nov 13 20:29:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1407 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp745887vsb; Sun, 13 Nov 2016 12:29:22 -0800 (PST) X-Received: by 10.28.167.77 with SMTP id q74mr6974858wme.21.1479068962330; Sun, 13 Nov 2016 12:29:22 -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 i3si6286161wja.200.2016.11.13.12.29.21; Sun, 13 Nov 2016 12:29:22 -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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E3ED689B53; Sun, 13 Nov 2016 22:29:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A665A689A67 for ; Sun, 13 Nov 2016 22:29:13 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id m203so10250185wma.3 for ; Sun, 13 Nov 2016 12:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=DyBRXCrWCXAPfSzDlIgQDXl0F4FzQ8yP0VVaLEvNCnw=; b=PAO3h5V1xl5GOfVblAlNwDoscuq2Bi3K2/LotWjPwF3d+yg51EGvks98mVt7VDNPBE o/8mnwkP8xks7Cn4IRjXOr60IE+7YabLG9WN8KML9EaVvbv0LHK03JSc7k9BvlweCYcX GRuhKraGrw9nOq0EQM8TJ9zLXUedD5/Y7UYGDdIfSgM2xlJtKcKxCEt66ImBPud59sZd 5qNTb7gFC9R03uOTb5OsqZjl4iIdDspljLcu/kjQwYcFLwyIiuJju1nXB0ienYabshKB tComcgJLEsg3FtkpZa2nXnUTaLDC0TgGMPWBVP+wVfb5dZlvmvszj7w2g1/ijyzaeOkp 36Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=DyBRXCrWCXAPfSzDlIgQDXl0F4FzQ8yP0VVaLEvNCnw=; b=MGtI3+PX8IlzwG6PV3bOTQGWUr8Ur/GpdT7B/HEH76iJ6Cki11joVxV4f0lF41+Ibv uwgYKe3W8UDYlatKTK4yRmH7jZCjsczpvPmTh2+vRIGR64HUREq0CUbzbq2/hdb4Srj7 GI8gvBlZ0xl0eOriLSg2TqMMsfoUVYtEqNdXHyzBe+TpobEldITiUQZgKKaTwg+1cYJu QLjOo0GWNGjd0lb+Nh8QAy3+xw5JyHZGe0twG7fwynlWWF3doekgoWhSfbWN/2a2/utK La46PQNVKWkOcFB0T0PCTkEhEdwMTZjR3WQ3IHIi6PWf3HB0JH2OxrnngHUnI7LLubdh QFCw== X-Gm-Message-State: ABUngvfU6p6nJYcdZKcmAu3aTTcdcDUoFZ6clriMliCkwdoqKtwFZdRu/aId+iA6SiRzwQ== X-Received: by 10.194.3.47 with SMTP id 15mr16290297wjz.17.1479068952852; Sun, 13 Nov 2016 12:29:12 -0800 (PST) Received: from [192.168.2.21] (p5B072E6F.dip0.t-ipconnect.de. [91.7.46.111]) by smtp.googlemail.com with ESMTPSA id ia7sm24312993wjb.23.2016.11.13.12.29.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Nov 2016 12:29:12 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <8e6e9b86-4fbf-3710-25f1-eb826182b381@googlemail.com> Date: Sun, 13 Nov 2016 21:29:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] aacsbr_fixed: prevent sbr gain from being zero 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" It causes division by zero crashes. Signed-off-by: Andreas Cadhalpun --- libavcodec/aacsbr_fixed.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c index b26314a..d2a7027 100644 --- a/libavcodec/aacsbr_fixed.c +++ b/libavcodec/aacsbr_fixed.c @@ -429,6 +429,10 @@ static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr, av_add_sf(FLOAT_1, sbr->e_curr[e][m]), av_add_sf(FLOAT_1, sbr->q_mapped[e][m])))); } + if (sbr->gain[e][m].mant == 0) { + sbr->gain[e][m] = FLOAT_1; + sbr->gain[e][m].exp = MIN_EXP; + } } for (m = sbr->f_tablelim[k] - sbr->kx[1]; m < sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) { sum[0] = av_add_sf(sum[0], sbr->e_origmapped[e][m]);