RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-21 15:00:27 +00:00
Code Issues Projects Releases Wiki Activity

wma: convert to lavu/tx

Browse Source 
Converts both the decoder and encoders.
This commit is contained in:
Lynne 2022-11-01 08:45:27 +01:00
parent 6ba0aa1770
commit 978963a77b
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -2992,10 +2992,10 @@ wcmv_decoder_select="inflate_wrapper"
webp_decoder_select="vp8_decoder exif" webp_decoder_select="vp8_decoder exif"
wmalossless_decoder_select="llauddsp" wmalossless_decoder_select="llauddsp"
wmapro_decoder_select="sinewin wma_freqs" wmapro_decoder_select="sinewin wma_freqs"
wmav1_decoder_select="mdct sinewin wma_freqs" wmav1_decoder_select="sinewin wma_freqs"
wmav1_encoder_select="mdct sinewin wma_freqs" wmav1_encoder_select="sinewin wma_freqs"
wmav2_decoder_select="mdct sinewin wma_freqs" wmav2_decoder_select="sinewin wma_freqs"
wmav2_encoder_select="mdct sinewin wma_freqs" wmav2_encoder_select="sinewin wma_freqs"
wmavoice_decoder_select="lsp rdft dct sinewin" wmavoice_decoder_select="lsp rdft dct sinewin"
wmv1_decoder_select="msmpeg4dec" wmv1_decoder_select="msmpeg4dec"
wmv1_encoder_select="msmpeg4enc" wmv1_encoder_select="msmpeg4enc"

2
libavcodec/wma.c
View File

@ -369,7 +369,7 @@ int ff_wma_end(AVCodecContext *avctx)
int i; int i;
for (i = 0; i < s->nb_block_sizes; i++) for (i = 0; i < s->nb_block_sizes; i++)
ff_mdct_end(&s->mdct_ctx[i]); av_tx_uninit(&s->mdct_ctx[i]);
if (s->use_exp_vlc) if (s->use_exp_vlc)
ff_free_vlc(&s->exp_vlc); ff_free_vlc(&s->exp_vlc);

7
libavcodec/wma.h
View File

@ -24,9 +24,9 @@
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/mem_internal.h" #include "libavutil/mem_internal.h"
#include "libavutil/tx.h"
#include "avcodec.h" #include "avcodec.h"
#include "fft.h"
#include "get_bits.h" #include "get_bits.h"
#include "put_bits.h" #include "put_bits.h"
@ -115,8 +115,9 @@ typedef struct WMACodecContext {
float max_exponent[MAX_CHANNELS]; float max_exponent[MAX_CHANNELS];
WMACoef coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE]; WMACoef coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE];
DECLARE_ALIGNED(32, float, coefs)[MAX_CHANNELS][BLOCK_MAX_SIZE]; DECLARE_ALIGNED(32, float, coefs)[MAX_CHANNELS][BLOCK_MAX_SIZE];
DECLARE_ALIGNED(32, FFTSample, output)[BLOCK_MAX_SIZE * 2]; DECLARE_ALIGNED(32, float, output)[BLOCK_MAX_SIZE * 2];
FFTContext mdct_ctx[BLOCK_NB_SIZES]; AVTXContext *mdct_ctx[BLOCK_NB_SIZES];
av_tx_fn mdct_fn[BLOCK_NB_SIZES];
const float *windows[BLOCK_NB_SIZES]; const float *windows[BLOCK_NB_SIZES];
/* output buffer for one frame and the last for IMDCT windowing */ /* output buffer for one frame and the last for IMDCT windowing */
DECLARE_ALIGNED(32, float, frame_out)[MAX_CHANNELS][BLOCK_MAX_SIZE * 2]; DECLARE_ALIGNED(32, float, frame_out)[MAX_CHANNELS][BLOCK_MAX_SIZE * 2];

13
libavcodec/wmadec.c
View File

