1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

127 Commits

Author SHA1 Message Date
Michael Niedermayer
0cb233cf46 Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
  Move x86util.asm from libavcodec/ to libavutil/.
  Move x86inc.asm to libavutil/.
  APIchanges: note error_recognition in lavf
  lavf: add support for error_recognition, use it in avidec, and bump minor API version
  avconv: change semantics of -map
  avconv: get rid of new* options.
  cmdutils: allow precisely specifying a stream for AVOptions.
  configure: add missing CFLAGS to fix building on the HURD
  libx264: Include hint for possible values for configuring libx264
  cmdutils: allow ':'-separated modifiers in option names.
  avconv: make -map_metadata work consistently with the other options
  avconv: remove deprecated options.
  avconv: make -map_chapters accept only the input file index.
  Make a copy of ffmpeg under a new name -- avconv.
  ffmpeg: add a warning stating that the program is deprecated.
  Add weighted motion compensation for RV40 B-frames
  RV3/4: calculate B-frame motion weights once per frame
  Move RV3/4-specific DSP functions into their own context
  mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
  h264: notice memory allocation failure

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	configure
	doc/ffplay.texi
	doc/ffprobe.texi
	doc/ffserver.texi
	libavcodec/libx264.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/version.h
	tests/lavf-regression.sh
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-13 02:56:08 +02:00
Anton Khirnov
6291d7e416 Make a copy of ffmpeg under a new name -- avconv.
It will be further developed with a few incompatible changes.

ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
2011-08-12 13:27:30 +02:00
Anton Khirnov
b4ea1c5a77 Remove the ffserver test.
It doesn't work and is therefore useless.
2011-08-01 11:36:16 +02:00
Carl Eugen Hoyos
b36bd27fbe Rm lavfi-showfiltfmts on make testclean. 2011-08-01 00:58:49 +02:00
Mans Rullgard
b13c6e336c fate: make vsynth tests depend on only the relevant vref
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-18 18:46:57 +01:00
Diego Biurrun
191c5f8ff3 build: move tests/seek_test.c to libavformat and reuse generic build rules 2011-07-13 13:27:15 +02:00
Mans Rullgard
ca9036155d build: remove unnecessary FFLDFLAGS variable
This variable is set to the same value for all directories.
Adding the -L flags directly to LDFLAGS is simpler and achieves
the same thing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-11 11:39:04 +01:00
Mans Rullgard
28e1c97916 build: rework rules for things in the tools dir
Declaring tools associated with each library in their respective
makefiles allows these tools to easily depend on the correct
prerequisites and link against the libs they need.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-10 21:13:38 +01:00
Mans Rullgard
27e7144350 fate: add idct8x8 test
This tests the IDCT implementations available in the build.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-04 10:38:17 +01:00
Mans Rullgard
03256d96e4 fate: move libavutil test rules to a separate file
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 17:17:16 +01:00
Diego Biurrun
bd9a9a2f18 build: Eliminate obsolete test targets.
The targets are now part of FATE and can be run as individual FATE targets.
2011-06-30 13:06:27 +02:00
Mans Rullgard
0291ce840c fate: move amr[nw]b test rules into separate files
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-29 19:22:58 +01:00
Mans Rullgard
deb3ed01b5 build: replace some addprefix/addsuffix with substitution refs
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 15:59:27 +01:00
Mans Rullgard
f038cf3c74 build: remove SRC_PATH_BARE variable
Setting SRC_PATH to "." when building in-tree removes the need
for a quoted version of the source path since out-of-tree builds
are not possible if the pathname contains spaces.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:17:25 +01:00
Mans Rullgard
698a183e30 build: move test rules to tests/Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-22 22:53:07 +01:00
Diego Biurrun
4fbd52f0b8 Merge tests Makefile into the top-level Makefile.
This gets rid of some recursion and simplifies the code.

