Commit Graph

45 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
Stefano Sabatini
9c484d2944 lavfi-showfiltfmts: extend output format for specifying audio data
This is required for extending lavfi tests to audio filtering.
2011-07-28 10:04:09 +02:00
Michael Niedermayer
bb9d5171a7 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  swscale: Add Doxygen for hyscale_fast/hScale.
  fate: enable lavfi-pixmt tests on big endian systems
  PPC: swscale: disable altivec functions for unsupported formats
  fate: merge identical pixdesc_be/le tests
  swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
  build: call texi2pod.pl with full path instead of symlink
  build: include sub-makefiles using full path instead of symlinks
  swscale: update big endian reference values after dff5a835.
  wavpack: skip blocks with no samples
  cosmetics: remove outdated comment that is no longer true
  build: replace some addprefix/addsuffix with substitution refs
  avutil: Remove unused arbitrary precision integer code.
  configure: Drop check for availability of ten assembler operands.
  aacenc: Save channel configuration for later use.
  aacenc: Fix codebook trellising for zeroed bands.
  swscale: change prototypes of scaled YUV output functions.
  swscale: re-add support for non-native endianness.
  swscale: disentangle yuv2rgbX_c_full() into small functions.
  swscale: split yuv2packed[12X]_c() remainders into small functions.
  swscale: split yuv2packedX_altivec in smaller functions.
  ...

Conflicts:
	Makefile
	configure
	libavcodec/x86/dsputil_mmx.c
	libavfilter/Makefile
	libavformat/Makefile
	libavutil/integer.c
	libavutil/integer.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-29 05:23:12 +02:00
Mans Rullgard
842f463c77 fate: merge identical pixdesc_be/le tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 21:31:42 +01:00
Michael Niedermayer
043d2affbb Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rawdec: Fix decoding of QT WRAW files.
  configure: report optimization for size separately
  mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.
  mov: Support R10g codec identifier.
  riff/img2: Add JPEG 2000 codec IDs.
  riff: Add DAVC fourcc.
  riff: Add M263, XVIX, MMJP, CDV5 fourccs.
  rawvideo: Support auv2 fourcc.
  swscale: Remove unused variable from ff_bfin_get_unscaled_swscale().
  h264: Fix assert that failed to compile with -DDEBUG.
  h264: Add x86 assembly for 10-bit weight/biweight H.264 functions.
  fate: remove output redirections from old regtest scripts

Conflicts:
	configure
	libavcodec/rawdec.c
	libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-22 05:16:40 +02:00
Mans Rullgard
ea57502c82 fate: remove output redirections from old regtest scripts
All tests are run through the fate-run.sh script which already
sets up redirections.  Using the outputs set there simplifies
things somewhat.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21 12:37:58 +01:00
Michael Niedermayer
75a37b57a5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  APIchanges: fill in date and commit for request_sample_fmt
  Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
  Add support for request_sample_format in ffmpeg and ffplay.
  Add APIchanges entry for request_sample_fmt.
  Add request_sample_fmt field to AVCodecContext.
  Add float_interleave() to FmtConvertContext with x86-optimized versions.
  Remove unused make variable SEEK_REFFILE
  fate: remove redundant aref and vref references
  fate: remove do_ffmpeg_nocheck function
  fate: do not collect -benchmark output
  mpegaudiodec: remove decode_end() function
  fate: run aref and vref as regular tests
  mpegaudio: sanitise compute_antialias_* names
  mpeg12: add slice-threading checks to slice-threading initializers.
  h264: copy pixel_shift between slice threading contexts.
  mdec: enable frame-level multithreading.
  mdec.c: fix overread.

Conflicts:
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/dca.c
	libavcodec/h264.c
	libavcodec/mdec.c
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/version.h
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-19 06:00:31 +02:00
Mans Rullgard
d4a7df423c fate: do not collect -benchmark output
The old regtest scripts pass -benchmark and collect the utime values.
As these values are never used, this machinery can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 15:38:25 +01:00
Michael Niedermayer
b97b4b58a6 Merge remote branch 'qatar/master'
* qatar/master:
  mpegaudiodec: group #includes more sanely
  mpegaudio: remove #if 0 blocks
  ffmpeg.c: reset avoptions after each input/output file.
  ffmpeg.c: store per-output stream sws flags.
  mpegaudio: remove CONFIG_MPEGAUDIO_HP option
  mpegtsenc: Clear st->priv_data when freeing it
  udp: Fix receiving RTP data over multicast
  rtpproto: Remove an unused variable
  regtest: fix wma tests
