diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-22 11:56:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-22 12:08:52 +0200 |
| commit | 4095fa903830f8395a26d6ee38c77ad6333a4f5e (patch) | |
| tree | 828ada22309e543a181997b63c6ffca6868731ac /tests | |
| parent | 657eac048eb267d781de83849fe7616d29320832 (diff) | |
| parent | bb32fded3623a20ff8999c2924315841c08c985c (diff) | |
| download | ffmpeg-4095fa903830f8395a26d6ee38c77ad6333a4f5e.tar.gz | |
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>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/codec-regression.sh | 5 | ||||
| -rw-r--r-- | tests/ref/vsynth1/dnxhd_720p_10bit | 4 | ||||
| -rw-r--r-- | tests/ref/vsynth2/dnxhd_720p_10bit | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 981cc2f74c..7e9d88662e 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -235,6 +235,11 @@ do_video_encoding dnxhd-720p-rd.dnxhd "-threads 4 -mbd rd -s hd720 -b 90M -pix_f do_video_decoding "" "-s cif -pix_fmt yuv420p" fi +if [ -n "$do_dnxhd_720p_10bit" ] ; then +do_video_encoding dnxhd-720p-10bit.dnxhd "-s hd720 -b 90M -pix_fmt yuv422p10 -vframes 5 -an" +do_video_decoding "" "-s cif -pix_fmt yuv420p" +fi + if [ -n "$do_svq1" ] ; then do_video_encoding svq1.mov "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410p" do_video_decoding "" "-pix_fmt yuv420p" diff --git a/tests/ref/vsynth1/dnxhd_720p_10bit b/tests/ref/vsynth1/dnxhd_720p_10bit new file mode 100644 index 0000000000..b307050338 --- /dev/null +++ b/tests/ref/vsynth1/dnxhd_720p_10bit @@ -0,0 +1,4 @@ +cb29b6ae4e1562d95f9311991fef98df *./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd +2293760 ./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd +2f45bb1af7da5dd3dca870ac87237b7d *./tests/data/dnxhd_720p_10bit.vsynth1.out.yuv +stddev: 6.27 PSNR: 32.18 MAXDIFF: 64 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth2/dnxhd_720p_10bit b/tests/ref/vsynth2/dnxhd_720p_10bit new file mode 100644 index 0000000000..df30f67368 --- /dev/null +++ b/tests/ref/vsynth2/dnxhd_720p_10bit @@ -0,0 +1,4 @@ +8648511257afb816b5b911706ca391db *./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd +2293760 ./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd +391b6f5aa7c7b488b479cb43d420b860 *./tests/data/dnxhd_720p_10bit.vsynth2.out.yuv +stddev: 1.35 PSNR: 45.46 MAXDIFF: 23 bytes: 760320/ 7603200 |