From patchwork Thu Apr 13 12:58:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41142 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1223341pzb; Thu, 13 Apr 2023 05:59:04 -0700 (PDT) X-Google-Smtp-Source: AKy350aWHB4qk2lyTm9LWsHilDdYyOl9XhGa0oIDjafQ1bsMvEei7/18FNg5o0iaQBcXzRESuPsW X-Received: by 2002:a17:906:6982:b0:948:a58a:5230 with SMTP id i2-20020a170906698200b00948a58a5230mr2966023ejr.33.1681390744409; Thu, 13 Apr 2023 05:59:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681390744; cv=none; d=google.com; s=arc-20160816; b=EIJZ7Q36UpYB1YQo6Vwg441Kbwcw6Gln4YYmZ3fFyJ/HiqZk8uhQsj1a1ZG73YSw6i mkvqUqzP0UXcIcrfpQBJINQhdRPi0DXclf5P3KHiTztZ/615bqv8iqEhc7YH6znPTdVF HTp7ewHJgORTHmpHaNW4StNqrVUUXlLm6X4acpzM1SGWyW/886xRfrskZh32R5KKl/Ug lgbS8GHL0Pd8QGj35wqRViZdCxn5ZCet+Cmc8Ybi3q6Ra7QKVGV5KqgbuYwR05eLfVhQ l1nNRQ+6yEbrbY9B4cpY4dsMEgrshJWAJDMUlRi063xfWyuJfdk7wjXuW9P2jNKOdzOU 5haA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=yPTC7scqbQYRKP0x6DdqpcZZk3B2KOLH0ho3j4WmGtk=; b=t2nQaqhMrvZp+MhdSOTkHCHgBvqYHDxNd6gC/DJuN1VlrDl6D8TFUKGGr5HLzwQouZ b/Gn4NVCjaQHUnC5a8f/y3EMd5IeIDf32JeMy4iD7y9p0ot1y7dFcQy8Ozk2e0XxLKI9 otO/V/Whbm1prF9Jr7/irJtH7/RQzZPywL+0DOAGC0rgnFHKTh9IWz9u5ZHhd/7mY0Bc gfSNmX2P9qcfgkQbNoOU/Jeq+c5UZYsqMIFoqjIghTWGI9pOWKrcaRAV0KNeJ0aVyGm2 HZcaI3+mOt+MHoFAuD9IR4BWecG9JrEgRv4zPGHrZ3F6EvDwA4YW5U3sf132QYD8TfH2 raXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=EpZAoAw5; 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 c23-20020aa7df17000000b004fe9345386esi1613858edy.585.2023.04.13.05.59.04; Thu, 13 Apr 2023 05:59:04 -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=20221208 header.b=EpZAoAw5; 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 528BD68BCD7; Thu, 13 Apr 2023 15:59:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 664026882C0 for ; Thu, 13 Apr 2023 15:58:54 +0300 (EEST) Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-1842e278605so17740835fac.6 for ; Thu, 13 Apr 2023 05:58:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681390732; x=1683982732; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=dv1MTGppUZjF+MDHtHByVjstpVhKguti13W2Q/TEP50=; b=EpZAoAw5lwVimG74VoUUcTpkjkw4FIEHDNxVmzsc8hUG5k4h4467n36h4ZUzlP0HGh AbnIDxe8XxAp2wYzoTmyF6sBTU3CzSY4miQJwqOrUNVFONeErXCzbQmhKfWOvCRAyBCv Jqrl5cTMMDc9d9tRYbUzJygLj7dItmqud67UspFsQI8Z0KoilAM5+BrNWKwMYvlrYg// 4D78dMkL1bVDKgveBV4RzPa8yTpsxJdkkcNSn+5JDbQ3UMQ959QyanLtIgbQQ2vf1kYE MyNH8SS2sfoCifxi9uAQPz/G7JspVnFoJX02jFQNWyu8dFqJOQrCEPct8K3tBdWgq2iK ePaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681390732; x=1683982732; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dv1MTGppUZjF+MDHtHByVjstpVhKguti13W2Q/TEP50=; b=MxfpmFoqOFOGQF8NqNsdPPUU3Ks/FE23FJp5PyCtBlwQ791dKcwTDTfyvnGMN7O+jU K+3f0Jje/lmgNY07ndFwnBgb9ImvFQaO6LLQL7z5yxeM02ePsaLtrwky0zfYdyYONNTc tbXw8PFRe1B6SDxdgikrM6PPh8GUlcpemWLpxKwukXTkwPvNAuX8Rqubt/dmuJXUEJsM VM7yFwxyL+uPaoehUdgJW3A6xR9/IYdQ9dLfAPloGcs1/s3hovuNQFZxZdRvBPLkf6EH HhFoY+oxQ0q4PjCPG5NbZYlDqNDFyPp739PigITu8JOpADG1WVW2mMl6RS/wGa1/OeLZ ASpg== X-Gm-Message-State: AAQBX9eox+/+DIWlPW9F+hxH388dTUP9Dbs4cqv+NdHEk8vGN4jqxf+e UEhfSa1PD8SNs/l/cv1rh42j/SvON4I= X-Received: by 2002:a05:6870:8307:b0:177:a4d0:e389 with SMTP id p7-20020a056870830700b00177a4d0e389mr1647141oae.28.1681390732354; Thu, 13 Apr 2023 05:58:52 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id p1-20020a4a8e81000000b00541854ce607sm544239ook.28.2023.04.13.05.58.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 05:58:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 09:58:39 -0300 Message-Id: <20230413125839.3396-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/aacpsy: clip global_quality within the psy_vbr_map array boundaries X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: wusXOp81uBTP Fixes ticket #10317. Signed-off-by: James Almer --- libavcodec/aacpsy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 4c5ab2c9d5..933369e445 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -267,7 +267,7 @@ static av_cold void lame_window_init(AacPsyContext *ctx, AVCodecContext *avctx) AacPsyChannel *pch = &ctx->ch[i]; if (avctx->flags & AV_CODEC_FLAG_QSCALE) - pch->attack_threshold = psy_vbr_map[avctx->global_quality / FF_QP2LAMBDA].st_lrm; + pch->attack_threshold = psy_vbr_map[av_clip(avctx->global_quality / FF_QP2LAMBDA, 0, 10)].st_lrm; else pch->attack_threshold = lame_calc_attack_threshold(avctx->bit_rate / avctx->ch_layout.nb_channels / 1000);