diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 02:14:09 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 15:58:59 +0100 |
commit | a7ea733b721e034447e4e5bb013e2dd25614f530 (patch) | |
tree | e6caf1ae6f15b1e5bee7b4b6c93d4f6fb78a8fbb | |
parent | cca2772e168990616615745e783df5b2c2d75a40 (diff) | |
download | ffmpeg-a7ea733b721e034447e4e5bb013e2dd25614f530.tar.gz |
avcodec/simple_idct_template: fix row rounder
MSE changes from 0.04890000 to 0.02969844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/simple_idct_template.c | 2 | ||||
-rw-r--r-- | tests/ref/fate/prores-422 | 4 | ||||
-rw-r--r-- | tests/ref/fate/prores-422_hq | 4 | ||||
-rw-r--r-- | tests/ref/fate/prores-422_lt | 4 | ||||
-rw-r--r-- | tests/ref/fate/prores-422_proxy | 4 | ||||
-rw-r--r-- | tests/ref/fate/prores-alpha | 4 | ||||
-rw-r--r-- | tests/ref/fate/prores-alpha_skip | 4 | ||||
-rw-r--r-- | tests/ref/fate/prores-transparency | 2 | ||||
-rw-r--r-- | tests/ref/fate/prores-transparency_skip | 2 | ||||
-rw-r--r-- | tests/ref/vsynth/vsynth1-prores | 2 | ||||
-rw-r--r-- | tests/ref/vsynth/vsynth1-prores_ks | 2 | ||||
-rw-r--r-- | tests/ref/vsynth/vsynth2-prores | 2 | ||||
-rw-r--r-- | tests/ref/vsynth/vsynth2-prores_ks | 4 |
13 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c index 559b6e46db..838cea4951 100644 --- a/libavcodec/simple_idct_template.c +++ b/libavcodec/simple_idct_template.c @@ -136,7 +136,7 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift) } #endif - a0 = (W4 * row[0]) + (1 << (ROW_SHIFT - 1)); + a0 = (W4 * row[0]) + (1 << (ROW_SHIFT + extra_shift - 1)); a1 = a0; a2 = a0; a3 = a0; diff --git a/tests/ref/fate/prores-422 b/tests/ref/fate/prores-422 index 10cd6e4c3d..f4025112b0 100644 --- a/tests/ref/fate/prores-422 +++ b/tests/ref/fate/prores-422 @@ -1,3 +1,3 @@ #tb 0: 100/2997 -0, 0, 0, 1, 8294400, 0xdb4ce06a -0, 1, 1, 1, 8294400, 0xdb4ce06a +0, 0, 0, 1, 8294400, 0x57127dd9 +0, 1, 1, 1, 8294400, 0x57127dd9 diff --git a/tests/ref/fate/prores-422_hq b/tests/ref/fate/prores-422_hq index 6b751ad44b..61a5014a2d 100644 --- a/tests/ref/fate/prores-422_hq +++ b/tests/ref/fate/prores-422_hq @@ -1,3 +1,3 @@ #tb 0: 100/2997 -0, 0, 0, 1, 8294400, 0x9b2c65b0 -0, 1, 1, 1, 8294400, 0x9b2c65b0 +0, 0, 0, 1, 8294400, 0x978851f4 +0, 1, 1, 1, 8294400, 0x978851f4 diff --git a/tests/ref/fate/prores-422_lt b/tests/ref/fate/prores-422_lt index b8dd4e08a9..33976d0a44 100644 --- a/tests/ref/fate/prores-422_lt +++ b/tests/ref/fate/prores-422_lt @@ -1,3 +1,3 @@ #tb 0: 100/2997 -0, 0, 0, 1, 8294400, 0xaceddd97 -0, 1, 1, 1, 8294400, 0xaceddd97 +0, 0, 0, 1, 8294400, 0xdaff4019 +0, 1, 1, 1, 8294400, 0xdaff4019 diff --git a/tests/ref/fate/prores-422_proxy b/tests/ref/fate/prores-422_proxy index f516f484ba..5562dce7c6 100644 --- a/tests/ref/fate/prores-422_proxy +++ b/tests/ref/fate/prores-422_proxy @@ -1,3 +1,3 @@ #tb 0: 100/2997 -0, 0, 0, 1, 8294400, 0x3e3e9e16 -0, 1, 1, 1, 8294400, 0x3e3e9e16 +0, 0, 0, 1, 8294400, 0x007ba770 +0, 1, 1, 1, 8294400, 0x007ba770 diff --git a/tests/ref/fate/prores-alpha b/tests/ref/fate/prores-alpha index 79dcdd1646..d64cfd55a6 100644 --- a/tests/ref/fate/prores-alpha +++ b/tests/ref/fate/prores-alpha @@ -1,3 +1,3 @@ #tb 0: 100/2997 -0, 0, 0, 1, 16588800, 0x52b1b7fe -0, 1, 1, 1, 16588800, 0x52b1b7fe +0, 0, 0, 1, 16588800, 0x8e4dac48 +0, 1, 1, 1, 16588800, 0x8e4dac48 diff --git a/tests/ref/fate/prores-alpha_skip b/tests/ref/fate/prores-alpha_skip index 3ae2399994..559ec2be17 100644 --- a/tests/ref/fate/prores-alpha_skip +++ b/tests/ref/fate/prores-alpha_skip @@ -1,3 +1,3 @@ #tb 0: 100/2997 -0, 0, 0, 1, 12441600, 0x16ba9193 -0, 1, 1, 1, 12441600, 0x16ba9193 +0, 0, 0, 1, 12441600, 0xf11685dd +0, 1, 1, 1, 12441600, 0xf11685dd diff --git a/tests/ref/fate/prores-transparency b/tests/ref/fate/prores-transparency index b9e708be51..745e966e58 100644 --- a/tests/ref/fate/prores-transparency +++ b/tests/ref/fate/prores-transparency @@ -1,5 +1,5 @@ #tb 0: 1/25 #tb 1: 1/48000 -0, 0, 0, 1, 16588800, 0x93bbc444 +0, 0, 0, 1, 16588800, 0x7163b01a 1, 0, 0, 1024, 4096, 0x00000000 1, 1024, 1024, 896, 3584, 0x00000000 diff --git a/tests/ref/fate/prores-transparency_skip b/tests/ref/fate/prores-transparency_skip index 145801eff8..5fd8d0b25a 100644 --- a/tests/ref/fate/prores-transparency_skip +++ b/tests/ref/fate/prores-transparency_skip @@ -1,5 +1,5 @@ #tb 0: 1/25 #tb 1: 1/48000 -0, 0, 0, 1, 12441600, 0xec522972 +0, 0, 0, 1, 12441600, 0x627d1548 1, 0, 0, 1024, 4096, 0x00000000 1, 1024, 1024, 896, 3584, 0x00000000 diff --git a/tests/ref/vsynth/vsynth1-prores b/tests/ref/vsynth/vsynth1-prores index 3ff77f2a4f..8cac4bf5b8 100644 --- a/tests/ref/vsynth/vsynth1-prores +++ b/tests/ref/vsynth/vsynth1-prores @@ -1,4 +1,4 @@ 176b9fa03cc0946c6a41f2dcfad46805 *tests/data/fate/vsynth1-prores.mov 5022821 tests/data/fate/vsynth1-prores.mov -3356f8c3b753acbbe217e7a642e2bd93 *tests/data/fate/vsynth1-prores.out.rawvideo +fb4a9e025d12afc0dbbca8d82831858f *tests/data/fate/vsynth1-prores.out.rawvideo stddev: 2.47 PSNR: 40.27 MAXDIFF: 31 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-prores_ks b/tests/ref/vsynth/vsynth1-prores_ks index d9dbe906ee..d3c13b5d6a 100644 --- a/tests/ref/vsynth/vsynth1-prores_ks +++ b/tests/ref/vsynth/vsynth1-prores_ks @@ -1,4 +1,4 @@ 1d5522ee2fb507a66d236a09a172dc16 *tests/data/fate/vsynth1-prores_ks.mov 3858911 tests/data/fate/vsynth1-prores_ks.mov -576f494f8b01a787e97876d0c95e4e4b *tests/data/fate/vsynth1-prores_ks.out.rawvideo +100eb002413fe7a632d440dfbdf7e3ff *tests/data/fate/vsynth1-prores_ks.out.rawvideo stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-prores b/tests/ref/vsynth/vsynth2-prores index cc3932620d..b2169d827a 100644 --- a/tests/ref/vsynth/vsynth2-prores +++ b/tests/ref/vsynth/vsynth2-prores @@ -1,4 +1,4 @@ af885572d77d28e5ede27932bd68cdde *tests/data/fate/vsynth2-prores.mov 2844076 tests/data/fate/vsynth2-prores.mov -9ee2e0a1645e4d64a98b99d03fa62c28 *tests/data/fate/vsynth2-prores.out.rawvideo +387a3c23586c679b411c3eff2c9d9d06 *tests/data/fate/vsynth2-prores.out.rawvideo stddev: 1.31 PSNR: 45.77 MAXDIFF: 11 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-prores_ks b/tests/ref/vsynth/vsynth2-prores_ks index a73896ff84..d538a11d0e 100644 --- a/tests/ref/vsynth/vsynth2-prores_ks +++ b/tests/ref/vsynth/vsynth2-prores_ks @@ -1,4 +1,4 @@ c1c71cf2dbd6e332aacb6ab1c6affa59 *tests/data/fate/vsynth2-prores_ks.mov 3884596 tests/data/fate/vsynth2-prores_ks.mov -0e80f4c8523a5968dc461dd374a64b00 *tests/data/fate/vsynth2-prores_ks.out.rawvideo -stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200 +6cfe987de99cf8ac9d43bdc5cd150838 *tests/data/fate/vsynth2-prores_ks.out.rawvideo +stddev: 0.92 PSNR: 48.78 MAXDIFF: 10 bytes: 7603200/ 7603200 |