virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

twinvq: convert to lavu/tx

Browse Source
This commit is contained in:
Lynne 2022-10-29 11:05:06 +02:00
parent 60c704677a
commit 7af43a46d9
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -2876,7 +2876,7 @@ lscr_decoder_select="inflate_wrapper"
magicyuv_decoder_select="llviddsp" magicyuv_decoder_select="llviddsp"
magicyuv_encoder_select="llvidencdsp" magicyuv_encoder_select="llvidencdsp"
mdec_decoder_select="blockdsp bswapdsp idctdsp" mdec_decoder_select="blockdsp bswapdsp idctdsp"
metasound_decoder_select="lsp mdct sinewin" metasound_decoder_select="lsp sinewin"
mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables" mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables"
mjpeg_encoder_select="jpegtables mpegvideoenc" mjpeg_encoder_select="jpegtables mpegvideoenc"
@ -2974,7 +2974,7 @@ truehd_encoder_select="lpc audio_frame_queue"
truemotion2_decoder_select="bswapdsp" truemotion2_decoder_select="bswapdsp"
truespeech_decoder_select="bswapdsp" truespeech_decoder_select="bswapdsp"
tscc_decoder_select="inflate_wrapper" tscc_decoder_select="inflate_wrapper"
twinvq_decoder_select="mdct lsp sinewin" twinvq_decoder_select="lsp sinewin"
txd_decoder_select="texturedsp" txd_decoder_select="texturedsp"
utvideo_decoder_select="bswapdsp llviddsp" utvideo_decoder_select="bswapdsp llviddsp"
utvideo_encoder_select="bswapdsp huffman llvidencdsp" utvideo_encoder_select="bswapdsp huffman llvidencdsp"

12
libavcodec/twinvq.c
View File

@ -329,7 +329,8 @@ static const uint8_t wtype_to_wsize[] = { 0, 0, 2, 2, 2, 1, 0, 1, 1 };
static void imdct_and_window(TwinVQContext *tctx, enum TwinVQFrameType ftype, static void imdct_and_window(TwinVQContext *tctx, enum TwinVQFrameType ftype,
int wtype, float *in, float *prev, int ch) int wtype, float *in, float *prev, int ch)
{ {
FFTContext *mdct = &tctx->mdct_ctx[ftype]; AVTXContext *tx = tctx->tx[ftype];
av_tx_fn tx_fn = tctx->tx_fn[ftype];
const TwinVQModeTab *mtab = tctx->mtab; const TwinVQModeTab *mtab = tctx->mtab;
int bsize = mtab->size / mtab->fmode[ftype].sub; int bsize = mtab->size / mtab->fmode[ftype].sub;
int size = mtab->size; int size = mtab->size;
@ -358,7 +359,7 @@ static void imdct_and_window(TwinVQContext *tctx, enum TwinVQFrameType ftype,
wsize = types_sizes[wtype_to_wsize[sub_wtype]]; wsize = types_sizes[wtype_to_wsize[sub_wtype]];
mdct->imdct_half(mdct, buf1 + bsize * j, in + bsize * j); tx_fn(tx, buf1 + bsize * j, in + bsize * j, sizeof(float));
tctx->fdsp->vector_fmul_window(out2, prev_buf + (bsize - wsize) / 2, tctx->fdsp->vector_fmul_window(out2, prev_buf + (bsize - wsize) / 2,
buf1 + bsize * j, buf1 + bsize * j,
@ -544,8 +545,9 @@ static av_cold int init_mdct_win(TwinVQContext *tctx)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
int bsize = tctx->mtab->size / tctx->mtab->fmode[i].sub; int bsize = tctx->mtab->size / tctx->mtab->fmode[i].sub;
if ((ret = ff_mdct_init(&tctx->mdct_ctx[i], av_log2(bsize) + 1, 1, const float scale = -sqrt(norm / bsize) / (1 << 15);
-sqrt(norm / bsize) / (1 << 15)))) if ((ret = av_tx_init(&tctx->tx[i], &tctx->tx_fn[i], AV_TX_FLOAT_MDCT,
1, bsize, &scale, 0)))
return ret; return ret;
} }
@ -746,7 +748,7 @@ av_cold int ff_twinvq_decode_close(AVCodecContext *avctx)
int i; int i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
ff_mdct_end(&tctx->mdct_ctx[i]); av_tx_uninit(&tctx->tx[i]);
av_freep(&tctx->cos_tabs[i]); av_freep(&tctx->cos_tabs[i]);
} }

6
libavcodec/twinvq.h
View File

@ -26,10 +26,11 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes_internal.h" #include "libavutil/attributes_internal.h"
#include "libavutil/tx.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "avcodec.h" #include "avcodec.h"
#include "fft.h" #include "internal.h"
enum TwinVQCodec { enum TwinVQCodec {
TWINVQ_CODEC_VQF, TWINVQ_CODEC_VQF,
@ -137,7 +138,8 @@ typedef struct TwinVQModeTab {
typedef struct TwinVQContext { typedef struct TwinVQContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFloatDSPContext *fdsp; AVFloatDSPContext *fdsp;
FFTContext mdct_ctx[3]; AVTXContext *tx[3];
av_tx_fn tx_fn[3];
const TwinVQModeTab *mtab; const TwinVQModeTab *mtab;