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

48 Commits

Author SHA1 Message Date
Michael Niedermayer
00f9e51a26 tests/regression-funcs: Remove hardcoded threads 1
The tests which use encoders which either use slices or store the encoder thread count
keep a hardcoded value of 1

This will help test more threading code like in filters

Found-by: ubitux
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03 15:09:12 +01:00
Michael Niedermayer
eacf7d650d Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'
* commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52':
  lavf: add AVFMT_FLAG_BITEXACT.

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/flacenc.c
	libavformat/movenc.c
	libavformat/oggenc.c
	libavformat/options_table.h
	libavformat/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15 19:16:57 +02:00
Anton Khirnov
0c1959b056 lavf: add AVFMT_FLAG_BITEXACT.
Use it instead of checking CODEC_FLAG_BITEXACT in the first stream's
codec context.

Using codec options inside lavf is fragile and can easily break when the
muxing codec context is not the encoding context.
2014-05-15 07:42:07 +02:00
Carl Eugen Hoyos
bb97bcec6b Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.
This allows running more fate tests on remote targets
without the source tree.
2014-03-18 01:29:50 +01:00
Michael Niedermayer
ef96ec97fb fate: remove unused functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-30 05:57:56 +02:00
Michael Niedermayer
b0387edd5e Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
  fate: fix acodec/vsynth tests for make 3.81
  pcm_mpeg: fix number of consumed bytes to include the header.
  avfilter: include required header file avfilter.h in video.h
  x86: Avoid movs on BUTTERFLYPS when in AVX mode
  x86: use new schema for ASM macros
  fate: convert codec-regression.sh to makefile rules
  fate: allow tests to specify unit size for psnr comparison
  fate: teach videogen/rotozoom to output a single raw video stream
  http: Add support for reusing the http socket for subsequent requests
  http: Add support for using persistent connections

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-30 01:40:54 +02:00
Mans Rullgard
7263cd5544 fate: convert codec-regression.sh to makefile rules
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-29 08:35:41 +01:00
Michael Niedermayer
fcd08262fd tests and tools: cleanup ffmpeg reference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 15:42:55 +02:00
Mans Rullgard
ab5c38ec45 fate: remove unused code from regressions-funcs.sh
The only uses of the do_avconv_nomd5() function were removed in
85cf49f.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-18 14:00:36 +01:00
Michael Niedermayer
703e920bb7 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: Work around non-standard wc implementations at more places
  fate: work around non-standard wc implementations
  x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions.
  ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16
  fate: use standard diff options
  tta: Fix comment about channel number; TTA supports >2 channels.
  avfilter: Move ff_get_ref_perms_string() to where it is used.
  build: Add 'check' target to run all compile and test targets.
  indeo3: validate new frame size before resetting decoder
  indeo3: when freeing buffers, set pointers referencing them to NULL as well
  indeo3: initialise pixel planes on allocation
  indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder
  fate: rename psx-str-v3-mdec to mdec-v3
  fate: convert psx-str to a demuxer test
  lavf: add mdec to is_intra_only() list

Conflicts:
	doc/developer.texi
	libavcodec/indeo3.c
	libavfilter/video.c
	libavformat/utils.c
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/lavf-regression.sh
	tests/ref/vsynth1/cljr
	tests/ref/vsynth1/ffvhuff
	tests/ref/vsynth2/cljr
	tests/ref/vsynth2/ffvhuff

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-16 22:32:05 +02:00
Mans Rullgard
ed7409fe9d fate: work around non-standard wc implementations
On some systems, the wc command prints spaces before the first
number causing mismatches with the test references.  Using the
output of wc as arguments to echo removes any extra whitespace.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-16 03:04:53 +01:00
Reimar Döffinger
c799e46231 Get rid of tests/data/asynth-%.sw rule.
This also avoids an issue with parallel make in some
cases never building asynth-16000-1.sw.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-04-23 23:26:05 +02:00
Reimar Döffinger
58c25724b7 Add nellymoser "fuzzy" FATE test.
Since we cannot specify decode parameters (and also because
it is better in principle) the 1-channel reference file
needs to be enabled, too.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-04-08 02:43:56 +02:00
Reimar Döffinger
cb25a186eb Fix DCA regression test to work across architectures.
Only the decoding step is not bit-exact, so avoid checksum for that.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-04-07 15:13:01 +02:00
Reimar Döffinger
796097c696 Add tests for audio encoders: aac, dca, ra144 and nellymoser.
The PSNR values are of varying usefulness, though at least
the DTS and AAC ones are useful with the right shift value.
Note: due to usage of floats some of these may fail on other
architectures.
In that case they should be converted into a CMD = stddev
FATE test, but it seems useful to try this way first.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-04-07 11:50:18 +02:00
Michael Niedermayer
6df42f9874 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  SBR DSP: fix SSE code to not use SSE2 instructions.
  cpu: initialize mask to -1, so that by default, optimizations are used.
  error_resilience: initialize s->block_index[].
  svq3: protect against negative quantizers.
  Don't use ff_cropTbl[] for IDCT.
  swscale: make filterPos 32bit.
  FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option.
  avconv: add -cpuflags option for setting supported cpuflags.
  cpu: add av_set_cpu_flags_mask().
  libx264: Allow overriding the sliced threads option
  avconv: fix counting encoded video size.

Conflicts:
	doc/APIchanges
	doc/fate.texi
	doc/ffmpeg.texi
	ffmpeg.c
	libavcodec/h264idct_template.c
	libavcodec/svq3.c
	libavutil/avutil.h
	libavutil/cpu.c
	libavutil/cpu.h
	libswscale/swscale.c
	tests/Makefile
	tests/fate-run.sh
	tests/regression-funcs.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-07 03:22:49 +01:00
