From patchwork Sun Sep 13 02:57:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22323 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 0C2A0449E91 for ; Sun, 13 Sep 2020 05:58:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E559B68BBFE; Sun, 13 Sep 2020 05:58:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88AD468BBC7 for ; Sun, 13 Sep 2020 05:58:26 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id a17so15069633wrn.6 for ; Sat, 12 Sep 2020 19:58:26 -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=bptT+kB88xyxhv0+TZVZo2IclLDw221GtWJOVtpaeOU=; b=dptM/2VKeWlQod9PIwwxDGrxFu7sKd2wKQft06yYwF0MwFr7xtNUjV46/cDD8jdtAj n4JgtaBXqCGCbgFMCPBzhxVYLwy26kOTBdxQeWVELnhwo77g4+4pJWw82T0qpm0McJGj KidhI3W4eNj5GEX1TBeXcmhPj6ngtA6TKZn3B02oJFMaJ06jTbdMNfFZ3arH8tDcNGth GKuqcr0c5aLMcxJHSpo4/TCn2Zz9SQUGjG0CtOVBkmfmXjcswEvzqDCsdIRfnBsgc2iZ Pmh4nW6J4awyHKCjQ/wcubWbRmNEqmmEz5XzLepBY7xxO0btrn9NqgVWBJcRga3GWTl1 GFbA== 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=bptT+kB88xyxhv0+TZVZo2IclLDw221GtWJOVtpaeOU=; b=XLmETZhqQDCAtuHZhk41yeYnbDiM/iUZRTD0oVSKn3NKalvibZyeqMKGQB6tzf8ohs Ty7CrOnZ/gTP2X12GySci8TtBZL7jNJl+8J3yQcDUD4rucjt9j3p2Zh0WZX5MbD8Hsyu fddh+Pi7mbCz1ssMou9kZpXmYc7aEUG+XkLkh8s40cVMOyZzaCvw5rC3Xj5LX7s81riu mFgrwwWixBSsX0Vdm4ndE1wNAzZDRaT2OIJ+Wy4Lzdcicxpy86LcHvbsWlVtRQCcNwMl DakAmBEfRL5Gd4nzgVeHJVDW1bkI+5dR85NKtyQyNRa/TVyXh4JZ92Zvfdc1yFnsbAMI iUNA== X-Gm-Message-State: AOAM533x2D9PfyeuMRAA5YAH90a40Cu+SawqXW82vTlcjLT+v6VLtZTJ VxS4OZRYslLjuSk+r6O/iwSxbqFYWTs= X-Google-Smtp-Source: ABdhPJxYm4F3YB4kIEmRpIIB7Esg9fL4ga4AAsmIJq0U6I8JW6fuxACRTrUCyEtnqLg/jo0Mf3dJ2A== X-Received: by 2002:adf:f0c3:: with SMTP id x3mr9026861wro.163.1599965905785; 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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 19:58:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 04:57:44 +0200 Message-Id: <20200913025753.274772-7-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 07/16] avcodec/pcm: 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 decoders' close function. Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 96a68f7fe8..12d1b3a2c3 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -235,13 +235,15 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, typedef struct PCMDecode { short table[256]; - AVFloatDSPContext *fdsp; + void (*vector_fmul_scalar)(float *dst, const float *src, float mul, + int len); float scale; } PCMDecode; static av_cold int pcm_decode_init(AVCodecContext *avctx) { PCMDecode *s = avctx->priv_data; + AVFloatDSPContext *fdsp; int i; if (avctx->channels <= 0) { @@ -268,9 +270,11 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; s->scale = 1. / (1 << (avctx->bits_per_coded_sample - 1)); - s->fdsp = avpriv_float_dsp_alloc(0); - if (!s->fdsp) + fdsp = avpriv_float_dsp_alloc(0); + if (!fdsp) return AVERROR(ENOMEM); + s->vector_fmul_scalar = fdsp->vector_fmul_scalar; + av_free(fdsp); break; default: break; @@ -284,15 +288,6 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx) return 0; } -static av_cold int pcm_decode_close(AVCodecContext *avctx) -{ - PCMDecode *s = avctx->priv_data; - - av_freep(&s->fdsp); - - return 0; -} - /** * Read PCM samples macro * @param size Data size of native machine format @@ -529,9 +524,9 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, if (avctx->codec_id == AV_CODEC_ID_PCM_F16LE || avctx->codec_id == AV_CODEC_ID_PCM_F24LE) { - s->fdsp->vector_fmul_scalar((float *)frame->extended_data[0], - (const float *)frame->extended_data[0], - s->scale, FFALIGN(frame->nb_samples * avctx->channels, 4)); + s->vector_fmul_scalar((float *)frame->extended_data[0], + (const float *)frame->extended_data[0], + s->scale, FFALIGN(frame->nb_samples * avctx->channels, 4)); emms_c(); } @@ -570,7 +565,6 @@ AVCodec ff_ ## name_ ## _decoder = { \ .id = AV_CODEC_ID_ ## id_, \ .priv_data_size = sizeof(PCMDecode), \ .init = pcm_decode_init, \ - .close = pcm_decode_close, \ .decode = pcm_decode_frame, \ .capabilities = AV_CODEC_CAP_DR1, \ .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \