ffmpeg | branch: master | Peter Ross <[email protected]> | Thu Feb 15 07:42:19
2024 +1100| [a2cfd6062c61e32fe95e872bcd76aabe63201162] | committer: Peter Ross
av_tx_init: accept NULL scale for RDFT
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.
Reviewed-by: Lynne <[email protected]>
Signed-off-by: Peter Ross <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2cfd6062c61e32fe95e872bcd76aabe63201162
---
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);
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
