* 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>
* 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>
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>
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>
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>
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>
* 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>
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>
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>
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>
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>
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>
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>
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.
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
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
