RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nellymoserdec: convert to lavu/tx

This commit is contained in:
Lynne 2022-10-30 11:50:41 +01:00
parent b428003c1c
commit 61e1a7d958
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -2913,7 +2913,7 @@ mv30_decoder_select="aandcttables blockdsp"
mvha_decoder_select="inflate_wrapper llviddsp" mvha_decoder_select="inflate_wrapper llviddsp"
mwsc_decoder_select="inflate_wrapper" mwsc_decoder_select="inflate_wrapper"
mxpeg_decoder_select="mjpeg_decoder" mxpeg_decoder_select="mjpeg_decoder"
nellymoser_decoder_select="mdct sinewin" nellymoser_decoder_select="sinewin"
nellymoser_encoder_select="audio_frame_queue mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin"
notchlc_decoder_select="lzf" notchlc_decoder_select="lzf"
nuv_decoder_select="idctdsp" nuv_decoder_select="idctdsp"

18
libavcodec/nellymoserdec.c
View File

@ -35,12 +35,12 @@
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "libavutil/mem_internal.h" #include "libavutil/mem_internal.h"
#include "libavutil/tx.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "codec_internal.h" #include "codec_internal.h"
#include "decode.h" #include "decode.h"
#include "fft.h"
#include "get_bits.h" #include "get_bits.h"
#include "nellymoser.h" #include "nellymoser.h"
#include "sinewin.h" #include "sinewin.h"
@ -52,7 +52,8 @@ typedef struct NellyMoserDecodeContext {
GetBitContext gb; GetBitContext gb;
float scale_bias; float scale_bias;
AVFloatDSPContext *fdsp; AVFloatDSPContext *fdsp;
FFTContext imdct_ctx; AVTXContext *imdct_ctx;
av_tx_fn imdct_fn;
DECLARE_ALIGNED(32, float, imdct_buf)[2][NELLY_BUF_LEN]; DECLARE_ALIGNED(32, float, imdct_buf)[2][NELLY_BUF_LEN];
float *imdct_out; float *imdct_out;
float *imdct_prev; float *imdct_prev;
@ -105,7 +106,7 @@ static void nelly_decode_block(NellyMoserDecodeContext *s,
memset(&aptr[NELLY_FILL_LEN], 0, memset(&aptr[NELLY_FILL_LEN], 0,
(NELLY_BUF_LEN - NELLY_FILL_LEN) * sizeof(float)); (NELLY_BUF_LEN - NELLY_FILL_LEN) * sizeof(float));
s->imdct_ctx.imdct_half(&s->imdct_ctx, s->imdct_out, aptr); s->imdct_fn(s->imdct_ctx, s->imdct_out, aptr, sizeof(float));
s->fdsp->vector_fmul_window(aptr, s->imdct_prev + NELLY_BUF_LEN / 2, s->fdsp->vector_fmul_window(aptr, s->imdct_prev + NELLY_BUF_LEN / 2,
s->imdct_out, ff_sine_128, s->imdct_out, ff_sine_128,
NELLY_BUF_LEN / 2); NELLY_BUF_LEN / 2);
@ -113,14 +114,19 @@ static void nelly_decode_block(NellyMoserDecodeContext *s,
} }
} }
static av_cold int decode_init(AVCodecContext * avctx) { static av_cold int decode_init(AVCodecContext * avctx)
{
int ret;
float scale = 1.0f;
NellyMoserDecodeContext *s = avctx->priv_data; NellyMoserDecodeContext *s = avctx->priv_data;
s->avctx = avctx; s->avctx = avctx;
s->imdct_out = s->imdct_buf[0]; s->imdct_out = s->imdct_buf[0];
s->imdct_prev = s->imdct_buf[1]; s->imdct_prev = s->imdct_buf[1];
av_lfg_init(&s->random_state, 0); av_lfg_init(&s->random_state, 0);
ff_mdct_init(&s->imdct_ctx, 8, 1, 1.0); if ((ret = av_tx_init(&s->imdct_ctx, &s->imdct_fn, AV_TX_FLOAT_MDCT,
1, 128, &scale, 0)) < 0)
return ret;
s->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); s->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT);
if (!s->fdsp) if (!s->fdsp)
@ -179,7 +185,7 @@ static int decode_tag(AVCodecContext *avctx, AVFrame *frame,
static av_cold int decode_end(AVCodecContext * avctx) { static av_cold int decode_end(AVCodecContext * avctx) {
NellyMoserDecodeContext *s = avctx->priv_data; NellyMoserDecodeContext *s = avctx->priv_data;
ff_mdct_end(&s->imdct_ctx); av_tx_uninit(&s->imdct_ctx);
av_freep(&s->fdsp); av_freep(&s->fdsp);
return 0; return 0;