NOT pulled:  mpegaudio: remove CONFIG_AUDIO_NONSHORT
  regtest: separate flags for encoding and decoding

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-10 04:03:17 +02:00
Mans Rullgard
eeadaa6bc0 regtest: separate flags for encoding and decoding
This separates encoding and decoding flags, and passes them together
with the related file argument instead of all at the start of the
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-09 10:12:39 +01:00
Stefano Sabatini
55bfb98fc6 lavfi-regression: provide filter arguments to showfiltfmts
In do_lavfi_pixfmts(), provide the filter arguments to showfiltfmts,
since some filter may require non-null or non-empty argument string
for working properly.
2011-05-05 18:38:48 +02:00
Mans Rullgard
05238927b7 fate: make lavfi tests output only md5
Instead of saving huge raw files, use the md5: output pseudo-protocol
to calculate the checksum of the file directly.  This is especially
useful when testing on remote targets as it avoids transferring 3.6GB
over the network.
(cherry picked from commit f4b1e21a63)
2011-01-23 19:32:07 +01:00
Mans Rullgard
f4b1e21a63 fate: make lavfi tests output only md5
Instead of saving huge raw files, use the md5: output pseudo-protocol
to calculate the checksum of the file directly.  This is especially
useful when testing on remote targets as it avoids transferring 3.6GB
over the network.
2011-01-22 00:30:12 +00:00
Stefano Sabatini
b567020943 Add copy filter, useful for testing the avfilter_draw_slice() copy
code.

Originally committed as revision 26112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 01:01:09 +00:00
Stefano Sabatini
75b67a8a99 Make the crop filters accept parametric expressions.
Originally committed as revision 25185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 01:18:43 +00:00
Stefano Sabatini
2bc05d3547 Change the syntax of the crop filter from x:y:w:h to w:h:x:y.
Slightly more intuitive and required by a pending changes for making
the filter parametric.

Originally committed as revision 25184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 23:14:01 +00:00
Stefano Sabatini
a1e171dfee Add hflip filter.
Originally committed as revision 24806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 14:59:12 +00:00
Måns Rullgård
42907c6ab5 lavfi-regression: trim \r line ends from showfiltfmts output
This is required when cross-testing on dos-like targets.

Originally committed as revision 24667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-02 19:44:58 +00:00
Stefano Sabatini
546017fc79 Sort lavfi pixdesc tests.
Increase readability and robustness, as the test result is not going
to differ if the order of the pixfmts codes changes.

Originally committed as revision 24665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-02 11:56:51 +00:00
Måns Rullgård
9c87c03779 lavfi-regression: use different temp file names for each pixfmt test
Originally committed as revision 24658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 23:34:48 +00:00
Stefano Sabatini
043076975f Reindent.
Originally committed as revision 24655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 23:04:16 +00:00
Stefano Sabatini
73177b6c79 Split lavfi pixfmts test.
Introduce the function do_lavfi_pixfmts(), and use it for generating a
pixfmts test for each different filter.

Originally committed as revision 24654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 23:04:13 +00:00
Måns Rullgård
7e7fc4e9ee Simplify lavfi-pixfmts test script
Originally committed as revision 24648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 11:34:59 +00:00
Måns Rullgård
79ec38d154 Remove temporary files in lavfi-pixfmts test
Originally committed as revision 24646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 10:47:41 +00:00
Stefano Sabatini
43d2c6a511 Fix fate-lavfi-pixfmts test cross-compilation.
Add the lavfi-showfiltfmts dependency in the Makefile, and correctly
use the $target_exec and $target_path variables for invoking the
lavfi-showfiltfmts tool.

Originally committed as revision 24645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 10:27:04 +00:00
Stefano Sabatini
2b346e042e Use the ffmpeg specified in $ffmpeg in the pixfmts lavfi test,
otherwise the test will be running whatever ffmpeg is installed on the
host system.

