From patchwork Fri Sep 20 18:24:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 15186 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 3BF7244951C for ; Fri, 20 Sep 2019 21:26:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1BDFE68A4DB; Fri, 20 Sep 2019 21:26:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86DAB68A315 for ; Fri, 20 Sep 2019 21:25:54 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iBNbO-0001qu-16 for ffmpeg-devel@ffmpeg.org; Fri, 20 Sep 2019 20:25:54 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id BNaPiATeIwlysBNaQiVH4n; Fri, 20 Sep 2019 20:24:54 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=eTQXjklUyIpmoUlZm9AA:9 a=xNAlotvVr-mZiZ4E:21 a=9aw2Iz0y0XDK9pQ8:21 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 20 Sep 2019 20:24:31 +0200 Message-Id: <20190920182431.2906-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfEi9JeKcgY38JdIXWkWr0OeNtayW9O8wTuAUBODMuBmUXRXyKp5KX1cadV+lQ38wTpc1+Fu5Q7plh0DNL0k/e4tu5DtXlt6LfmjtNFAHr06jPCp/qpEc 3e6k1aM8Ju2sXBp3fjEGbPPO6Bi2+a9TPTV5lPzottZ1TU3Ak8OT8Vd1 Subject: [FFmpeg-devel] [PATCH] avcodec/truespeech: Eliminate some left shifts 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" This avoids some invalid shifts Signed-off-by: Michael Niedermayer --- libavcodec/truespeech.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index d4ddfcbf9c..54352851b3 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -132,8 +132,7 @@ static void truespeech_correlate_filter(TSContext *dec) if(i > 0){ memcpy(tmp, dec->cvector, i * sizeof(*tmp)); for(j = 0; j < i; j++) - dec->cvector[j] = ((tmp[i - j - 1] * dec->vector[i]) + - (dec->cvector[j] << 15) + 0x4000) >> 15; + dec->cvector[j] += (tmp[i - j - 1] * dec->vector[i] + 0x4000) >> 15; } dec->cvector[i] = (8 - dec->vector[i]) >> 3; } @@ -256,7 +255,7 @@ static void truespeech_synth(TSContext *dec, int16_t *out, int quart) int sum = 0; for(k = 0; k < 8; k++) sum += ptr0[k] * ptr1[k]; - sum = (sum + (out[i] << 12) + 0x800) >> 12; + sum = out[i] + ((sum + 0x800) >> 12); out[i] = av_clip(sum, -0x7FFE, 0x7FFE); for(k = 7; k > 0; k--) ptr0[k] = ptr0[k - 1]; @@ -274,7 +273,7 @@ static void truespeech_synth(TSContext *dec, int16_t *out, int quart) for(k = 7; k > 0; k--) ptr0[k] = ptr0[k - 1]; ptr0[0] = out[i]; - out[i] = ((out[i] << 12) - sum) >> 12; + out[i] += (- sum) >> 12; } for(i = 0; i < 8; i++)