From patchwork Thu Aug 3 16:31:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 43112 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b914:b0:130:ccc6:6c4b with SMTP id fe20csp49525pzb; Thu, 3 Aug 2023 09:31:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlEMsdym7XFKfEsr88Va7Q4dNP3ouxmS02cHyKytRrJNBHekyaB9ztxrBpHrOJf4x7YHAH46 X-Received: by 2002:a17:906:7696:b0:988:b61e:4219 with SMTP id o22-20020a170906769600b00988b61e4219mr12020084ejm.29.1691080294740; Thu, 03 Aug 2023 09:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691080294; cv=none; d=google.com; s=arc-20160816; b=l7zZt8Gx8yWDAKcD/7ZlGx0w4epkg9Kde037RUvKdpwPW1zmtFw4Me3Q+r26kULMzD /QdxoEC409aHlMHIEdoKlY/BMamfgZ94TjTbuARstgbWtD3oFeArk2vC72d3L3uI8qAS ELe/FoeMksmwwWd4c1pZuIWqDMihvi3nZFtIFibRBIScMbSjDCMNA4+pXMioQqYJWen2 3oQG5jTwi40mjKoRwQ9x153xEq/76TpfSj4Ad20atTGcZxlE0r+PT2l6A/kqQs5rfxoG Ky6YoFC2GL0C7LmO7Ukva2JSk5YqvdCMll5smoJYAmlCkIcAsygruNPppCKz+DOoJP39 ntfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:to:from:date :dkim-signature:delivered-to; bh=IITely3cClWw+gG1AX9a4IZOirqy/vIK56KdteCSchw=; fh=awftJPkKIDcYG+GZSKK7EGrS2s4rqD3QuLTgwd5DXmc=; b=sJyRRV9XSPTlWF0CfBcIjFdEjmUsEJgx6KVOrS7EOuZzVCeC68vrkjrsr2JCz7TJ+D MtQsVYJfW7oUMFWpmUWXvaDX/Y9L0LPGR2Zxr2LHv73QQF+aREMr9ouBzIiUldzPZxIa gunlRKFnqF4KJYc3+5s19OEpHCDY06BCytLIzWkeISrWZ2sD7brvnLnUScnL3F1sDhvz QwIW5BtYI2qZYmC72P1ahVSmJNkhvDDjR+jZ12SPTtwDxfhSpp49pYF/slYD2rNx0riL i1HRkBMsQqtKk6rkx4LoIpVSmF+IMlD4KHKbj6EbPaP8DI0HdQHXzwbNgtU0YYTfTUW1 tmqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=25TiQz3U; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b15-20020a1709063f8f00b00991ece4c95esi46734ejj.487.2023.08.03.09.31.34; Thu, 03 Aug 2023 09:31:34 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=25TiQz3U; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75EF868C6CF; Thu, 3 Aug 2023 19:31:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C5B568ADCE for ; Thu, 3 Aug 2023 19:31:24 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 51A3810602D9 for ; Thu, 3 Aug 2023 16:31:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1691080283; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=JksDmHyx2i1j8+1UYTEECRCHh5NQN9bfbFECkfewZMg=; b=25TiQz3UNp3qPziOjrsj8nrLvpCqeMSNtv7ns7HDzmNFtAKIPpLbRoZngRPQxzyY pQiYp8opaCZ8f4ILcJc8WjmhnA0OeoJgyRp7vKQIDrTMEpHzpdYqv4Wftf9ytHdcZHn izmXqQkVuC6/4H0iSMJQVCb2YDRGxxNXW7+94bh4HfwtITypNxR9mBjXwwblk3MdcDU X+nUeW2evQ8G/n+uW70U9LX3QgfoeaGVkG/1Y3DhxR4olXbIh4SQJWygMz/82JOz1gb iQDBxVTIfYa+m8h8saTlDeK3TlSRQmNTLFmoVHr8NL8lxi0xQQAvCESkgw7+1ocGgte BXhunggX3g== Date: Thu, 3 Aug 2023 18:31:23 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavu/tx: add DCT-I and DST-I transforms 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TKgELo24wNQq These are true, actual DCT-I and DST-I transforms, unlike the libavcodec versions, which are plainly not. Error tests via https://github.com/cyanreg/lavu_fft_test RMS error on a 2048-sample DCT-I: RMSE   av_tx = 0.000000 (4096 matches, first mismatch at -1) RMSE  fftw3f = 0.000000 (4096 matches, first mismatch at -1) RMSE   avfft = 0.011440 (0 matches, first mismatch at 0) RMS error on a 2048-sample DST-I: RMSE   av_tx = 0.000000 (4096 matches, first mismatch at -1) RMSE  fftw3f = 0.000000 (4096 matches, first mismatch at -1) RMSE   avfft = 0.015316 (0 matches, first mismatch at 0) From 0bbe264a0c597a5a871ffc2bfea06e717bc9e0a1 Mon Sep 17 00:00:00 2001 From: Lynne Date: Thu, 3 Aug 2023 18:23:02 +0200 Subject: [PATCH 2/2] lavu/tx: add DCT-I and DST-I transforms These are true, actual DCT-I and DST-I transforms, unlike the libavcodec versions, which are plainly not. --- libavutil/tx.h | 24 ++++++++++ libavutil/tx_template.c | 103 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/libavutil/tx.h b/libavutil/tx.h index d178e8ee9d..4696988cae 100644 --- a/libavutil/tx.h +++ b/libavutil/tx.h @@ -105,6 +105,30 @@ enum AVTXType { AV_TX_DOUBLE_DCT = 10, AV_TX_INT32_DCT = 11, + /** + * Discrete Cosine Transform I + * + * The forward transform is a DCT-I. + * The inverse transform is a DCT-I multiplied by 2/(N + 1). + * + * The input array is always overwritten. + */ + AV_TX_FLOAT_DCT_I = 12, + AV_TX_DOUBLE_DCT_I = 13, + AV_TX_INT32_DCT_I = 14, + + /** + * Discrete Sine Transform I + * + * The forward transform is a DST-I. + * The inverse transform is a DST-I multiplied by 2/(N + 1). + * + * The input array is always overwritten. + */ + AV_TX_FLOAT_DST_I = 15, + AV_TX_DOUBLE_DST_I = 16, + AV_TX_INT32_DST_I = 17, + /* Not part of the API, do not use */ AV_TX_NB, }; diff --git a/libavutil/tx_template.c b/libavutil/tx_template.c index 50c65d00b5..9bdac1e57d 100644 --- a/libavutil/tx_template.c +++ b/libavutil/tx_template.c @@ -2004,6 +2004,107 @@ static const FFTXCodelet TX_NAME(ff_tx_dctIII_def) = { .prio = FF_TX_PRIO_BASE, }; +static av_cold int TX_NAME(ff_tx_dcstI_init)(AVTXContext *s, + const FFTXCodelet *cd, + uint64_t flags, + FFTXCodeletOptions *opts, + int len, int inv, + const void *scale) +{ + int ret; + SCALE_TYPE rsc = *((SCALE_TYPE *)scale); + + if (0 && inv) { + len *= 2; + s->len *= 2; + rsc *= 0.5; + } + + /* We want a half-complex RDFT */ + flags |= cd->type == TX_TYPE(DCT_I) ? AV_TX_REAL_TO_REAL : + AV_TX_REAL_TO_IMAGINARY; + + if ((ret = ff_tx_init_subtx(s, TX_TYPE(RDFT), flags, NULL, + (len - 1 + 2*(cd->type == TX_TYPE(DST_I)))*2, + 0, &rsc))) + return ret; + + s->tmp = av_mallocz((len + 1)*2*sizeof(TXSample)); + if (!s->tmp) + return AVERROR(ENOMEM); + + return 0; +} + +static void TX_NAME(ff_tx_dctI)(AVTXContext *s, void *_dst, + void *_src, ptrdiff_t stride) +{ + TXSample *dst = _dst; + TXSample *src = _src; + const int len = s->len - 1; + TXSample *tmp = (TXSample *)s->tmp; + + stride /= sizeof(TXSample); + + for (int i = 0; i < len; i++) + tmp[i] = tmp[2*len - i] = src[i * stride]; + + tmp[len] = src[len * stride]; /* Middle */ + + s->fn[0](&s->sub[0], dst, tmp, sizeof(TXSample)); +} + +static void TX_NAME(ff_tx_dstI)(AVTXContext *s, void *_dst, + void *_src, ptrdiff_t stride) +{ + TXSample *dst = _dst; + TXSample *src = _src; + const int len = s->len + 1; + TXSample *tmp = (void *)s->tmp; + + stride /= sizeof(TXSample); + + tmp[0] = 0; + + for (int i = 1; i < len; i++) { + TXSample a = src[(i - 1) * stride]; + tmp[i] = -a; + tmp[2*len - i] = a; + } + + tmp[len] = 0; /* i == n, Nyquist */ + + s->fn[0](&s->sub[0], dst, tmp, sizeof(float)); +} + +static const FFTXCodelet TX_NAME(ff_tx_dctI_def) = { + .name = TX_NAME_STR("dctI"), + .function = TX_NAME(ff_tx_dctI), + .type = TX_TYPE(DCT_I), + .flags = AV_TX_UNALIGNED | AV_TX_INPLACE | FF_TX_OUT_OF_PLACE, + .factors = { 2, TX_FACTOR_ANY }, + .nb_factors = 2, + .min_len = 2, + .max_len = TX_LEN_UNLIMITED, + .init = TX_NAME(ff_tx_dcstI_init), + .cpu_flags = FF_TX_CPU_FLAGS_ALL, + .prio = FF_TX_PRIO_BASE, +}; + +static const FFTXCodelet TX_NAME(ff_tx_dstI_def) = { + .name = TX_NAME_STR("dstI"), + .function = TX_NAME(ff_tx_dstI), + .type = TX_TYPE(DST_I), + .flags = AV_TX_UNALIGNED | AV_TX_INPLACE | FF_TX_OUT_OF_PLACE, + .factors = { 2, TX_FACTOR_ANY }, + .nb_factors = 2, + .min_len = 2, + .max_len = TX_LEN_UNLIMITED, + .init = TX_NAME(ff_tx_dcstI_init), + .cpu_flags = FF_TX_CPU_FLAGS_ALL, + .prio = FF_TX_PRIO_BASE, +}; + int TX_TAB(ff_tx_mdct_gen_exp)(AVTXContext *s, int *pre_tab) { int off = 0; @@ -2101,6 +2202,8 @@ const FFTXCodelet * const TX_NAME(ff_tx_codelet_list)[] = { &TX_NAME(ff_tx_rdft_c2r_def), &TX_NAME(ff_tx_dctII_def), &TX_NAME(ff_tx_dctIII_def), + &TX_NAME(ff_tx_dctI_def), + &TX_NAME(ff_tx_dstI_def), NULL, }; -- 2.40.1