diff mbox series

[FFmpeg-devel] av_tx_init: accept NULL scale for RDFT

Message ID d2376b9f4c863f830bf47906c078e54d2d5da325.1707943448.git.pross@xvid.org
State Accepted
Commit a2cfd6062c61e32fe95e872bcd76aabe63201162
Headers show
Series [FFmpeg-devel] av_tx_init: accept NULL scale for RDFT | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Peter Ross Feb. 14, 2024, 8:44 p.m. UTC 
Make av_tx_init() agree with documentation:

     * Real to complex and complex to real DFTs.
     * For the float and int32 variants, the scale type is 'float', while for
     * the double variant, it's a 'double'. If scale is NULL, 1.0 will be used
     * as a default.
---
 libavutil/tx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Lynne Feb. 15, 2024, 1:18 a.m. UTC | #1 
Feb 14, 2024, 21:45 by pross@xvid.org:

> Make av_tx_init() agree with documentation:
>
>  * Real to complex and complex to real DFTs.
>  * For the float and int32 variants, the scale type is 'float', while for
>  * the double variant, it's a 'double'. If scale is NULL, 1.0 will be used
>  * as a default.
> ---
>  libavutil/tx.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavutil/tx.c b/libavutil/tx.c
> index d6740071b9..cc360cff31 100644
> --- a/libavutil/tx.c
> +++ b/libavutil/tx.c
> @@ -914,9 +914,9 @@ av_cold int av_tx_init(AVTXContext **ctx, av_tx_fn *tx, enum AVTXType type,
>  if (!(flags & AV_TX_INPLACE))
>  flags |= FF_TX_OUT_OF_PLACE;
>  
> -    if (!scale && ((type == AV_TX_FLOAT_MDCT) || (type == AV_TX_INT32_MDCT)))
> +    if (!scale && ((type == AV_TX_FLOAT_MDCT) || (type == AV_TX_INT32_MDCT) || (type == AV_TX_FLOAT_RDFT) || (AV_TX_INT32_RDFT)))
>  scale = &default_scale_f;
> -    else if (!scale && (type == AV_TX_DOUBLE_MDCT))
> +    else if (!scale && ((type == AV_TX_DOUBLE_MDCT) || (type == AV_TX_DOUBLE_RDFT)))
>  scale = &default_scale_d;
>  
>  ret = ff_tx_init_subtx(&tmp, type, flags, NULL, len, inv, scale);
>

LGTM
thnx
diff mbox series

Patch

diff --git a/libavutil/tx.c b/libavutil/tx.c
index d6740071b9..cc360cff31 100644
--- a/libavutil/tx.c
+++ b/libavutil/tx.c
@@ -914,9 +914,9 @@  av_cold int av_tx_init(AVTXContext **ctx, av_tx_fn *tx, enum AVTXType type,
     if (!(flags & AV_TX_INPLACE))
         flags |= FF_TX_OUT_OF_PLACE;
 
-    if (!scale && ((type == AV_TX_FLOAT_MDCT) || (type == AV_TX_INT32_MDCT)))
+    if (!scale && ((type == AV_TX_FLOAT_MDCT) || (type == AV_TX_INT32_MDCT) || (type == AV_TX_FLOAT_RDFT) || (AV_TX_INT32_RDFT)))
         scale = &default_scale_f;
-    else if (!scale && (type == AV_TX_DOUBLE_MDCT))
+    else if (!scale && ((type == AV_TX_DOUBLE_MDCT) || (type == AV_TX_DOUBLE_RDFT)))
         scale = &default_scale_d;
 
     ret = ff_tx_init_subtx(&tmp, type, flags, NULL, len, inv, scale);