From patchwork Sat Jan 6 16:48:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 7163 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp726296jaa; Sat, 6 Jan 2018 08:48:54 -0800 (PST) X-Google-Smtp-Source: ACJfBovfbjBBZoBUhWbbNmmvazAFOXIbxP4I8WhDqU3ebkErB8j1o/7Pw0kyhWPSA+h6X4exHmko X-Received: by 10.28.15.78 with SMTP id 75mr4619204wmp.103.1515257334706; Sat, 06 Jan 2018 08:48:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515257334; cv=none; d=google.com; s=arc-20160816; b=MYEko8XPyJakBhsN/G//phJYuM0BWN3fP/EWFfPtcg4Nzukb/87BPe/9bx1j9m4tn8 nZXHVYATPjwKyCTyYicOoFYI8z8JxgpZIsyXw7aKYgK4VZvzRBOOmewoV1pJBkw4N6TR Pj+fTi0NTKz5vjT9xRnyaPQLiq63nAyEHIKlVyHwZTXJoA6bAtoojFOqODmHt8CU3a/N sYD1nTZMjPH2111gSf32iU5/Q0Sh4Ny3st4OjLthHOTwvwyi5ay9irFhq+Dj+01HkAUG 4XWkzq5KbmpREBOZYzvncoN7nGeuPhoDlwrN+pw/Mc+gJ6E3Nk4rt6O3gBnnqSYzImDj DixA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=KKXgnJnXslDT3v2MTNuGFX0oq65hPRv1kOj7ddN/JSM=; b=zeOrrqcGMkxN26GpBN1Q4+1F94FULPqGpcd8mKtoMGR5NiATyN9fSXg2+TDs78uLq5 AVa3j9DqSqebJdfuXz7C7Lr2YyQB+Ir7qviaL1tj1ZRumQYjf3dfD3WNZP+nkdM+SuNO za+y8oxz+CGdya0jmdBdSdWIx9P8ap26i8IDAK7s4vMShrkVU92SAh3zYUkk++1WcEi/ q4t9WFL0I0Jy38mIRKk1l4YKXtIVEEng14piil+pkmNGgfN522Sfo62kr10ljyo8GwTX 2fYObRMe3INH1k87P6DBpxf2ull1kasyn9pedxNeNGwThys4p1AI5h5hK6ciJmywRxpI KkbQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x13si6053221wre.270.2018.01.06.08.48.54; Sat, 06 Jan 2018 08:48:54 -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 228C0689E0B; Sat, 6 Jan 2018 18:48:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4652689DFF for ; Sat, 6 Jan 2018 18:48:46 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id D99B9780377 for ; Sat, 6 Jan 2018 17:48:46 +0100 (CET) Received: from [2a01:e35:2e26:9790:bc8a:b994:5b68:84cc] (helo=xps) by marge.gnuage.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eXreG-0001s2-SM; Sat, 06 Jan 2018 17:48:45 +0100 Received: from aurel by xps with local (Exim 4.90) (envelope-from ) id 1eXreG-0006sL-MP; Sat, 06 Jan 2018 17:48:44 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Sat, 6 Jan 2018 17:48:05 +0100 Message-Id: <20180106164808.26162-3-aurel@gnuage.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180106164808.26162-1-aurel@gnuage.org> References: <20180106164808.26162-1-aurel@gnuage.org> X-SA-Exim-Connect-IP: 2a01:e35:2e26:9790:bc8a:b994:5b68:84cc X-SA-Exim-Mail-From: aurel@gnuage.org X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on marge.gnuage.org X-Spam-Level: X-Spam-Status: No, score=-0.2 required=3.0 tests=BAYES_00, FSL_HELO_NON_FQDN_1, RDNS_NONE autolearn=no autolearn_force=no version=3.4.1 X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on marge.gnuage.org) Subject: [FFmpeg-devel] [PATCH 2/5] aptx: factorize FFABS calculation 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 Cc: Aurelien Jacobs MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/aptx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/aptx.c b/libavcodec/aptx.c index 7b9556ce42..64a63a7d5b 100644 --- a/libavcodec/aptx.c +++ b/libavcodec/aptx.c @@ -462,10 +462,12 @@ static void aptx_quantize_difference(Quantize *quantize, { const int32_t *intervals = tables->quantize_intervals; int32_t quantized_sample, dithered_sample, parity_change; - int32_t d, mean, interval, inv; + int32_t d, mean, interval, inv, sample_difference_abs; int64_t error; - quantized_sample = aptx_bin_search(FFABS(sample_difference) >> 4, + sample_difference_abs = FFABS(sample_difference); + + quantized_sample = aptx_bin_search(sample_difference_abs >> 4, quantization_factor, intervals, tables->tables_size); @@ -477,7 +479,7 @@ static void aptx_quantize_difference(Quantize *quantize, interval = (intervals[1] - intervals[0]) * (-(sample_difference < 0) | 1); dithered_sample = rshift64_clip24(MUL64(dither, interval) + ((int64_t)(mean + d) << 32), 32); - error = ((int64_t)FFABS(sample_difference) << 20) - MUL64(dithered_sample, quantization_factor); + error = ((int64_t)sample_difference_abs << 20) - MUL64(dithered_sample, quantization_factor); quantize->error = FFABS(rshift64(error, 23)); parity_change = quantized_sample;