Originally committed as revision 9255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 22:36:39 +00:00
Benoit Fouet
9f6c879365 seek tests only available with GPL enabled
Originally committed as revision 9154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 07:11:03 +00:00
Diego Biurrun
822dc0b820 Mark phony swscale_error target as such.
Originally committed as revision 9150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-29 15:18:51 +00:00
Diego Biurrun
0fd5a1b935 Exit with error when running libavtest and not configured with --enable-gpl.
Originally committed as revision 9141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 14:07:44 +00:00
Diego Biurrun
faed2a7f8f Rename variable for consistency.
Originally committed as revision 9140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 14:05:50 +00:00
Diego Biurrun
1b1a1608be whitespace cosmetics
Originally committed as revision 9139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 14:05:01 +00:00
Diego Biurrun
acfd623e8f better variable names
Originally committed as revision 9138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 13:59:13 +00:00
Diego Biurrun
0cda58aaaa Remove comments that are neither very enlightening nor particularly up-to-date.
Originally committed as revision 9137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 13:50:14 +00:00
Diego Biurrun
6fea73ceef Do not hide the commands make runs.
Originally committed as revision 9136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 13:48:19 +00:00
Diego Biurrun
dd4ca89143 Fix seek_test compilation for out-of-tree builds.
Originally committed as revision 9135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 13:36:02 +00:00
Diego Biurrun
036ab241e5 Also remove seek_test upon clean.
Originally committed as revision 9125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-25 12:41:41 +00:00
Diego Biurrun
90a7f95654 Replace multiple rules for compiling binaries by one pattern rule.
Originally committed as revision 9123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-24 23:32:50 +00:00
Diego Biurrun
79e95835e0 Remove obsolete and non-working DSP test program.
Originally committed as revision 9120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-24 22:47:47 +00:00
Zuxy Meng
2462e4b765 Remove trailing / from -I flags, MinGW appears to dislike them.
patch by Zuxy Meng, zuxy.meng gmail com

Originally committed as revision 8948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 09:05:30 +00:00
Michael Niedermayer
c6a29a63b1 enable seektest
Originally committed as revision 8792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 19:19:43 +00:00
Michael Niedermayer
a2638aa764 ensure that seek_test is rebuild if any of the libs changed
Originally committed as revision 8788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 18:30:14 +00:00
Diego Biurrun
d0115a2614 Add seektest to list of PHONY targets.
Originally committed as revision 7860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-06 21:31:05 +00:00
Michael Niedermayer
f97b7e66de seek regression tests
Originally committed as revision 7832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-05 18:15:03 +00:00
Diego Biurrun
200d9a885b Do not run (broken) ffserver test by default and warn about its brokenness.
Originally committed as revision 7710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 12:56:14 +00:00
Diego Biurrun
3dd9fa77bf Bail out immediately with software scaler instead of failing the tests.
Originally committed as revision 7438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-10 20:40:02 +00:00
Diego Biurrun
919cb8731e Fix regression tests with out-of-tree builds.
Originally committed as revision 7364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-23 00:22:15 +00:00
Diego Biurrun
5d078bdb47 Use $< instead of explicit names.
Originally committed as revision 7350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21 21:35:49 +00:00
Måns Rullgård
997baf0141 allow spaces in source and build directory names
out of tree builds from a source dir with spaces is impossible
due to how make handles vpath

Originally committed as revision 6938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-08 00:02:15 +00:00
Diego Biurrun
ca6127352f Don't run libavtest if CONFIG_GPL is not set.
Originally committed as revision 6727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-18 10:09:16 +00:00
Diego Biurrun
41ada6e515 Warn about --enable-gpl.
Originally committed as revision 6698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-15 12:10:46 +00:00
Diego Biurrun
9fd353e9b5 0.pgm is now 00.pgm.
Originally committed as revision 6697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-15 12:08:42 +00:00
Diego Biurrun
3263626feb Mark all phony targets as such.
Originally committed as revision 6538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 17:42:17 +00:00
Diego Biurrun
d568d0feb4 Merge identical targets.
Originally committed as revision 6531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 16:55:06 +00:00
Diego Biurrun
a9f9cc7cc1 simplification cosmetics
Originally committed as revision 6015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 16:29:52 +00:00
Diego Biurrun
0e16a1fc92 Simplify dsptest* rule and add libavutil to the dsptest* includes.
Originally committed as revision 6011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 12:23:35 +00:00
Víctor Paesa
f5c85943d0 Add $(EXESUF) where necessary, fixes regression tests under MinGW.
patch by Víctor Paesa, wzrlpy $@$ arsystel dot com

Originally committed as revision 5924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-03 17:27:33 +00:00
Víctor Paesa
462f3c372c Add missing EXESUF to executable rules.
patch by Victor Paesa, wzrlpy at arsystel com
M    tests/Makefile

Originally committed as revision 5789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-19 10:52:22 +00:00
Diego Biurrun
75fe19059a 100l: V_PATH vs VPATH typo
Originally committed as revision 5624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-05 14:33:17 +00:00
Diego Biurrun
f130fd4630 cosmetics: Break overly long lines.
Originally committed as revision 5622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-05 14:12:00 +00:00
Diego Biurrun
045bb9194e simplify: $(SRC_PATH)/tests --> $(V_PATH)
Originally committed as revision 5620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-05 14:01:45 +00:00
Diego Biurrun
98013cc16c Make clean/distclean consistent throughout all the Makefiles.
Originally committed as revision 4863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-16 14:59:54 +00:00
Michael Niedermayer
e03c822afd split snow53 test out
Originally committed as revision 4850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-14 01:58:38 +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
Michael Niedermayer
ba85e70c54 enabling ffserver regression tests
note, none of the files is playable but this test should help against further breakage unless of course the checksums depend upon something they shouldnt

