diff options
| author | Jerry Jiang <jerryjiang1128@gmail.com> | 2017-02-01 23:23:04 -0800 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-02-08 13:59:53 +0000 |
| commit | 884506dfe2e29a5b2bd2905ca4f17e277e32acb1 (patch) | |
| tree | efac020fcd29af2670ddbf40faff5edb5ddf718e /tests/fate | |
| parent | 2d453188c2303da641dafb048dc1806790526dfd (diff) | |
| download | ffmpeg-884506dfe2e29a5b2bd2905ca4f17e277e32acb1.tar.gz | |
Implement optimal huffman encoding for (M)JPEG.
> seems to break
> make fate-vsynth1-mjpeg-444
Fixed.
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/libavcodec.mak | 6 | ||||
| -rw-r--r-- | tests/fate/vcodec.mak | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 3bc74c11a7..32b0c1e6ab 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -49,5 +49,11 @@ fate-libavcodec-utils: CMD = run libavcodec/tests/utils fate-libavcodec-utils: CMP = null fate-libavcodec-utils: REF = /dev/null +FATE_LIBAVCODEC-yes += fate-libavcodec-huffman +fate-libavcodec-huffman: libavcodec/tests/mjpegenc_huffman$(EXESUF) +fate-libavcodec-huffman: CMD = run libavcodec/tests/mjpegenc_huffman +fate-libavcodec-huffman: CMP = null +fate-libavcodec-huffman: REF = /dev/null + FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC-yes) fate-libavcodec: $(FATE_LIBAVCODEC-yes) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index a51f16c9c1..8c24510937 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -213,11 +213,13 @@ fate-vsynth%-jpeg2000-97: DECINOPTS = -vcodec jpeg2000 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 -FATE_VCODEC-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell -fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p -fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p -fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 +FATE_VCODEC-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman +fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p +fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p +fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p +fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 +fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman optimal +fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman optimal FATE_VCODEC-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += mpeg1 mpeg1b fate-vsynth%-mpeg1: FMT = mpeg1video |