Commit Graph

87 Commits

Author SHA1 Message Date
Michael Niedermayer 70d9fb6963 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  sunrast: Check for out of bounds reads
  lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
  lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
  Add libvpx presets.
  doc/avtools: add forgotten part to stream specifiers description
  swscale: prevent overflow during initialization
  g722: Add a fate test for the encoder
  fate: Add a target for creating a 16000 Hz mono synthetic audio file
  macosx: use the default surface on newer sdl

Conflicts:
	ffplay.c
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-19 02:08:59 +02:00
Martin Storsjö 73dbc89cbb fate: Add a target for creating a 16000 Hz mono synthetic audio file
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-10-18 10:45:17 +03:00
Michael Niedermayer 530d8529d0 fate: enable the prores tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-14 14:08:28 +02:00
Michael Niedermayer 91eb1b1525 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  prores: add FATE tests
  id3v2: reduce the scope of some non-globally-used symbols/structures
  id3v2: cosmetics: move some declarations before the places they are used
  shorten: remove the flush function.
  shn: do not allow seeking in the raw shn demuxer.
  avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
  avformat: update AVInputFormat allowed flags
  avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
  truespeech: use sizeof() instead of hardcoded sizes
  truespeech: remove unneeded variable, 'consumed'
  truespeech: simplify truespeech_read_frame() by using get_bits()
  truespeech: decode directly to output buffer instead of a temp buffer
  truespeech: check to make sure channels == 1
  truespeech: check for large enough output buffer rather than truncating output
  truespeech: remove unneeded zero-size packet check.
  mlpdec: return meaningful error codes instead of -1
  mlpdec: remove unnecessary wrapper function
  mlpdec: only calculate output size once
  mlpdec: validate that the reported channel count matches the actual output channel count
  pcm: reduce pointer type casting
  ...

Conflicts:
	libavformat/avformat.h
	libavformat/id3v2.c
	libavformat/id3v2.h
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-14 03:48:22 +02:00
Diego Biurrun a62d36697d prores: add FATE tests 2011-10-13 23:20:39 +02:00
Michael Niedermayer 7c1aba4f01 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
	avconv.c
	cmdutils.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/oggparsecelt.c
	libavformat/utils.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 02:14:37 +02:00
Mans Rullgard 908f12f342 fate: allow testing with libavfilter disabled
This declares dependencies to skip tests using libavfilter
when it is disabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-09-27 00:05:51 +01:00
Michael Niedermayer e01770ba01 fate: Switch default tool to test from avconv to ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-30 18:16:03 +02:00
Michael Niedermayer 6ae356c9a0 fate: allow specifying the tool to use for fate (avconv / ffmpeg)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-15 23:11:46 +02:00
Michael Niedermayer ee5234dd67 fate-rsync: switch to our server in preparation of h264 4:2:2 tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-15 00:41:23 +02:00
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