From patchwork Sun Sep 13 02:57:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22321 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 166EB449E91 for ; Sun, 13 Sep 2020 05:58:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F09BC68BBE1; Sun, 13 Sep 2020 05:58:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE8F168BBC2 for ; Sun, 13 Sep 2020 05:58:25 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id q9so7613682wmj.2 for ; Sat, 12 Sep 2020 19:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=abhWTntbAyPUfEy0/DU+dosEx9IZ2rOsEeKF01DApD0=; b=un8IIeSSAAJNjIX2d4B4s+2lzcEUEzwYxHQRBH2VvRiUoPQgEj1zJqCNH/FWNJotPa 9Krxd5f2mm1LWUAGeNJXwPUEY8in3KKKZwDSzkMcXYd2Ykp5M0WknEt2wB2mFKeQbNJm 2GUoJ1Munx+fWnsTCVUvl6nXu3aZLbZ7B1s40zqyly2WhPEkoObwH3gCrMV4URWeLyw9 Zj2NvNzBHy5kaCnYMa8egQfyL2aNHHpmpP4kEUpEtLIwUixQmar9+I+6qcv5IN6ugpma fUW3kv30pFzMTf52I3uA7Xku/A6McXSisw9Hrrt2biKvoHcTrT2Pnn/nvtPL2JsTClS2 rSBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=abhWTntbAyPUfEy0/DU+dosEx9IZ2rOsEeKF01DApD0=; b=JESH1Kz6ZI2Oox0JPWa7DAIetl0MWZC9rFAhgschHvGkLhAax/h3oUZwKv+v8qugx7 4l9v9U2OIiJGUbD/D6PqidJsvpXETA/l6dlIHkC+AU6L0tDkS4ULq5pHF3VXKQuqr5LO H89kygIt8vuLhiOCp1tLOjyoPkTxzCks7fR/tYKPuFxK4G5X/FhZ7OPEr9mWxgaiLFkZ kX4L1t6cq/5y8PU95Isv3E4Pyj2H8zs4oAvMh/1K1FjFF0mxZTM5hJKWYu8XPs3T4GTA vKQHaBzWu9ENjzOalb10gWOmgL8io8d6kOOR8vKWavvTW3Ridm2TFXGjAZWg7c+9OJYJ Vqew== X-Gm-Message-State: AOAM532xRetrHr1ats9XeX3hJy5xoC3/goK1/F1WU+zcah+JmFg1XsUV IedTl+0cmEAL24LrH1++PiC5EFC2BtE= X-Google-Smtp-Source: ABdhPJyjq9uhvTQK0sPQ6qVuuy5ouqFu5Pbtgpm0zgurlAfHgvmSjqgSpYbi9wWvKqzyj9O0lFYWJA== X-Received: by 2002:a1c:bad5:: with SMTP id k204mr9303112wmf.111.1599965905009; Sat, 12 Sep 2020 19:58:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f3sm11883355wmb.35.2020.09.12.19.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 19:58:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 04:57:43 +0200 Message-Id: <20200913025753.274772-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> References: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/16] avcodec/ra288: Avoid indirection when calling float dsp function 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Do this by only keeping the only function pointer from the AVFloatDSPContext that is needed lateron. This also allows to remove the decoder's close function. Signed-off-by: Andreas Rheinhardt --- libavcodec/ra288.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index aa4bd5d90f..8df17891b1 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -39,7 +39,8 @@ #define RA288_BLOCKS_PER_FRAME 32 typedef struct RA288Context { - AVFloatDSPContext *fdsp; + void (*vector_fmul)(float *dst, const float *src0, const float *src1, + int len); DECLARE_ALIGNED(32, float, sp_lpc)[FFALIGN(36, 16)]; ///< LPC coefficients for speech data (spec: A) DECLARE_ALIGNED(32, float, gain_lpc)[FFALIGN(10, 16)]; ///< LPC coefficients for gain (spec: GB) @@ -60,18 +61,10 @@ typedef struct RA288Context { float gain_rec[11]; } RA288Context; -static av_cold int ra288_decode_close(AVCodecContext *avctx) -{ - RA288Context *ractx = avctx->priv_data; - - av_freep(&ractx->fdsp); - - return 0; -} - static av_cold int ra288_decode_init(AVCodecContext *avctx) { RA288Context *ractx = avctx->priv_data; + AVFloatDSPContext *fdsp; avctx->channels = 1; avctx->channel_layout = AV_CH_LAYOUT_MONO; @@ -82,9 +75,11 @@ static av_cold int ra288_decode_init(AVCodecContext *avctx) return AVERROR_PATCHWELCOME; } - ractx->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); - if (!ractx->fdsp) + fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); + if (!fdsp) return AVERROR(ENOMEM); + ractx->vector_fmul = fdsp->vector_fmul; + av_free(fdsp); return 0; } @@ -158,7 +153,7 @@ static void do_hybrid_window(RA288Context *ractx, av_assert2(order>=0); - ractx->fdsp->vector_fmul(work, window, hist, FFALIGN(order + n + non_rec, 16)); + ractx->vector_fmul(work, window, hist, FFALIGN(order + n + non_rec, 16)); convolve(buffer1, work + order , n , order); convolve(buffer2, work + order + n, non_rec, order); @@ -185,7 +180,7 @@ static void backward_filter(RA288Context *ractx, do_hybrid_window(ractx, order, n, non_rec, temp, hist, rec, window); if (!compute_lpc_coefs(temp, order, lpc, 0, 1, 1)) - ractx->fdsp->vector_fmul(lpc, lpc, tab, FFALIGN(order, 16)); + ractx->vector_fmul(lpc, lpc, tab, FFALIGN(order, 16)); memmove(hist, hist + n, move_size*sizeof(*hist)); } @@ -249,6 +244,5 @@ AVCodec ff_ra_288_decoder = { .priv_data_size = sizeof(RA288Context), .init = ra288_decode_init, .decode = ra288_decode_frame, - .close = ra288_decode_close, .capabilities = AV_CODEC_CAP_DR1, };