@ -111,8 +111,9 @@ static av_cold int wma_decode_init(AVCodecContext *avctx)
/* init MDCT */ /* init MDCT */
for (i = 0; i < s->nb_block_sizes; i++) { for (i = 0; i < s->nb_block_sizes; i++) {
ret = ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, float scale = 1.0 / 32768.0;
1, 1.0 / 32768.0); ret = av_tx_init(&s->mdct_ctx[i], &s->mdct_fn[i], AV_TX_FLOAT_MDCT,
1, 1 << (s->frame_len_bits - i), &scale, AV_TX_FULL_IMDCT);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -448,7 +449,8 @@ static int wma_decode_block(WMACodecContext *s)
int coef_nb_bits, total_gain; int coef_nb_bits, total_gain;
int nb_coefs[MAX_CHANNELS]; int nb_coefs[MAX_CHANNELS];
float mdct_norm; float mdct_norm;
FFTContext *mdct; AVTXContext *mdct;
av_tx_fn mdct_fn;
#ifdef TRACE #ifdef TRACE
ff_tlog(s->avctx, "***decode_block: %d:%d\n", ff_tlog(s->avctx, "***decode_block: %d:%d\n",
@ -757,14 +759,15 @@ static int wma_decode_block(WMACodecContext *s)
} }
next: next:
mdct = &s->mdct_ctx[bsize]; mdct = s->mdct_ctx[bsize];
mdct_fn = s->mdct_fn[bsize];
for (ch = 0; ch < channels; ch++) { for (ch = 0; ch < channels; ch++) {
int n4, index; int n4, index;
n4 = s->block_len / 2; n4 = s->block_len / 2;
if (s->channel_coded[ch]) if (s->channel_coded[ch])
mdct->imdct_calc(mdct, s->output, s->coefs[ch]); mdct_fn(mdct, s->output, s->coefs[ch], sizeof(float));
else if (!(s->ms_stereo && ch == 1)) else if (!(s->ms_stereo && ch == 1))
memset(s->output, 0, sizeof(s->output)); memset(s->output, 0, sizeof(s->output));

9
libavcodec/wmaenc.c
View File

@ -92,7 +92,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
/* init MDCT */ /* init MDCT */
for (i = 0; i < s->nb_block_sizes; i++) { for (i = 0; i < s->nb_block_sizes; i++) {
ret = ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 0, 1.0); float scale = 1.0f;
ret = av_tx_init(&s->mdct_ctx[i], &s->mdct_fn[i], AV_TX_FLOAT_MDCT,
0, 1 << (s->frame_len_bits - i), &scale, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -112,7 +114,8 @@ static int apply_window_and_mdct(AVCodecContext *avctx, const AVFrame *frame)
const float *const *audio = (const float *const *) frame->extended_data; const float *const *audio = (const float *const *) frame->extended_data;
int len = frame->nb_samples; int len = frame->nb_samples;
int window_index = s->frame_len_bits - s->block_len_bits; int window_index = s->frame_len_bits - s->block_len_bits;
FFTContext *mdct = &s->mdct_ctx[window_index]; AVTXContext *mdct = s->mdct_ctx[window_index];
av_tx_fn mdct_fn = s->mdct_fn[window_index];
int ch; int ch;
const float *win = s->windows[window_index]; const float *win = s->windows[window_index];
int window_len = 1 << s->block_len_bits; int window_len = 1 << s->block_len_bits;
@ -124,7 +127,7 @@ static int apply_window_and_mdct(AVCodecContext *avctx, const AVFrame *frame)
s->fdsp->vector_fmul_reverse(&s->output[window_len], s->frame_out[ch], s->fdsp->vector_fmul_reverse(&s->output[window_len], s->frame_out[ch],
win, len); win, len);
s->fdsp->vector_fmul(s->frame_out[ch], s->frame_out[ch], win, len); s->fdsp->vector_fmul(s->frame_out[ch], s->frame_out[ch], win, len);
mdct->mdct_calc(mdct, s->coefs[ch], s->output); mdct_fn(mdct, s->coefs[ch], s->output, sizeof(float));
if (!isfinite(s->coefs[ch][0])) { if (!isfinite(s->coefs[ch][0])) {
av_log(avctx, AV_LOG_ERROR, "Input contains NaN/+-Inf\n"); av_log(avctx, AV_LOG_ERROR, "Input contains NaN/+-Inf\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);