xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-27 21:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3'

Browse Source 
* commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3':
  Rename CONFIG_FFT_FLOAT ---> FFT_FLOAT

Conflicts:
	libavcodec/fft-internal.h
	libavcodec/fft-test.c
	libavcodec/fft_fixed.c
	libavcodec/fft_float.c
	libavcodec/fft_template.c
	libavcodec/mdct_fixed.c
	libavcodec/mdct_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-07 13:04:09 +01:00
commit 7778979f6f
16 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ac3enc_fixed.c
View File

@ -26,7 +26,7 @@
* fixed-point AC-3 encoder.
*/
#define CONFIG_FFT_FLOAT 0
#define FFT_FLOAT 0
#undef CONFIG_AC3ENC_FLOAT
#include "internal.h"
#include "ac3enc.h"

2
libavcodec/arm/fft_fixed_init_arm.c
View File

@ -20,7 +20,7 @@
#include "libavutil/arm/cpu.h"
#define CONFIG_FFT_FLOAT 0
#define FFT_FLOAT 0
#include "libavcodec/fft.h"
void ff_fft_fixed_calc_neon(FFTContext *s, FFTComplex *z);

2
libavcodec/cos_tablegen.c
View File

@ -57,7 +57,7 @@ int main(int argc, char *argv[])
double (*func)(double) = do_sin ? sin : cos;
printf("/* This file was automatically generated. */\n");
printf("#define CONFIG_FFT_FLOAT %d\n", !fixed);
printf("#define FFT_FLOAT %d\n", !fixed);
printf("#include \"libavcodec/%s\"\n", do_sin ? "rdft.h" : "fft.h");
for (i = 4; i <= BITS; i++) {
int m = 1 << i;

2
libavcodec/fft-fixed-test.c
View File

@ -16,5 +16,5 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 0
#define FFT_FLOAT 0
#include "fft-test.c"

2
libavcodec/fft-fixed32-test.c
View File

@ -16,6 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 0
#define FFT_FLOAT 0
#define CONFIG_FFT_FIXED_32 1
#include "fft-test.c"

4
libavcodec/fft-internal.h
View File

@ -19,7 +19,7 @@
#ifndef AVCODEC_FFT_INTERNAL_H
#define AVCODEC_FFT_INTERNAL_H
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
#define FIX15(v) (v)
#define sqrthalf (float)M_SQRT1_2
@ -81,7 +81,7 @@ void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input);
#endif /* CONFIG_FFT_FIXED_32 */
#endif /* CONFIG_FFT_FLOAT */
#endif /* FFT_FLOAT */
#define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c)
#define ff_imdct_half_c FFT_NAME(ff_imdct_half_c)

16
libavcodec/fft-test.c
View File

@ -29,7 +29,7 @@
#include "libavutil/log.h"
#include "libavutil/time.h"
#include "fft.h"
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
#include "dct.h"
#include "rdft.h"
#endif
@ -51,7 +51,7 @@
pim += (MUL16(are, bim) + MUL16(bre, aim));\
}
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
# define RANGE 1.0
# define REF_SCALE(x, bits) (x)
# define FMT "%10.6f"
@ -152,7 +152,7 @@ static void mdct_ref(FFTSample *output, FFTSample *input, int nbits)
}
}
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
static void idct_ref(FFTSample *output, FFTSample *input, int nbits)
{
int n = 1<<nbits;
@ -252,7 +252,7 @@ int main(int argc, char **argv)
int do_inverse = 0;
FFTContext s1, *s = &s1;
FFTContext m1, *m = &m1;
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
RDFTContext r1, *r = &r1;
DCTContext d1, *d = &d1;
int fft_size_2;
@ -326,7 +326,7 @@ int main(int argc, char **argv)
ff_fft_init(s, fft_nbits, do_inverse);
fft_ref_init(fft_nbits, do_inverse);
break;
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
case TRANSFORM_RDFT:
if (do_inverse)
av_log(NULL, AV_LOG_INFO,"IDFT_C2R");
@ -383,7 +383,7 @@ int main(int argc, char **argv)
fft_ref(tab_ref, tab1, fft_nbits);
err = check_diff((FFTSample *)tab_ref, (FFTSample *)tab, fft_size * 2, 1.0);
break;
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
case TRANSFORM_RDFT:
fft_size_2 = fft_size >> 1;
if (do_inverse) {
@ -452,7 +452,7 @@ int main(int argc, char **argv)
memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
s->fft_calc(s, tab);
break;
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
case TRANSFORM_RDFT:
memcpy(tab2, tab1, fft_size * sizeof(FFTSample));
r->rdft_calc(r, tab2);
@ -482,7 +482,7 @@ int main(int argc, char **argv)
case TRANSFORM_FFT:
ff_fft_end(s);
break;
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
case TRANSFORM_RDFT:
ff_rdft_end(r);
break;

8
libavcodec/fft.h
View File

@ -22,8 +22,8 @@
#ifndef AVCODEC_FFT_H
#define AVCODEC_FFT_H
#ifndef CONFIG_FFT_FLOAT
#define CONFIG_FFT_FLOAT 1
#ifndef FFT_FLOAT
#define FFT_FLOAT 1
#endif
#ifndef CONFIG_FFT_FIXED_32
@ -34,7 +34,7 @@
#include "config.h"
#include "libavutil/mem.h"
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
#include "avfft.h"
@ -66,7 +66,7 @@ typedef struct FFTComplex {
typedef int FFTDouble;
typedef struct FFTContext FFTContext;
#endif /* CONFIG_FFT_FLOAT */
#endif /* FFT_FLOAT */
typedef struct FFTDComplex {
FFTDouble re, im;

2
libavcodec/fft_fixed.c
View File

@ -16,6 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 0
#define FFT_FLOAT 0
#define CONFIG_FFT_FIXED_32 0
#include "fft_template.c"

2
libavcodec/fft_fixed_32.c
View File

@ -47,6 +47,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 0
#define FFT_FLOAT 0
#define CONFIG_FFT_FIXED_32 1
#include "fft_template.c"

2
libavcodec/fft_float.c
View File

@ -16,6 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 1
#define FFT_FLOAT 1
#define CONFIG_FFT_FIXED_32 0
#include "fft_template.c"

2
libavcodec/fft_template.c
View File

@ -169,7 +169,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
ff_fft_lut_init(fft_offsets_lut, 0, 1 << 16, &n);
}
#else /* CONFIG_FFT_FIXED_32 */
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
if (ARCH_ARM) ff_fft_init_arm(s);
if (ARCH_PPC) ff_fft_init_ppc(s);
if (ARCH_X86) ff_fft_init_x86(s);

2
libavcodec/mdct_fixed.c
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 0
#define FFT_FLOAT 0
#define CONFIG_FFT_FIXED_32 0
#include "mdct_template.c"

2
libavcodec/mdct_fixed_32.c
View File

@ -47,6 +47,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 0
#define FFT_FLOAT 0
#define CONFIG_FFT_FIXED_32 1
#include "mdct_template.c"

2
libavcodec/mdct_float.c
View File

@ -16,6 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 1
#define FFT_FLOAT 1
#define CONFIG_FFT_FIXED_32 0
#include "mdct_template.c"

2
libavcodec/mdct_template.c
View File

@ -31,7 +31,7 @@
* MDCT/IMDCT transforms.
*/
#if CONFIG_FFT_FLOAT
#if FFT_FLOAT
# define RSCALE(x) (x)
#else
#if CONFIG_FFT_FIXED_32