Originally committed as revision 24644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 10:27:00 +00:00
Stefano Sabatini
0a87d541b7 Put the filter name before the pixel format name in the lavfi pixfmts
test output files, and add a prefix with the name of the test.
Make per-filter grouping of the generated output files easier, which
is more useful than per-pixel-format grouping.

Originally committed as revision 24643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:46:11 +00:00
Stefano Sabatini
65e17eae3c Introduce and use a variable $output in the lavfi pixfmts test code.
Consistent with the lavfi pixdesc test code, and slightly improve
readability.

Originally committed as revision 24642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:46:08 +00:00
Stefano Sabatini
fc25373b1b Split the lavfi pixfmts tests in _le and _be, this is required as the
test results and references depend on machine endianess.

Originally committed as revision 24641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:46:06 +00:00
Stefano Sabatini
42bc7c8a60 Rename the not yet enabled test lavfi_pix_fmts to pixfmts, which is
simpler and consistent with the names of the other lavfi tests.

Originally committed as revision 24640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:46:03 +00:00
Måns Rullgård
e6e3069b54 Simplify lavfi test script a little
Originally committed as revision 24486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 17:13:35 +00:00
Måns Rullgård
8fae6e7c11 Unbreak parallel lavfi testing
Originally committed as revision 24485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 17:13:32 +00:00
Måns Rullgård
a4e6fa86ce regtest: simplify cleanup after each test
Originally committed as revision 24396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 20:49:41 +00:00
Måns Rullgård
7c1bb9143e Fix lavfi pixdesc test
This test verifies the pixdesc code by comparing the output with and
without a filter which should have no effect on the image.  Since the
available pixel formats depend on the byte order of the machine, a
simple reference checksum is not possible.

The test originally tried to solve this by generating a reference file
on the fly.  The problem with this is that the test framework expects
the reference file in the source tree, and writing to the source tree
is not allowed.

To avoid complicating the test framework, we instead provide two
reference files and select which to use based on the byte order.

Originally committed as revision 24330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 17:17:49 +00:00
Stefano Sabatini
ce2e4ae35a Add pixdesctest filter and corresponding test.
Originally committed as revision 24092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 18:24:55 +00:00
Stefano Sabatini
e59cfd7850 Do not exclude anymore the pixel formats rgb444, bgr444, rgb4_byte,
and bgr4_byte from the lavfi-pix_fmts test.

The formats are now supported by NUT.

Originally committed as revision 23510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 18:50:27 +00:00
Stefano Sabatini
bb756b2fbc Fix typo.
Originally committed as revision 23459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-03 22:20:07 +00:00
Stefano Sabatini
8456d947a5 Exclude from the lavfi_pix_fmts regression test the output pixel
formats which are not currently supported by NUT and which cannot be
played by ffplay.

Originally committed as revision 23458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-03 22:17:06 +00:00
Stefano Sabatini
d04c13f74b Remove useless variables in get_common_elements().
Originally committed as revision 23429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-02 18:56:19 +00:00
Stefano Sabatini
e34d5db595 Add libavfilter 1-input - 1-output regression test, corresponding to the
target regtest-lavfi_pix_fmts.

The lavfi_pix_fmts test is disabled, this because there are
many tests which are failing, and there are still some output files
which cannot be played by NUT/ffplay.

Originally committed as revision 23297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 20:38:50 +00:00
Vitor Sessak
e904c51fa1 Replace "-vfilters" by "-vf" in regtests. Should fix regtest breakage.
Originally committed as revision 23109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-13 12:30:46 +00:00
Stefano Sabatini
1400bd5a39 Make ad-hoc lavfi tests use random values for the slice height used
per each frame, useful for testing slicification.

Originally committed as revision 22587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 23:23:48 +00:00
Stefano Sabatini
cec96e8de3 Add some ad-hoc tests for libavfilter.
A patched version of ffmpeg supporting video filters is required for
getting this working; thus make lavfitest is supposed to work only in
the libavfilter repository for now.

Originally committed as revision 22586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 23:23:44 +00:00
Stefano Sabatini
77f66963b0 Split codec-regression.sh again and create a lavfi-regression.sh for
running the libavfilter tests.

Originally committed as revision 20384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-27 19:34:48 +00:00