[SCM] libav/experimental: fft: Convert FFT/MDCT permutation type #defines to enums
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:54 UTC 2014
The following commit has been merged in the experimental branch:
commit 24af1aa0f70362a66cda04c9d7cd012e019f5572
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Feb 18 11:52:42 2014 +0100
fft: Convert FFT/MDCT permutation type #defines to enums
diff --git a/libavcodec/fft.h b/libavcodec/fft.h
index 130bbca..7daae24 100644
--- a/libavcodec/fft.h
+++ b/libavcodec/fft.h
@@ -59,6 +59,17 @@ typedef struct FFTDComplex {
/* FFT computation */
+enum fft_permutation_type {
+ FF_FFT_PERM_DEFAULT,
+ FF_FFT_PERM_SWAP_LSBS,
+ FF_FFT_PERM_AVX,
+};
+
+enum mdct_permutation_type {
+ FF_MDCT_PERM_NONE,
+ FF_MDCT_PERM_INTERLEAVE,
+};
+
struct FFTContext {
int nbits;
int inverse;
@@ -82,13 +93,8 @@ struct FFTContext {
void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input);
void (*mdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input);
void (*mdct_calcw)(struct FFTContext *s, FFTDouble *output, const FFTSample *input);
- int fft_permutation;
-#define FF_FFT_PERM_DEFAULT 0
-#define FF_FFT_PERM_SWAP_LSBS 1
-#define FF_FFT_PERM_AVX 2
- int mdct_permutation;
-#define FF_MDCT_PERM_NONE 0
-#define FF_MDCT_PERM_INTERLEAVE 1
+ enum fft_permutation_type fft_permutation;
+ enum mdct_permutation_type mdct_permutation;
};
#if CONFIG_HARDCODED_TABLES
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list