swscale/output: Fix rounding offset in yuv2gbrp_full_X_c()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago · 76d377d0a0
parent 69f7aad571
commit 76d377d0a0
20 changed files with 89 additions and 89 deletions
--- a/libswscale/output.c
+++ b/libswscale/output.c
@ -1895,7 +1895,7 @@ yuv2gbrp_full_X_c(SwsContext *c, const int16_t *lumFilter,

        Y -= c->yuv2rgb_y_offset;
        Y *= c->yuv2rgb_y_coeff;
-        Y += 1 << 21;
+        Y += 1 << (SH-1);
        R = Y + V * c->yuv2rgb_v2r_coeff;
        G = Y + V * c->yuv2rgb_v2g_coeff + U * c->yuv2rgb_u2g_coeff;
        B = Y +                            U * c->yuv2rgb_u2b_coeff;
--- a/tests/ref/fate/filter-pixdesc-gbrp10be
+++ b/tests/ref/fate/filter-pixdesc-gbrp10be
@ -1 +1 @@
-pixdesc-gbrp10be    c4ee3140e42a264568834c29f2c78027
+pixdesc-gbrp10be    c2ba960cf177208de99d4cf8d63402b1
--- a/tests/ref/fate/filter-pixdesc-gbrp10le
+++ b/tests/ref/fate/filter-pixdesc-gbrp10le
@ -1 +1 @@
-pixdesc-gbrp10le    9a0cb9d105d80e6058efbb1127820329
+pixdesc-gbrp10le    870de5644f6eb7bfbf183bd89f45130a
--- a/tests/ref/fate/filter-pixdesc-gbrp12be
+++ b/tests/ref/fate/filter-pixdesc-gbrp12be
@ -1 +1 @@
-pixdesc-gbrp12be    e6ce20968d63ece72476d038bb99fb1d
+pixdesc-gbrp12be    d464c9f821b37c688b8a9196bd682938
--- a/tests/ref/fate/filter-pixdesc-gbrp12le
+++ b/tests/ref/fate/filter-pixdesc-gbrp12le
@ -1 +1 @@
-pixdesc-gbrp12le    df936efd70fb5751e72bd8c0a70a513f
+pixdesc-gbrp12le    0399e1a940870dd3e3fd7c4be7f9e681
--- a/tests/ref/fate/filter-pixdesc-gbrp14be
+++ b/tests/ref/fate/filter-pixdesc-gbrp14be
@ -1 +1 @@
-pixdesc-gbrp14be    b2ba152fcca2f5beef7c972948395a34
+pixdesc-gbrp14be    f430b5b2f8fdf778a708a332e0ef0ebf
--- a/tests/ref/fate/filter-pixdesc-gbrp14le
+++ b/tests/ref/fate/filter-pixdesc-gbrp14le
@ -1 +1 @@
-pixdesc-gbrp14le    66a0b4530129ca693aed5099fb2b93f6
+pixdesc-gbrp14le    0ca93f5e5dd4b75481a77f0a63c600d1
--- a/tests/ref/fate/filter-pixdesc-gbrp9be
+++ b/tests/ref/fate/filter-pixdesc-gbrp9be
@ -1 +1 @@
-pixdesc-gbrp9be     e3c5235e05fd8cd6ed3e48a4d95e58e0
+pixdesc-gbrp9be     78d289e0bd8ca8cca0674597b6d0fe2c
--- a/tests/ref/fate/filter-pixdesc-gbrp9le
+++ b/tests/ref/fate/filter-pixdesc-gbrp9le
@ -1 +1 @@
-pixdesc-gbrp9le     8ba96d3fe6e190f53660c225623e653c
+pixdesc-gbrp9le     a233e529a254da36dc1f539da6a3e9bc
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@ -20,14 +20,14 @@ bgra64be            c8d3217bf58d34f080ac88c0b0012c77
 bgra64le            b71d75a928aac14cb768403e6f6a9910
 gbrap               ae09c3e9dcbe0d1ef21b2342be369210
 gbrp                5fbc319e30110d19d539f5b274eddb6d
-gbrp10be            e71e0dc9c54419297e97a895bf57ab1c
-gbrp10le            11fb697197e79d27eeba4093a207e015
-gbrp12be            2a611bff3b8f63e1d99d0b0f5082eaed
-gbrp12le            bd4529ca9bd680d23a16ec65fdfb313b
-gbrp14be            b8ccc776dd1e57c39386d3cb5bdbe899
-gbrp14le            74431dd00ddf10d94d1db1496d10e42f
-gbrp9be             6d45b61c48b40c83b43cf2d4ecf4dc32
-gbrp9le             bc80da439638c59f1d822037f52739af
+gbrp10be            703a17591a2a5c236675c5101c349bcc
+gbrp10le            ee014153f55c011918df5b2394815780
+gbrp12be            527d337eb5813ebba7cf969ee660d423
+gbrp12le            fd192920b171a0cf88d61e8310e95d81
+gbrp14be            46d502db6dc5eb7e9da3c60016b2df91
+gbrp14le            1607f5c8f13360b53b8186f523996b1b
+gbrp9be             a4dc6f6f9bb051de2dc348b592ad4282
+gbrp9le             699da3a3b324f3fd001a56aee9683384
 gray                188590b1231afd231ea910815aef2b25
 gray16be            08d997a3faa25a3db9d6be272d282eef
 gray16le            df65eb804360795e3e38a2701fa9641a
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@ -20,14 +20,14 @@ bgra64be            1ad8dd02714cafec793fb89577ddde47
 bgra64le            dd29ec9aba43aa3e8f9f5b9a93ca8831
 gbrap               da6be176149efdfecb2a690bc64a644e
 gbrp                ec671f573c2105072ab68a1933c58fee
-gbrp10be            2a0f7e8216df19a835f086f5e552dbc8
-gbrp10le            a15e4359b58c5d0fef301ee3c2c3b85c
-gbrp12be            520ddafabd9dbb34262f223c0cea9d96
-gbrp12le            295f6d5bf35a941e4db83c01744a3c19
-gbrp14be            db73d2beadd837355c4cf08c33a631e4
-gbrp14le            76d4e3c0d2cad5c6cecac7fbc76645a7
-gbrp9be             b9c9837b92fa8dc7e32dff986da87cdb
-gbrp9le             04e8e8a2863307d24de78466ecf536cb
+gbrp10be            6f0130a41f01e58593d3840446dd94b7
+gbrp10le            9c152b7dfb7ad7bc477518d97316d04f
+gbrp12be            561516202a6e37dd19543f9bb3af339f
+gbrp12le            3e7f87d834748844ab326e22eb2b7487
+gbrp14be            057232bca98c472a003cc46b3fd939e4
+gbrp14le            d4764dba3c3efd1263c2c8e0f5ac9f6a
+gbrp9be             4af43999e5e9742992b6550ea5ad9b23
+gbrp9le             b4cbfa7878706a14295f09212e41f7fe
 gray                0d70b54b4b888ec4dbd89713620ac1ee
 gray16be            38f599da990224de86e3dc7a543121a9
 gray16le            9ff7c866bd98def4e6c91542c1c45f80
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@ -20,14 +20,14 @@ bgra64be            ec0bdef8663dc9d73818a48419cb4764
 bgra64le            9e2def541e51bc6e77fbffbff7fa146a
 gbrap               5bbed2c5c872748b38db078dbd7535fa
 gbrp                838025a3062f7f31e99196ce66961ad7
-gbrp10be            73cb1311d90dda83a4db617a4700075e
-gbrp10le            fcf0b1c6e045116517e26bc6edfa9418
-gbrp12be            6cacba42b26a20e523003666bb9bf31c
-gbrp12le            92bc95b034cad061420af56962c947d2
-gbrp14be            6f76bc354f4578c90613c8cd71cea14e
-gbrp14le            c7279cae8a3f1bb4f3e9935339343aca
-gbrp9be             8c71140fc83665db7f7d7fbdd9c552f1
-gbrp9le             1654c79e38dc78fdf106239ed2a7bd4f
+gbrp10be            f63c2555ea19fc78b00fd5b3e2b48e8c
+gbrp10le            be64c374ab318235d912372e99a0516a
+gbrp12be            ef164a1c062dc3572c61b9ef10897ca1
+gbrp12le            0527fdb6f75b1cb0d380809eb7a7589a
+gbrp14be            6aff3ad388e2ed97d59b71a75029746d
+gbrp14le            ed9ccbc7a4f3e269a2ec37d210359fd8
+gbrp9be             170da3a8644cbea61c3caeadc45354c5
+gbrp9le             da5d80e6f12cabaa7081bb85d3b7fd30
 gray                57fd8e6e00f6be8752726005974cce1b
 gray16be            e1700e056de9917744a7ff4ab2ca63fd
 gray16le            338de7ac5f7d36d5ad5ac2c8d5bbea68
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@ -20,14 +20,14 @@ bgra64be            64a4ec15bc35ede2018f650b50c2429b
 bgra64le            5029192d0f32383c9f25f8e7da7cb5a0
 gbrap               8096c8ee9ade98101348c10eb22504cb
 gbrp                506dea2fe492e985a396d1b11ccd8db3
-gbrp10be            d5c3b42e39c3f62d917cf2e4e9e073d9
-gbrp10le            fa28502ba68c55c55b6bb6f732e813f6
-gbrp12be            36140aa1ed675c148f64d259f914a2a3
-gbrp12le            30f0996103262ea8adb0629a07051df5
-gbrp14be            a0b22f06857eb537996f5b0d75557c53
-gbrp14le            e317ce07a605643c494f35b6e7229ea3
-gbrp9be             7b4d5e760b72817f4c3d7141b409b0c4
-gbrp9le             9a4523eab86a4e0c897d9a07ae9036b7
+gbrp10be            55bbfe2d472780dcbadf3027778caa0e
+gbrp10le            13a39077ab1b2c3b49afd3e250b84a77
+gbrp12be            f1b59334c687a39ba076fe47e6ee9515
+gbrp12le            e64ab4d290eb10476db165054720173f
+gbrp14be            b3806ade527ef7452c29106054946cd1
+gbrp14le            b01b1a05d8de36f51a133d25102fe1f3
+gbrp9be             b8d294d4bc81ceef1fb529e917c02e48
+gbrp9le             0d42cc9e222d806c33172781b45cb3e3
 gray                d96e0f1c73d3f0b9506d691b5cd36c73
 gray16be            293a36548ce16543494790f8f7f76a05
 gray16le            84f83f5fcbb5d458efb8395a50a3797e
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@ -20,14 +20,14 @@ bgra64be            1cabeafe9c21a4f7ccd976220f22ee5a
 bgra64le            1b15c01c94cf9af89273da1d1f994cff
 gbrap               28e8d545a8f32a330c9368c927d97b66
 gbrp                0ecfeca171ba3a1a2ff4e92f572b71cf
-gbrp10be            558636cef6abb12748abc01eb976ae53
-gbrp10le            d1f7cd56e675f4103c8325f328e8f076
-gbrp12be            cbee068250a510eac492019b3789223d
-gbrp12le            d8e19a9046f4befd9567ecb6fe44f1c4
-gbrp14be            0646dda397e0ffaa55b2f993db241153
-gbrp14le            5c66f1e622fecf35cc64b8d9956d2a0f
-gbrp9be             ca4ca6388207c69c494970fac2cacf7c
-gbrp9le             c24110afa41b18beb52a07910e2d576f
+gbrp10be            774398c2f81757a536c094f16cfc541a
+gbrp10le            e9a6434d691be541f789f850963da181
+gbrp12be            13d819d869f8e84aadca57e21883030e
+gbrp12le            22046339442c155fbb9b02ceff5e1c15
+gbrp14be            7e1d2f9d9bb7cc90d88540f36998acd6
+gbrp14le            91bb636f4e1f5d50312b136c185542e9
+gbrp9be             174de037c2a9f2b6fb4d9444ae0ff82f
+gbrp9le             ba7c2631fb2967aa909c66509bd243fe
 gray                8bd4ece1dbf89b20ee785e0515356e07
 gray16be            cf7294d9aa23e1b838692ec01ade587b
 gray16le            d91ce41e304419bcf32ac792f01bd64f
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@ -20,14 +20,14 @@ bgra64be            de7c036f20fc54d89690239cc6239678
 bgra64le            d1aa975fa03ce226008396b30a653420
 gbrap               2345d4dbd130d7c6d1cedad5954543bb
 gbrp                dc06edb62e70024a216c8e303b79b328
-gbrp10be            d0d52a2a87d545a5ddc7da6b95e862d7
-gbrp10le            6471cdb95c03b14ebcb86d807fa8035f
-gbrp12be            b955ca6256901b1640fefc7c0f1c489e
-gbrp12le            2dd46939b7e2440feac2c373aa48395e
-gbrp14be            93140bf6404b2b3647fbd56518ace212
-gbrp14le            2164009f7f646b039eaa488ade79db4f
-gbrp9be             e89c0674c92f103517d43d2a02698b45
-gbrp9le             7e79b4bbb589095c925d65cb7c037d44
+gbrp10be            321e7f061d8b9b5801221b6cf3c99666
+gbrp10le            799ed3afca01076439a0b6785b3dc4bb
+gbrp12be            7ca179ad8f7b018de48a48bdb0776965
+gbrp12le            c69843651e7e60e85c5e8a2fe4ecb290
+gbrp14be            5dc5e8131c25125347758e03d15b69e6
+gbrp14le            bf3d5dec9b58cecd4ca1c5d3a4d57c31
+gbrp9be             f029d87fa642f4261160471ad27fd53f
+gbrp9le             b310d3cf37f7b41d706155993f8f0584
 gray                52ae18648161ac43144f5c9cd2127786
 gray16be            92c3b09f371b610cc1b6a9776034f4d0
 gray16le            1db278d23a554e01910cedacc6c02521
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@ -20,14 +20,14 @@ bgra64be            c8d3217bf58d34f080ac88c0b0012c77
 bgra64le            b71d75a928aac14cb768403e6f6a9910
 gbrap               ae09c3e9dcbe0d1ef21b2342be369210
 gbrp                5fbc319e30110d19d539f5b274eddb6d
-gbrp10be            e71e0dc9c54419297e97a895bf57ab1c
-gbrp10le            11fb697197e79d27eeba4093a207e015
-gbrp12be            2a611bff3b8f63e1d99d0b0f5082eaed
-gbrp12le            bd4529ca9bd680d23a16ec65fdfb313b
-gbrp14be            b8ccc776dd1e57c39386d3cb5bdbe899
-gbrp14le            74431dd00ddf10d94d1db1496d10e42f
-gbrp9be             6d45b61c48b40c83b43cf2d4ecf4dc32
-gbrp9le             bc80da439638c59f1d822037f52739af
+gbrp10be            703a17591a2a5c236675c5101c349bcc
+gbrp10le            ee014153f55c011918df5b2394815780
+gbrp12be            527d337eb5813ebba7cf969ee660d423
+gbrp12le            fd192920b171a0cf88d61e8310e95d81
+gbrp14be            46d502db6dc5eb7e9da3c60016b2df91
+gbrp14le            1607f5c8f13360b53b8186f523996b1b
+gbrp9be             a4dc6f6f9bb051de2dc348b592ad4282
+gbrp9le             699da3a3b324f3fd001a56aee9683384
 gray                188590b1231afd231ea910815aef2b25
 gray16be            08d997a3faa25a3db9d6be272d282eef
 gray16le            df65eb804360795e3e38a2701fa9641a
--- a/tests/ref/fate/filter-pixfmts-pad
+++ b/tests/ref/fate/filter-pixfmts-pad
@ -7,10 +7,10 @@ bgr24               f8b65ad845905c7d0c93ca28dfbb826f
 bgra                929aac15e848038e367c250037575f9f
 gbrap               6712984b4a068ffa534f0cb35b2adc6f
 gbrp                3c94d39256db2409015df913fd330a90
-gbrp10le            f206db2a32ad484a59cf3e596bdc2866
-gbrp12le            be6463331985e2c8ed7bd910093ca4a2
-gbrp14le            9ae804cf217bec0a737c36c20573cbe5
-gbrp9le             9a86dab5661c213ce2b7e00ae48b4d1f
+gbrp10le            5b356737cd8a396f39bbdadb7cb35e06
+gbrp12le            91fdad0d1edf7bfa2805e2041e8da3cd
+gbrp14le            deb2c3af6b48faa52f6a1f6590a0cdf7
+gbrp9le             9e827f438e081d334a6cae7e282698b0
 gray                ddc663a0491df3959d9c5795dceaa72e
 gray16le            468bda6155bdc7a7a20c34d6e599fd16
 nv12                381574979cb04be10c9168540310afad
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@ -20,14 +20,14 @@ bgra64be            4e6a1b9f9c18b881c27d76611d45f737
 bgra64le            efeee0abcc658ebcff049d5e74d74943
 gbrap               e97ea4a104467c482173b7eaa57c14e3
 gbrp                dc3387f925f972c61aae7eb23cdc19f0
-gbrp10be            3a6d59192b6bb89ab42252b2b4818519
-gbrp10le            cc2d60d381b25fe2813540409f2d0af3
-gbrp12be            ea1da9b3c48baebcc651084b0884482c
-gbrp12le            e02a436dc448793fc8c64c9412726274
-gbrp14be            a065297ab4ef2f2f0c503f8f2ae43bd1
-gbrp14le            7b07beaf54e2feac774d3c905cbbf15e
-gbrp9be             b7bc652518457356444a840ef6d2bc56
-gbrp9le             0ed709f7828f0be5f828596f0720a82b
+gbrp10be            0277d4c3a8498d75e2783fb81379e481
+gbrp10le            f3d70f8ab845c3c9b8f7452e4a6e285a
+gbrp12be            fbd4e149c452c351c6d1c11d6b6e176a
+gbrp12le            c51d51c3b753d735eb22983397262c88
+gbrp14be            cd20808592e62cc439786c18a14b3e70
+gbrp14le            456f7d1ff5990aa6379137d84dd63862
+gbrp9be             d9c88968001e1452ff31fbc8d16b18a0
+gbrp9le             2ccfed0816bf6bd4bb3a5b7591d9603a
 gray                221201cc7cfc4964eacd8b3e426fd276
 gray16be            32891cb0928b1119d8d43a6e1bef0e2b
 gray16le            f96cfb5652b090dad52615930f0ce65f
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@ -20,14 +20,14 @@ bgra64be            31af33833f6d8f2e4a62683288770aa4
 bgra64le            45feb93863055282447d1ff89c5158bf
 gbrap               f26944c75b887e99bbf9183a59caa6aa
 gbrp                413b0f6ea51588d4be5f0c76d43d8796
-gbrp10be            c5b3dc30600adad66c8cb4edc3cfcd1d
-gbrp10le            5026424d4b352d267b74ccb2419fde7f
-gbrp12be            6c46e5d072b9c61515dd7caad60a127e
-gbrp12le            573b26e385e1ee0ffbc74868301314d6
-gbrp14be            522fc41b398715e08a895bc3c3f55742
-gbrp14le            32561510eb3d9c351b18b35b644b731d
-gbrp9be             6ac7c79a4c089b93912bcf0abb4d418d
-gbrp9le             cff296346d93e430cbc0acfbc91482ab
+gbrp10be            d02bd50db83213667808f5bacefe667c
+gbrp10le            2d4a5ebc773ffc3d857a6ef24afbe10e
+gbrp12be            a668b7dba68817736501386ffe9f3adc
+gbrp12le            299695016c22a4947d94b16f0975536b
+gbrp14be            eeebacfb19c970dd76ad044ef85e8fe5
+gbrp14le            6e93b87047e433995111eb5397751c3f
+gbrp9be             99c694dd47d12ae48fc8f47a0c410333
+gbrp9le             26e103a4ab99fb3f58667df490997a36
 gray                41811422d5819ed69389357294384c10
 gray16be            29f24ba7cb0fc4fd2ae78963d008f6e6
 gray16le            a37e9c4ea76e8eeddc2af8f600ba2c10
--- a/tests/ref/lavf/dpx
+++ b/tests/ref/lavf/dpx
@ -1,11 +1,11 @@
 4c8880d5835ffb5fe37c1ed8c8d404de *./tests/data/images/dpx/02.dpx
 ./tests/data/images/dpx/%02d.dpx CRC=0x6da01946
 305792 ./tests/data/images/dpx/02.dpx
-16d65ceaa127806dc7ede9391fe80872 *./tests/data/images/dpx/02.dpx
-./tests/data/images/dpx/%02d.dpx CRC=0x22dcc7a8
+7ca935d5d5e00c54acbc85565d3039b6 *./tests/data/images/dpx/02.dpx
+./tests/data/images/dpx/%02d.dpx CRC=0xe6663fba
 407168 ./tests/data/images/dpx/02.dpx
-02b4fd859d944075905e84e9f389bf23 *./tests/data/images/dpx/02.dpx
-./tests/data/images/dpx/%02d.dpx CRC=0x964b87ba
+a4cfea1797c928f2eff73573e559675d *./tests/data/images/dpx/02.dpx
+./tests/data/images/dpx/%02d.dpx CRC=0x1c755633
 609920 ./tests/data/images/dpx/02.dpx
 075963c3c08978b6a20555ba09161434 *./tests/data/images/dpx/02.dpx
 ./tests/data/images/dpx/%02d.dpx CRC=0xe5b9c023