Commit Graph

20 Commits

Author SHA1 Message Date
Michael Niedermayer
5a153604c9 Merge remote branch 'qatar/master'
* qatar/master:
  Fix FSF address copy paste error in some license headers.
  Add an aac sample which uses LTP to fate-aac.
DUPLICATE  [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
  arm: properly mark external symbol call

Conflicts:
	libavcodec/x86/ac3dsp.asm
	libavcodec/x86/deinterlace.asm
	libavcodec/x86/dsputil_yasm.asm
	libavcodec/x86/dsputilenc_yasm.asm
	libavcodec/x86/fft_mmx.asm
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/h264_chromamc.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264_idct.asm
	libavcodec/x86/h264_intrapred.asm
	libavcodec/x86/h264_weight.asm
	libavcodec/x86/vc1dsp_yasm.asm
	libavcodec/x86/vp3dsp.asm
	libavcodec/x86/vp56dsp.asm
	libavcodec/x86/vp8dsp.asm
	libavcodec/x86/x86util.asm
	libswscale/ppc/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-15 04:44:07 +02:00
Justin Ruggles
08e434b015 Add an aac sample which uses LTP to fate-aac. 2011-05-14 12:41:11 -04:00
Michael Niedermayer
72153419b5 Merge remote branch 'qatar/master'
* qatar/master: (33 commits)
  rtpdec_qdm2: Don't try to parse data packet if no configuration is received
  ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
  ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
  mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
  srtdec: make sure we don't write past the end of buffer
  wmaenc: improve channel count and bitrate error handling in encode_init()
  matroskaenc: make sure we don't produce invalid file with no codec ID
  matroskadec: check that pointers were initialized before accessing them
  lavf: fix function name in compute_pkt_fields2 av_dlog message
  lavf: fix av_find_best_stream when providing a wanted stream.
  lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
  ffmpeg: factorize quality calculation
  tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
  tiff: Prefer enum TiffCompr over int for TiffContext.compr.
  mov: Support edit list atom version 1.
  configure: Enable libpostproc automatically if GPL code is enabled.
  Cosmetics: fix prototypes in oggdec
  oggdec: fix memleak with continuous streams.
  matroskaenc: add missing new line in av_log() call
  dnxhdenc: add AVClass in private context.
  ...

swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.

Conflicts:
	configure
	ffmpeg.c
	libavformat/matroskaenc.c
	libavutil/pixfmt.h
	libswscale/ppc/swscale_template.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/fate/h264.mak
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_copy_le
	tests/ref/lavfi/pixfmts_null_le
	tests/ref/lavfi/pixfmts_scale_le
	tests/ref/lavfi/pixfmts_vflip_le

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-13 04:40:40 +02:00
Ronald S. Bultje
c8f487deae swscale: fix YUV420P 9/10bit support.
Fix handling of input if not in native endianness, and add support for
9/10-bit output. This allows us to force endianness of YUV420P 9/10bit
in the H264/10bit fate tests, which should fix them on big-endian
systems.
2011-05-11 19:15:14 -04:00
Michael Niedermayer
f1e7822e17 fate: Disable h264-conformance-frext-pph10i4_panasonic_a.
The file does not decode correctly yet the checksums match this wrongly
decoded file. Thus the checksums must be wrong.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-11 18:09:26 +02:00
Michael Niedermayer
0f6bbc5a06 h264-fate: Fix 10bit H264 tests on big endian.
framecrc returns different values when one swiches endianness,
this apparently has been missed by "the fork" who added the 10bit fate
tests. Sorry for missing this during the merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-11 16:47:47 +02:00
Ronald S. Bultje
23d10ce015 fate: add 10-bit H264 tests. 2011-05-10 07:24:41 -04:00
Janne Grunau
0ba832231d fate: add AAC LATM test 2011-04-06 20:55:58 +02:00
Mans Rullgard
5085a1a068 fate: simplify fft test rules
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 20:53:19 +01:00
Mans Rullgard
b41a108914 fate: add fixed-point fft/mdct tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 15:16:06 +01:00
Mans Rullgard
e63dd5fb04 fate: add h264 test for extreme cases in planar prediction
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-24 22:26:13 +00:00
Mans Rullgard
76edf2c137 fate: add lossless h264 test
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-22 03:08:21 +00:00
Mans Rullgard
3240b371f8 fate: simplify vp8 rules 2011-01-18 20:48:24 +00:00
Luca Barbato
8d660f7527 Make fate vp8 test cover emu_edge cases
Originally committed as revision 26134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 17:48:57 +00:00
Carl Eugen Hoyos
ad556addfd Fix h264-conformance-frext-frext_mmco4_sony_b conformance test.
This includes a revert of r25840

Originally committed as revision 25842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-29 10:35:57 +00:00
Reimar Döffinger
e61bb0852f Add test for cropping of interlaced H.264.
Originally committed as revision 25677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-04 21:48:54 +00:00
Vitor Sessak
c4ab519e00 Make "-fs ss" mean "make output file of size equals or less than ss"
instead of current "make output file of size less than ss".

Also use it to make MP3 tests more readable (using -fs xxx where xxx is
the requested output size, not something slightly lower).

Originally committed as revision 24884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 14:46:59 +00:00
Vitor Sessak
1c10978086 fix fate breakage, 10l to me (too much copy and pasting)
Originally committed as revision 24881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 12:27:27 +00:00
Vitor Sessak
680aefa2fe MP3 float decoder FATE tests
Originally committed as revision 24880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 12:17:03 +00:00
Måns Rullgård
4c3fbd4f93 fate: move some groups of related tests to their own files
This moves some groups of tests for single codecs to separate files,
and adds shorthands for running all tests in a group.

Originally committed as revision 24697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 18:47:20 +00:00