Commit Graph

59 Commits

Author SHA1 Message Date
Michael Niedermayer
41bf67d8d4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
  avconv: remove a write-only variable
  avconv: remove pointless parameter from new_*_stream().
  avconv: cosmetics, move code
  avconv: cosmetics -- move copy_chapters().
  avconv: cosmetics -- move parse_forced_key_frames().
  lavc: add audio flag to the 'b' option, deprecate 'ab'.
  avconv: rename sameq to same_quant
  doc/avconv: add forgotten end of chapter.
  Changelog: document avconv incompatibilities with ffmpeg.
  avconv: replace -vcodec/-acodec/-scodec with a better system.
  avconv: remove presets.
  svq3: propagate codec memory allocation failure in context init

Conflicts:
	Changelog
	avconv.c
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-16 23:47:35 +02:00
Anton Khirnov
64db1a82d6 lavc: add audio flag to the 'b' option, deprecate 'ab'.
Its only reason for its existence was ffmpeg's inability to properly assign
AVOptions to streams. Now this is not a problem anymore, so 'ab' should
go.
2011-08-16 06:20:43 +02:00
Anton Khirnov
f4ad238c6c avconv: rename sameq to same_quant
It's often mistakenly used as 'same quality', emphasize that it's not
true in the manual.
2011-08-16 06:19:08 +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
Michael Niedermayer
4095fa9038 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dnxhddec: optimise dnxhd_decode_dct_block()
  rtp: remove disabled code
  eac3enc: use different numbers of blocks per frame to allow higher bitrates
  dnxhd: add regression test for 10-bit
  dnxhd: 10-bit support
  dsputil: update per-arch init funcs for non-h264 high bit depth
  dsputil: template get_pixels() for different bit depths
  dsputil: create 16/32-bit dctcoef versions of some functions
  jfdctint: add 10-bit version
  mov: add clcp type track as Subtitle stream.
  mpeg4: add Mpeg4 Profiles names.
  mpeg4: decode Level Profile for MPEG4 Part 2.
  ffprobe: display bitstream level.
  imgconvert: remove unused glue and xglue macros

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-22 12:08:52 +02:00
Mans Rullgard
4555874af1 dnxhd: add regression test for 10-bit
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-21 18:44:46 +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
4f643430f2 Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'
* commit '9446d75941d639f19cfa9ae007eb4c5ca041f200':
  ffmpeg: merge output_codecs array into AVOutputStream members.
  rtpenc_latm: Consistently use "Libav" in license boilerplate.
  rtsp: Don't pass string pointer as format string to ff_url_join
  mmsh: fixed printf injection bug in mmsh request
  codec-regression: remove pointless -r options for dnxhd

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-17 05:49:58 +02:00
Anton Khirnov
7cbc2e60af codec-regression: remove pointless -r options for dnxhd 2011-06-16 10:56:45 +02: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
Mans Rullgard
70378ea190 fate: run aref and vref as regular tests
These tests create reference files used for psnr calculation in
the other codec tests.  Treating them as (mostly) regular tests
simplifies the makefile and makes them visible in the fate reports.
The latter makes errors in these runs easier to identify.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 14:45:46 +01:00
Michael Niedermayer
83630f79ec regtests: add grayscale qtrle
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-12 00:19:32 +02: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
ecfc5e0b72 regtest: fix wma tests
This adds $DEC_OPTS to the wma decode commands, making tests pass
on systems where the bitexact flag is needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-09 12:48:18 +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
Michael Niedermayer
6841c8c579 Merge remote branch 'qatar/master'
* qatar/master:
  log: Fix an oob array read.
  cosmetics: trim trailing whitespace in postproc
  Ban strncpy() it's too easy to misuse.
  psymodel: Remove wrapper functions.
  aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
  regtest: remove redundant flags in jpg test
  regtest: use run_ffmpeg in do_image_formats
  regtest: simplify encoding functions
  ffmpeg.c: check for interlaced flag in the correct place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-09 04:50:56 +02: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
Michael Niedermayer
b5f20892c9 msvideo1 regression test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-04 02:22:13 +02:00
Michael Niedermayer
500bf39715 flashsv2enc: regression test.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-29 21:53:25 +02:00
Baptiste Coudurier
31df5cb66d Fix qtrle regression test, actually test qtrle.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 646739a0a8)
2011-02-13 00:54:05 +01:00
Baptiste Coudurier
646739a0a8 Fix qtrle regression test, actually test qtrle.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-11 23:47:09 +00:00
Justin Ruggles
6fd96d1a85 Change the AC-3 encoder to use floating-point.
Fixed-point AC-3 encoder renamed to ac3_fixed.
Regression test acodec-ac3 renamed to acodec-ac3_fixed.
Regression test lavf-rm changed to use ac3_fixed encoder.

