1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

48 Commits

Author SHA1 Message Date
Michael Niedermayer
f211d9d839 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: improve rules for test programs
  build: factor out the .c and .S compile commands as a macro
  swscale: remove unused xInc/srcW arguments from hScale().
  H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
  H.264: make filter_mb_fast support 4:4:4
  mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
  configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
  Move some variable declarations below the proper #ifdefs.

Conflicts:
	Makefile
	ffplay.c
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-27 03:32:45 +02:00
Diego Biurrun
f3876ea485 Move some variable declarations below the proper #ifdefs.
This avoids warnings about set-but-unused variables.
2011-06-26 16:32:13 +02:00
Michael Niedermayer
4defa68fe2 Merge remote branch 'qatar/master'
* qatar/master:
  ac3enc: ARM optimised ac3_compute_matissa_size
  ac3: armv6 optimised bit_alloc_calc_bap
  fate: simplify fft test rules
  avio: document avio_alloc_context.
  lavf: make compute_chapters_end less picky.
  sierravmd: fix Indeo3 videos
  FFT: simplify fft8()
  fate: add fixed-point fft/mdct tests
  Fixed-point support in fft-test
  ape: check that number of seektable entries is equal to number of frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 01:54:27 +02:00
Mans Rullgard
6efe6028ed Fixed-point support in fft-test
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 15:16:06 +01:00
Michael Niedermayer
d4a50a2100 Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-21 03:33:28 +01:00
Mans Rullgard
0aded9484d Move dct and rdft definitions to separate files
This leaves fft.h with only the core FFT and MDCT definitions
thus making it more managable.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-20 17:15:33 +00:00
Mans Rullgard
26f548bb59 fft: remove inline wrappers for function pointers
This removes the rather pointless wrappers (one not even inline)
for calling the fft_calc and related function pointers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 19:49:18 +00:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Måns Rullgård
ead7ef8251 fft-test: format error output more readably
Originally committed as revision 24799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-16 20:34:06 +00:00
Måns Rullgård
85fbad4555 fft-test: free buffers before exiting
Originally committed as revision 24708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 07:09:12 +00:00
Måns Rullgård
a79e921ee6 fft-test: exit with non-zero status if test failed
Originally committed as revision 24693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 06:56:55 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Vitor Sessak
c99baf05c3 Add help for (I)RDFT test in fft-test
Originally committed as revision 22793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-03 15:05:27 +00:00
Vitor Sessak
c2b774a04e Make code using 1d-DCT consistent with the API change
Originally committed as revision 22792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-03 15:04:15 +00:00
Måns Rullgård
41ea18fb0d Give RDFT types more meaningful names
Originally committed as revision 22290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 21:47:44 +00:00
Måns Rullgård
3bd8a2ef6c Update include directives in fft-test.c
Originally committed as revision 22289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 21:47:41 +00:00
Vitor Sessak
7f3f5f46c2 Floating point discrete cosine transform
Originally committed as revision 21338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 00:39:47 +00:00
Alex Converse
c460833d76 fft-test: Add RDFT/IRDFT support.
Originally committed as revision 21141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 16:41:03 +00:00
Alex Converse
5b37ef8e43 fft-test: Replace do_mdct with a tf_transform enum and switch on it.
Originally committed as revision 21140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 16:40:01 +00:00
Alex Converse
d987a9e9ad fft-test: whitespace cosmetics
Originally committed as revision 21085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 06:11:56 +00:00
Måns Rullgård
01b2214758 Merge FFTContext and MDCTContext
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 17:30:20 +00:00
Loren Merritt
50b1785a57 bring back some randomness in fft-test. (regression in r18070)
Originally committed as revision 19679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-22 15:56:06 +00:00
Siarhei Siamashka
34aecf1c87 Support for testing (i)MDCT output scale factor in fft-test tool.
Originally committed as revision 18877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-20 07:23:09 +00:00
Siarhei Siamashka
7d485f165f Support for getting (i)MDCT output multiplied by a constant scaling factor.
Scaling (i)MDCT output has no runtime overhead and can be used to improve
performance of audio codecs. All the changes are only needed in
'ff_mdct_init' function and slow down initialization a bit.

Originally committed as revision 18855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 14:17:08 +00:00
Diego Biurrun
64bde1974b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
Originally committed as revision 18422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 17:23:38 +00:00
Diego Biurrun
504ffed19f Mark non-exported functions in test and example programs as static.
Originally committed as revision 18259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 09:32:59 +00:00
Diego Biurrun
294eaa2643 Replace random() usage in test programs by av_lfg_*().
Originally committed as revision 18070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 11:48:27 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Loren Merritt
0a570e826d remove mdct tmp buffer
Originally committed as revision 14702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:36:36 +00:00
Alexander Strange
ff558537f0 Don't set mm_flags in fft-test, since it doesn't do anything anyway.
Originally committed as revision 13968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 17:37:47 +00:00
Alexander Strange
f67a10cd0c Define mm_flags/support to be 0 on architectures where they don't exist.
Make sure we don't try to set them if that's the case.
This lets dct-test and fft-test build with --disable-mmx on x86, but not yet on ARM.

Originally committed as revision 13957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 23:51:17 +00:00
Diego Biurrun
941b1258b8 Remove redundant mm_flags declaration, fixes the warning:
libavcodec.a(dsputil_ppc.o): warning: definition of `mm_flags' overriding common
fft-test.o: warning: common is here

Originally committed as revision 13940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 09:00:58 +00:00
Marc Hoffman
dc1ecb6a4a making reference models have the same API
Originally committed as revision 9861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-01 20:44:08 +00:00
Michael Niedermayer
3bdc2fcea6 make the reference code use double instead of float where it is easy
Originally committed as revision 9827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-29 10:11:12 +00:00
Michael Niedermayer
86c624af1b print max and mse
Originally committed as revision 9826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-29 09:58:36 +00:00
Panagiotis Issaris
cc61f96f8a Fix the compilation of dct-test, fft-test and motion-test which are using
random().

Originally committed as revision 9754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 08:46:28 +00:00
Ronald S. Bultje
12807c8d87 Add some #includes to allow compilation without HAVE_AV_CONFIG_H.
taken from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-09 17:52:16 +00:00
Diego Biurrun
2818647310 Add '#undef exit', the function is now forbidden.
Originally committed as revision 8584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 11:40:36 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Diego Biurrun
04d7f60143 Add official LGPL license headers to the files that were missing them.
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 14:02:42 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Benjamin Larsson
0979831511 printf -> av_log patch by (Benjamin Larsson <>banan student.ltu se)
Originally committed as revision 4105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-04 21:47:50 +00:00
Gildas Bazin
68951ecf0c fft_*() renamed into ff_fft_*() patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 2882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-13 21:43:24 +00:00
Michael Niedermayer
983e3246b7 per file doxy
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-06 11:32:04 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Fabrice Bellard
e366e6795d suppressed getopt.h
Originally committed as revision 1422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-07 23:49:40 +00:00
Fabrice Bellard
ea0f841a54 compile fixes
Originally committed as revision 1411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-07 17:43:50 +00:00
Fabrice Bellard
bb6f569072 new generic FFT/MDCT code for audio codecs
Originally committed as revision 1088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-28 00:34:08 +00:00