From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E9D9B4460E for ; Mon, 19 Sep 2022 17:18:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AECA68BA9D; Mon, 19 Sep 2022 20:18:18 +0300 (EEST) Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 836D368BA14 for ; Mon, 19 Sep 2022 20:18:12 +0300 (EEST) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-1278a61bd57so355710fac.7 for ; Mon, 19 Sep 2022 10:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date; bh=9UkPgT1YOaNoBK5mwbg21qyo1MCXRAjJSydnDqRwGhs=; b=kYJN46ADyosARHjYoQh7L7MWxTF2xLDS7MLv7edORFbigFcqwszPZt/6IChMWee+by FM2U+akCiMBAK78osRkP1H1XC/1meDd9PX5/pS+FT/TstIJjc18o2LgnSePVUfGT+gFp pqmbprOtovc96rhaald9fYNZSHJXSCjDjRJ5YFWVCp5ckhdutd9bSWWO9S7Y1/D/Vixk rmH08CJ5GymE1q//7Q2LcTgBiYFcIGrPcVb+egwLduIM34M7MNksMKeIXtkV1HKGG3EI N5LPP1aHPNTLShdV7WNM0oM1ndyMWs5Af5BH8awCVj4cawY7KYmWA6t1WA5dGtVlE2nm SoZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date; bh=9UkPgT1YOaNoBK5mwbg21qyo1MCXRAjJSydnDqRwGhs=; b=g0EwMMkg8owcFTVXw2eirdnYhlqE50wkX+BfbcSNyNQ4087+PUiFZNgZH0ME/fH4F8 Q1EqpZHlGprDg5YF9HtzV2f1ZU35RE9ibdoOaF37vKwK6KMVT1BjbQzYWsSfcHJWgOmm LYNid0dyHXiMH83OpKNIAj+DfpLySUjHNiMLvvP19Jk0R3e1P4SeMGmbrLuchDUBO5EF MW+utN/E84ZoH7OyFrIAqMmWVm3SJdkcFPzfIZf7lsc3LVtvflp7UBnmQGAmPCwKKMmE gDVzcWnUg9H1yBTYRp64K2QU5kRyo6GZayAYz9SJdHW+m7S6sCUQOoKJ2XSyBGiBuhms 85GA== X-Gm-Message-State: ACgBeo0N82KHfHP/yDwCqeDWsRHXxLDM6KGo0IzIO1N4KI/i+kQpTDB7 KvRFBwvAY7wJ1K6nn8MTY/r8NXKe1VM= X-Google-Smtp-Source: AA6agR5Q0nq9Bhb3N2mlivGL8hofUz8jzs+396nAm23AJkRn4NWJGZVkgbo4zET6ASwgPZkdTVkxWg== X-Received: by 2002:a05:6870:c690:b0:12b:1a11:e86a with SMTP id cv16-20020a056870c69000b0012b1a11e86amr15830163oab.68.1663607890558; Mon, 19 Sep 2022 10:18:10 -0700 (PDT) Received: from [192.168.0.13] ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id m2-20020a4abc82000000b00472874bc2ffsm12624032oop.28.2022.09.19.10.18.09 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Sep 2022 10:18:10 -0700 (PDT) Message-ID: Date: Mon, 19 Sep 2022 14:18:11 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] avcodec/vorbisdec: Move ff_vorbis_inverse_coupling() to vorbisdsp.c 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/19/2022 2:16 PM, Andreas Rheinhardt wrote: > Only used there. Also make it static. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/vorbis.h | 1 - > libavcodec/vorbisdec.c | 23 ----------------------- > libavcodec/vorbisdsp.c | 26 ++++++++++++++++++++++++-- > 3 files changed, 24 insertions(+), 26 deletions(-) > > diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h > index 270855da04..0dd109dd2e 100644 > --- a/libavcodec/vorbis.h > +++ b/libavcodec/vorbis.h > @@ -45,7 +45,6 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num); > void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values, > uint16_t *y_list, int *flag, > int multiplier, float * out, int samples); > -void ff_vorbis_inverse_coupling(float *mag, float *ang, ptrdiff_t blocksize); > > #define ilog(i) av_log2(2*(i)) > > diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c > index 72b8e8e15b..0d04e7c2c4 100644 > --- a/libavcodec/vorbisdec.c > +++ b/libavcodec/vorbisdec.c > @@ -1579,29 +1579,6 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, > } > } > > -void ff_vorbis_inverse_coupling(float *mag, float *ang, ptrdiff_t blocksize) > -{ > - for (ptrdiff_t i = 0; i < blocksize; i++) { > - float angi = ang[i], magi = mag[i]; > - > - if (magi > 0.f) { > - if (angi > 0.f) { > - ang[i] = magi - angi; > - } else { > - ang[i] = magi; > - mag[i] = magi + angi; > - } > - } else { > - if (angi > 0.f) { > - ang[i] = magi + angi; > - } else { > - ang[i] = magi; > - mag[i] = magi - angi; > - } > - } > - } > -} > - > // Decode the audio packet using the functions above > > static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr) > diff --git a/libavcodec/vorbisdsp.c b/libavcodec/vorbisdsp.c > index e94b65cb7b..693c44dfcb 100644 > --- a/libavcodec/vorbisdsp.c > +++ b/libavcodec/vorbisdsp.c > @@ -19,11 +19,33 @@ > #include "config.h" > #include "libavutil/attributes.h" > #include "vorbisdsp.h" > -#include "vorbis.h" > + > +static void vorbis_inverse_coupling_c(float *mag, float *ang, ptrdiff_t blocksize) > +{ > + for (ptrdiff_t i = 0; i < blocksize; i++) { > + float angi = ang[i], magi = mag[i]; > + > + if (magi > 0.f) { > + if (angi > 0.f) { > + ang[i] = magi - angi; > + } else { > + ang[i] = magi; > + mag[i] = magi + angi; > + } > + } else { > + if (angi > 0.f) { > + ang[i] = magi + angi; > + } else { > + ang[i] = magi; > + mag[i] = magi - angi; > + } > + } > + } > +} > > av_cold void ff_vorbisdsp_init(VorbisDSPContext *dsp) > { > - dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling; > + dsp->vorbis_inverse_coupling = vorbis_inverse_coupling_c; > > #if ARCH_AARCH64 > ff_vorbisdsp_init_aarch64(dsp); LGTM. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".