From patchwork Sun Dec 29 19:23:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 17045 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 34A6744AFA7 for ; Sun, 29 Dec 2019 21:27:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 204AF68ACC8; Sun, 29 Dec 2019 21:27:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D77CF68A8A0 for ; Sun, 29 Dec 2019 21:27:05 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ileDQ-00026r-0e for ffmpeg-devel@ffmpeg.org; Sun, 29 Dec 2019 20:27:04 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id leCSiQVuUwlysleCSis004; Sun, 29 Dec 2019 20:26:04 +0100 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=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=AZ9KiBIl_JW14KhB3uMA:9 a=Lw-sIm8vhVAl3oZ0:21 a=_Gcq6EVMrcDSDzPm:21 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 29 Dec 2019 20:23:39 +0100 Message-Id: <20191229192339.5809-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191229192339.5809-1-michael@niedermayer.cc> References: <20191229192339.5809-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfAFCDSsnNoo/MMGGEUeuVGh/1zOtRnbu2jHcX07Ibs5KbpaLFIaju6H2g+1O/cyKXdFExGS8ohuE4MeZL+pxws29sIjeVLWcI/isda2rik2HxqiGLtmK 1cXd5ZPnW5DhAqwHvb6lrz1QrqoaIT/pBzPv6dzSk/KMgdafdrHU1h+C Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/acelp_pitch_delay: Remove unused functions 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" Signed-off-by: Michael Niedermayer --- libavcodec/acelp_pitch_delay.c | 14 -------------- libavcodec/acelp_pitch_delay.h | 33 --------------------------------- 2 files changed, 47 deletions(-) diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index a070d1b25d..5ab12ae14d 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -56,20 +56,6 @@ int ff_acelp_decode_5_6_bit_to_2nd_delay3( return 3 * pitch_delay_min + ac_index - 2; } -int ff_acelp_decode_9bit_to_1st_delay6(int ac_index) -{ - if(ac_index < 463) - return ac_index + 105; - else - return 6 * (ac_index - 368); -} -int ff_acelp_decode_6bit_to_2nd_delay6( - int ac_index, - int pitch_delay_min) -{ - return 6 * pitch_delay_min + ac_index - 3; -} - void ff_acelp_update_past_gain( int16_t* quant_energy, int gain_corr_factor, diff --git a/libavcodec/acelp_pitch_delay.h b/libavcodec/acelp_pitch_delay.h index 2aade2f226..973cb0caa0 100644 --- a/libavcodec/acelp_pitch_delay.h +++ b/libavcodec/acelp_pitch_delay.h @@ -82,39 +82,6 @@ int ff_acelp_decode_4bit_to_2nd_delay3( int ac_index, int pitch_delay_min); -/** - * @brief Decode pitch delay of the first subframe encoded by 9 bits - * with 1/6 precision. - * @param ac_index adaptive codebook index (9 bits) - * - * @return pitch delay in 1/6 units - * - * Pitch delay is coded: - * with 1/6 resolution, 17 < pitch_delay < 95 - * integers only, 95 <= pitch_delay <= 143 - * - * @remark The routine is used in AMR @@12.2k for the first and third subframes. - */ -int ff_acelp_decode_9bit_to_1st_delay6(int ac_index); - -/** - * @brief Decode pitch delay of the second subframe encoded by 6 bits - * with 1/6 precision. - * @param ac_index adaptive codebook index (6 bits) - * @param pitch_delay_min lower bound (integer) of pitch delay interval for - * second subframe - * - * @return pitch delay in 1/6 units - * - * Pitch delay is coded: - * with 1/6 resolution, -6 < pitch_delay - int(prev_pitch_delay) < 5 - * - * @remark The routine is used in AMR @@12.2k for the second and fourth subframes. - */ -int ff_acelp_decode_6bit_to_2nd_delay6( - int ac_index, - int pitch_delay_min); - /** * @brief Update past quantized energies * @param[in,out] quant_energy past quantized energies (5.10)