Anton Khirnov
018f39ef49 FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option. 2012-03-06 15:03:36 +01:00
Anton Khirnov
493a86e25b FATE: remove a bunch of useless -vsync 0
No changes in the test results.
2012-02-26 07:28:04 +01:00
Reimar Döffinger
f23a740303 Add muxer test based on stream-copy from FATE sample.
This should test muxing Theora into Ogg.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-02-18 16:41:39 +01:00
Reimar Döffinger
78fde9323d Run zmbv regression without md5sum.
Judging by the differences this should make all FATE
machines pass the test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-10 19:34:28 +01:00
Michael Niedermayer
0a23067ab4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
  mpeg124: use sign_extend() function
  ac3dec: use get_sbits() instead of manually sign-extending
  4xm: fix signed overflow
  wmavoice: fix a signed overflow
  mpegvideo_enc: fix a signed overflow
  crc: fix signed overflow
  fate: run avconv with -nostats flag
  avtools: add -v as alias for -loglevel
  avconv: always print stats with AV_LOG_INFO
  doc/avconv: add forgotten output/per-stream info to -filter
  avconv: add -stats option to enable/disable printing encoding progress
  avconv: in output_packet() don't set decoded_data_size for video.
  avconv: remove pointless always true condition
  avconv: factorize common code in transcode_init()
  zmbv: remove memcpy() of decoded frame
  mpeg12enc: use sign_extend() function
  h264pred: use unsigned types for pixel values, fix signed overflows
  h264: fix signed overflows in x*0x01010101 expressions
  h264pred: remove unused variables

Conflicts:
	avconv.c
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-10 03:50:58 +02:00
Mans Rullgard
0836d48a16 fate: run avconv with -nostats flag
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-10-09 16:53:12 +01:00
Anton Khirnov
6cd9d0f77d Revert "avconv: use stream copy by default when possible."
This reverts commit 4f4f33844a.

This commit has some ugly corner cases and needs to be discussed
further.
2011-08-16 20:59:14 +02:00
Anton Khirnov
4f4f33844a avconv: use stream copy by default when possible. 2011-08-16 20:24:20 +02:00
Michael Niedermayer
091a24b75f fate: more cases of avconv that should be conditional
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-16 03:38:00 +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
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
Anton Khirnov
d7ee44024c ffmpeg: don't abuse a global for passing samplerate from input to output
It's broken with multiple files or audio streams.

This removes the default samplerate of 44100 for raw input, hence all
the FATE changes.
2011-06-15 21:57:52 +02:00
Alexander Strange
6a9c859444 H264/MPEG frame-level multi-threading.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-06-02 10:16:20 -07:00
Mans Rullgard
6da57043ea fate: disable threading for encoding
This explicitly disables threading for encoding as slices are otherwise
automatically activated.  This should be dropped once option resetting
between files is fully implemented.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-20 13:50:52 +01:00
Mans Rullgard
1a14a27603 fate: remove do_ffmpeg_nocheck function
This function is essentially an alias for run_ffmpeg and is only
used in one place.  This patch removes the function and replaces
the call with the equivalent (simpler) run_ffmpeg call.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 15:38:26 +01: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
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
Mans Rullgard
2728fd9053 regtest: simplify encoding functions
The video encoding options were needlessly split in two parameters
which are merged.  The do_audio_encoding function did not use its
second argument, so this can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-08 10:58:32 +01:00
Luca Barbato
a96c176aed fate: simplify regression-funcs.sh
Factor ffmpeg calls using run_ffmpeg()
2011-03-23 01:17:20 +01:00
Luca Barbato
7851eb68c6 fate: add support for multithread testing
Add a THREADS variable to fate calls.
2011-03-23 01:17:20 +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
Måns Rullgård
c4795e8069 fate: print commands being executed with V=1
Originally committed as revision 25161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 09:55:31 +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
f955d45226 Change names of regtest output files to closer match the reference files
Originally committed as revision 24127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 22:10:14 +00:00
Måns Rullgård
fc8cb3988f regtest: move md5sum wrappers into separate file
ffserver-regression.sh doesn't need anything else from
regression-funcs.sh, and sourcing the entire file there
breaks things.

Originally committed as revision 22304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 00:26:58 +00:00
Måns Rullgård
801b571e33 Remove unused argument to test scripts
Originally committed as revision 22156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 21:42:03 +00:00
Måns Rullgård
cc3e2472f3 Place regression test output files in subdirs per family
Originally committed as revision 22155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 21:41:52 +00:00
Måns Rullgård
43cfefafbf Use stripped executable in regression tests
Originally committed as revision 21870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-17 21:37:35 +00:00
Måns Rullgård
c676895fd9 Separate audio-only tests so they are only run once
Originally committed as revision 21556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 21:47:13 +00:00
Måns Rullgård
16cd99bbed regtest: suppress console output from tests
This disables all console output from the *-regression.sh scripts by
default.  If the V environment variable is set to 1, ffmpeg commands
are printed before being run.  If V is greater than 1, ffmpeg output
goes to the console, otherwise stderr is redirected to a file.

Originally committed as revision 21253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 20:17:55 +00:00
Diego Biurrun
3d1470649c Replace syntax by $( ) in regression test shell scripts.
The latter syntax variant is more readable and easier to nest.

Originally committed as revision 20924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-26 11:24:04 +00:00
Stefano Sabatini
f94e56cf82 Split codec-regression.sh, put all the code which can be shared by
other regression test scripts in the regression-funcs.sh file.

Originally committed as revision 20359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-23 22:49:05 +00:00