Originally committed as revision 4456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-18 17:21:08 +00:00
Michael Niedermayer
d13eef3d3d snow regression test
Originally committed as revision 4100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-03 15:39:17 +00:00
Michael Niedermayer
2dd59ebd45 update libavformat regression checksums (it should be checked why exactly they changed ...), and always test libavformat in make test so this doesnt happen again
Originally committed as revision 2799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-18 19:07:58 +00:00
Fabrice Bellard
04e3f86d6b ac3 test
Originally committed as revision 2153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 21:21:39 +00:00
Fabrice Bellard
a12eea308a put b- prefix to libav tests to avoid incorrect ffserver test
Originally committed as revision 2055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-16 19:13:33 +00:00
Fabrice Bellard
8ff7d1ad06 fixed test.conf path
Originally committed as revision 2054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-16 18:50:35 +00:00
Fabrice Bellard
e2946a86c1 fixed SRC_PATH usage
Originally committed as revision 1929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-05 12:36:05 +00:00
Roman Shaposhnik
affd55a132 * fixing a bug in avpicture_layout (PAL8 wasn't handled properly)
* adding regression tests for all pix_fmt conversions
   * making libavtest part of the default testsuite

Originally committed as revision 1855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-12 02:53:43 +00:00
Roman Shaposhnik
6e023978cf Changes for SPARC/Solaris compatibility. Now it should be possible to
build and test ffmpeg on SPARC/Solaris 8+ out of the box.

Originally committed as revision 1778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-15 22:29:37 +00:00
Michael Niedermayer
6692d61b12 fail if a test fails instead of contuing as if everything was ok
Originally committed as revision 1767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-12 14:50:35 +00:00
Michael Niedermayer
6afd3b92b4 finished integrating rotozoom test in ffmpeg
replaced float by integer to avoid rounding differenes between platforms

Originally committed as revision 1755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-11 13:43:17 +00:00
Michael Niedermayer
67cbe68129 check quality too, not only md5 (but dont take the scores too serious, the different codecs use different quality/bitrates and its just based on a artificially generated testvideo)
small changes to some test to check a broader area of features

Originally committed as revision 1751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-10 21:29:31 +00:00
Michael Niedermayer
8d170f0efa test ffserver even if ffmpeg regresion test fails
Originally committed as revision 1709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-26 23:19:50 +00:00
Philip Gladstone
e2b2851e5a First shot at the ffserver regression tests. All feedback received with
interest

Originally committed as revision 1336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-12 19:53:05 +00:00
Michael Niedermayer
463678ac8b using only the fast int dct for regression tests
Originally committed as revision 884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-08-30 19:49:12 +00:00
Michael Niedermayer
1b78558a9c mmx & non-mmx regerssion tests
Originally committed as revision 871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-08-27 22:20:01 +00:00
Fabrice Bellard
5bcfd1ad98 use a local dir for tests
Originally committed as revision 668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-06-05 18:14:21 +00:00
Zdenek Kabelac
5845431a86 * added dependency on dsputil_mmx_rnd.h for dsputil test
Originally committed as revision 627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-29 20:55:16 +00:00
Zdenek Kabelac
6fea8454ac * yet a bit more extended
* fixed busy loop test bug on mmx-only machine

Originally committed as revision 613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-27 08:39:04 +00:00
Fabrice Bellard
d0c30ca54e reactivated swf/mjpeg/jpg formats testing
Originally committed as revision 600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-25 22:47:17 +00:00
Zdenek Kabelac
9e8098e72a * a little bit extended dsptest also suports dsptestpic target
Originally committed as revision 569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-23 14:57:11 +00:00
Zdenek Kabelac
ec9a41f57d * somewhat more advanced test suit for dsp code - for now i386 only
cd test ; make dsptest ; ./dsptest

Originally committed as revision 568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-23 13:34:22 +00:00
Fabrice Bellard
89d5dfd5e8 added libav regression tests
Originally committed as revision 537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-20 16:20:05 +00:00
Fabrice Bellard
51133a7db0 added first version of regression tests - simply type 'make test' to test every codec and some mux/demuxes - added simple synthetic audio and video bitstreams generators so that no big streams needs to be used
Originally committed as revision 532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-18 23:18:22 +00:00