Originally committed as revision 26209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-04 11:53:44 +00:00
Vitor Sessak
82c76ceee7 QTRLE regtest
Originally committed as revision 25017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-01 12:38:36 +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
Stefano Sabatini
c1b81d2fd3 Remove the "b" from "Mb" in -b values for the dnxhd tests.
They are just ignored, and tend to confuse both machines and humans.

Originally committed as revision 23628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-16 18:27:52 +00:00
Michael Niedermayer
59b847d3a9 Add simple rgb/yuv in avi regression test.
Originally committed as revision 23501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 00:05:12 +00:00
Michael Niedermayer
bd57cae86f use mpeg2 quantization bias for mjpeg.
this seems to improve RD performance.

Originally committed as revision 22550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:37:02 +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
4b294c1872 regtest: split wma test into wmav1 and wmav2
Originally committed as revision 21255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 20:18:22 +00:00
Reimar Döffinger
ae5e8caa3d Add ROQ format regression test.
Originally committed as revision 20811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 17:34:24 +00:00
Stefano Sabatini
dae658d764 Reduce the number of encoded frames for the dnxhd tests to 5.
Significantly reduce codectest execution time.

Originally committed as revision 20804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 13:52:19 +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
Stefano Sabatini
8f1e4d4ffc Split codec-regression.sh, and create the lavf-regression.sh script.
Originally committed as revision 20365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 17:01:47 +00:00
Måns Rullgård
2189dbc4a6 Fix codectest
Originally committed as revision 20360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 12:39:38 +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
Stefano Sabatini
3a408eff35 Move up the $test variable definition, together with the other
definitions of variables defined using the positional arguments of the
script.

Should ease the split of the file.

Originally committed as revision 20322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 21:59:17 +00:00
Stefano Sabatini
dd65909a78 Give symbolic names to the positional parameters of the
codec-regression.sh script.

Originally committed as revision 20321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 21:54:37 +00:00
Reimar Döffinger
a9b0204374 Do the dnxhd_720p_rd test with -threads 4 in order to also test the threading code.
Originally committed as revision 20205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-11 11:50:12 +00:00
Justin Ruggles
9797ce58b7 Add ALAC encoding and decoding regression tests.
Originally committed as revision 20188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-06 22:47:33 +00:00
Stefano Sabatini
e935fa9e17 Prefer -vcodec rawvideo over -vcodec huffyuv for lavfi regression
tests, as the use of huffyuv may cause the auto-insertion of a scale
filter, thus masking the mis-behavior of some filter.

Originally committed as revision 20088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 21:53:36 +00:00
Michael Kostylev
0e829974f5 Fix md5 program invocation for BSD.
patch by Michael Kostylev, michael.kostylev gmail com

Originally committed as revision 20086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 19:49:04 +00:00
Stefano Sabatini
7f5c14210b Remove duplicated / stray code which slipped in with r20057.
Originally committed as revision 20060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-27 10:29:24 +00:00
Reimar Döffinger
06d7f30a9f Get rid of "function" "keywords" in lavfilter testing code, hopefully will
make regressions tests runnable again with all shells.

Originally committed as revision 20059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-27 10:06:35 +00:00
Stefano Sabatini
40e024091d Implement a lavfitest target for testing regressions in libavfilter.
The target is disabled.

See the thread: "[PATCH] libavfilter-soc: regression test for libavfilter".

Originally committed as revision 20057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-27 09:33:37 +00:00
Måns Rullgård
670bd2005a regtest: do not write to /tmp/ffmpeg$$
Nothing useful was ever written to this file.  It did, however,
often cause spurious failures when the file was left behind by
another user on the system.

Originally committed as revision 19938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 02:46:09 +00:00
Måns Rullgård
96fdb62428 Split dnxhd regression test so the parts can run in parallel
Originally committed as revision 19936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 01:40:12 +00:00
Reimar Döffinger
3fdd82768d Use default sws_flags for dnxhd regression tests and also test the "-mbd rd"
variant of the encoder.

Originally committed as revision 19923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-19 10:53:23 +00:00