virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

j2kenc: Allow encoding with the 9/7 wavelet

Browse Source 
Also add a fate test that tests 9/7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-27 18:50:18 +02:00
parent 243cc38d94
commit ee189701a6
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/j2kenc.c
View File

@ -985,7 +985,7 @@ static av_cold int j2kenc_init(AVCodecContext *avctx)
codsty->nreslevels = 7;
codsty->log2_cblk_width = 4;
codsty->log2_cblk_height = 4;
codsty->transform = 1;
codsty->transform = avctx->prediction_method;
qntsty->nguardbits = 1;

6
tests/fate/vcodec.mak
View File

@ -89,9 +89,11 @@ FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls
fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int
fate-vsynth%-jpegls: DECOPTS = -sws_flags area
FATE_VCODEC-$(call ENCDEC, J2K, AVI) += j2k
fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
FATE_VCODEC-$(call ENCDEC, J2K, AVI) += j2k j2k-97
fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24
fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental
fate-vsynth%-j2k-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
fate-vsynth%-j2k-97: DECINOPTS = -vcodec j2k -strict experimental
FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
fate-vsynth%-ljpeg: ENCOPTS = -strict -1

4
tests/ref/vsynth/vsynth1-j2k-97 Normal file
View File

@ -0,0 +1,4 @@
a8e2db2dc6fcd4c9ea3150dc8d6d7619 *tests/data/fate/vsynth1-j2k-97.avi
2963264 tests/data/fate/vsynth1-j2k-97.avi
68f26a8d366fce47cbd003cadc861cd8 *tests/data/fate/vsynth1-j2k-97.out.rawvideo
stddev: 7.66 PSNR: 30.44 MAXDIFF: 58 bytes: 7603200/ 7603200

4
tests/ref/vsynth/vsynth2-j2k-97 Normal file
View File

@ -0,0 +1,4 @@
245c0ab429b553b39cac5989bb23c0ce *tests/data/fate/vsynth2-j2k-97.avi
1444170 tests/data/fate/vsynth2-j2k-97.avi
61c52045d566b70886113e2aeb8ddde4 *tests/data/fate/vsynth2-j2k-97.out.rawvideo
stddev: 7.13 PSNR: 31.06 MAXDIFF: 53 bytes: 7603200/ 7603200