avcodec/vp6: use rounded shift for chroma motion vector calculation

Partially fixes: https://trac.ffmpeg.org/ticket/1282

Signed-off-by: Peter Ross <pross@xvid.org>

1 files changed, 171 insertions, 171 deletions

diff --git a/tests/ref/fate/vp6f b/tests/ref/fate/vp6f
index 65e113174a..2da2eddc8c 100644
--- a/tests/ref/fate/vp6f
+++ b/tests/ref/fate/vp6f
@@ -4,176 +4,176 @@
 #dimensions 0: 112x80
 #sar 0: 0/1
 0,          0,          0,        1,    13440, 0x7cb0a22f
-0,          1,          1,        1,    13440, 0xdfcea6ba
-0,          2,          2,        1,    13440, 0x59b2a5da
-0,          3,          3,        1,    13440, 0x12f1b2d8
-0,          4,          4,        1,    13440, 0x280fb9f6
-0,          5,          5,        1,    13440, 0x7bace8b3
-0,          6,          6,        1,    13440, 0x4ec91480
-0,          7,          7,        1,    13440, 0xa8010450
-0,          8,          8,        1,    13440, 0x61d8fc46
-0,          9,          9,        1,    13440, 0x242bb24e
-0,         10,         10,        1,    13440, 0x88397a36
-0,         11,         11,        1,    13440, 0x10e15726
-0,         12,         12,        1,    13440, 0x3018438c
-0,         13,         13,        1,    13440, 0xbbb94c21
-0,         14,         14,        1,    13440, 0xfc3e5e2b
-0,         15,         15,        1,    13440, 0xeaa69354
-0,         16,         16,        1,    13440, 0x96f1cc01
-0,         17,         17,        1,    13440, 0x333fdaff
-0,         18,         18,        1,    13440, 0xb5230ed2
-0,         19,         19,        1,    13440, 0x59383446
-0,         20,         20,        1,    13440, 0x954939e6
-0,         21,         21,        1,    13440, 0x53813d2f
-0,         22,         22,        1,    13440, 0x3ca53600
-0,         23,         23,        1,    13440, 0x7b30227a
-0,         24,         24,        1,    13440, 0x5145bbfe
-0,         25,         25,        1,    13440, 0xa0979632
-0,         26,         26,        1,    13440, 0x08026e21
-0,         27,         27,        1,    13440, 0x3f456d1e
-0,         28,         28,        1,    13440, 0x7d036b62
-0,         29,         29,        1,    13440, 0x508085fb
-0,         30,         30,        1,    13440, 0x251dc193
-0,         31,         31,        1,    13440, 0xf3121c9b
-0,         32,         32,        1,    13440, 0xf5da772e
-0,         33,         33,        1,    13440, 0x8179ccf7
-0,         34,         34,        1,    13440, 0xd57ceeb3
-0,         35,         35,        1,    13440, 0xc8f2169c
-0,         36,         36,        1,    13440, 0xbf8296c3
-0,         37,         37,        1,    13440, 0xee1927d0
-0,         38,         38,        1,    13440, 0xdd84e8d1
-0,         39,         39,        1,    13440, 0x7be57be2
-0,         40,         40,        1,    13440, 0xae353f91
-0,         41,         41,        1,    13440, 0x3ae927f2
-0,         42,         42,        1,    13440, 0x417227c6
-0,         43,         43,        1,    13440, 0x32572bea
-0,         44,         44,        1,    13440, 0x8b9e4839
-0,         45,         45,        1,    13440, 0xad669441
-0,         46,         46,        1,    13440, 0xc9de99a6
-0,         47,         47,        1,    13440, 0xb3ffb88b
-0,         48,         48,        1,    13440, 0xb321b8a0
-0,         49,         49,        1,    13440, 0x2efdbf53
-0,         50,         50,        1,    13440, 0x9b7aa566
-0,         51,         51,        1,    13440, 0x563c8d60
-0,         52,         52,        1,    13440, 0xe3848ee8
-0,         53,         53,        1,    13440, 0xa84b8f1d
-0,         54,         54,        1,    13440, 0x52da9f9f
-0,         55,         55,        1,    13440, 0x2ed56d97
-0,         56,         56,        1,    13440, 0x4e8534c2
-0,         57,         57,        1,    13440, 0x318900a6
-0,         58,         58,        1,    13440, 0xda96de39
-0,         59,         59,        1,    13440, 0xaae7ac0b
+0,          1,          1,        1,    13440, 0xcb06a6b6
+0,          2,          2,        1,    13440, 0x812ea5c9
+0,          3,          3,        1,    13440, 0xc378b303
+0,          4,          4,        1,    13440, 0x0528ba5f
+0,          5,          5,        1,    13440, 0x5d97e8fe
+0,          6,          6,        1,    13440, 0x05d914df
+0,          7,          7,        1,    13440, 0xfdf804c6
+0,          8,          8,        1,    13440, 0x9db5fcb8
+0,          9,          9,        1,    13440, 0xd33db2ab
+0,         10,         10,        1,    13440, 0x6c147a86
+0,         11,         11,        1,    13440, 0x300f577d
+0,         12,         12,        1,    13440, 0x4f4443c8
+0,         13,         13,        1,    13440, 0x6ed84c79
+0,         14,         14,        1,    13440, 0xa0dc5e2a
+0,         15,         15,        1,    13440, 0x4ab092d4
+0,         16,         16,        1,    13440, 0x39c9cb60
+0,         17,         17,        1,    13440, 0x46c2da59
+0,         18,         18,        1,    13440, 0x0eed0e66
+0,         19,         19,        1,    13440, 0xa4a43403
+0,         20,         20,        1,    13440, 0x323939cd
+0,         21,         21,        1,    13440, 0x6b393cc0
+0,         22,         22,        1,    13440, 0x59da35b8
+0,         23,         23,        1,    13440, 0x4511224f
+0,         24,         24,        1,    13440, 0xe96cbbbf
+0,         25,         25,        1,    13440, 0x15dc9608
+0,         26,         26,        1,    13440, 0xde056e0a
+0,         27,         27,        1,    13440, 0xfde76d13
+0,         28,         28,        1,    13440, 0xd9bf6b4e
+0,         29,         29,        1,    13440, 0x0a3c85bd
+0,         30,         30,        1,    13440, 0x6edfc17f
+0,         31,         31,        1,    13440, 0xf4561c94
+0,         32,         32,        1,    13440, 0x2fdf776f
+0,         33,         33,        1,    13440, 0xb7c7cd69
+0,         34,         34,        1,    13440, 0x5247ef0d
+0,         35,         35,        1,    13440, 0xeec31762
+0,         36,         36,        1,    13440, 0x486097dd
+0,         37,         37,        1,    13440, 0x9bcf2934
+0,         38,         38,        1,    13440, 0x4a5dea6a
+0,         39,         39,        1,    13440, 0x35997d87
+0,         40,         40,        1,    13440, 0xa4bf415b
+0,         41,         41,        1,    13440, 0x677229fa
+0,         42,         42,        1,    13440, 0xbe5229bb
+0,         43,         43,        1,    13440, 0x8d012e0a
+0,         44,         44,        1,    13440, 0x74ec49b5
+0,         45,         45,        1,    13440, 0xa6f595d0
+0,         46,         46,        1,    13440, 0x23b59ba7
+0,         47,         47,        1,    13440, 0xc471baab
+0,         48,         48,        1,    13440, 0x8d6ebaee
+0,         49,         49,        1,    13440, 0x6338c1c1
+0,         50,         50,        1,    13440, 0x0d93a811
+0,         51,         51,        1,    13440, 0x260e901e
+0,         52,         52,        1,    13440, 0xad05919b
+0,         53,         53,        1,    13440, 0x04d1921d
+0,         54,         54,        1,    13440, 0xac00a249
+0,         55,         55,        1,    13440, 0xcb667031
+0,         56,         56,        1,    13440, 0x3f4236a1
+0,         57,         57,        1,    13440, 0xf38e029b
+0,         58,         58,        1,    13440, 0x3d5ae06e
+0,         59,         59,        1,    13440, 0x9b30ae5e
 0,         60,         60,        1,    13440, 0x7533ad99
-0,         61,         61,        1,    13440, 0x4e70c2c9
-0,         62,         62,        1,    13440, 0x9ce5e3fa
-0,         63,         63,        1,    13440, 0xc788fbbc
-0,         64,         64,        1,    13440, 0xd36604a9
-0,         65,         65,        1,    13440, 0x246221a4
-0,         66,         66,        1,    13440, 0x290c5c2b
-0,         67,         67,        1,    13440, 0xde6c68ec
-0,         68,         68,        1,    13440, 0x56248dbf
-0,         69,         69,        1,    13440, 0x5b898cbd
-0,         70,         70,        1,    13440, 0x090574b9
-0,         71,         71,        1,    13440, 0x8df2814a
-0,         72,         72,        1,    13440, 0xd4a6b285
-0,         73,         73,        1,    13440, 0xa016e921
-0,         74,         74,        1,    13440, 0x7f93fdc1
-0,         75,         75,        1,    13440, 0xfd0dee6f
-0,         76,         76,        1,    13440, 0xef04ce0e
-0,         77,         77,        1,    13440, 0x7560bee3
-0,         78,         78,        1,    13440, 0x5a8cdc85
-0,         79,         79,        1,    13440, 0x4788f7bc
-0,         80,         80,        1,    13440, 0xc001e34d
-0,         81,         81,        1,    13440, 0xc687eb74
-0,         82,         82,        1,    13440, 0xbf20feba
-0,         83,         83,        1,    13440, 0xd32647a8
-0,         84,         84,        1,    13440, 0xe69a955a
-0,         85,         85,        1,    13440, 0x1b56951f
-0,         86,         86,        1,    13440, 0xd1977378
-0,         87,         87,        1,    13440, 0x1620357d
-0,         88,         88,        1,    13440, 0x2596116f
-0,         89,         89,        1,    13440, 0x7473feca
-0,         90,         90,        1,    13440, 0x7f92bb47
-0,         91,         91,        1,    13440, 0x6866a683
-0,         92,         92,        1,    13440, 0xe9b08d7e
-0,         93,         93,        1,    13440, 0xa3fd7546
-0,         94,         94,        1,    13440, 0xa4416522
-0,         95,         95,        1,    13440, 0xd8f5572e
-0,         96,         96,        1,    13440, 0xf5746dbd
-0,         97,         97,        1,    13440, 0x256a87c6
-0,         98,         98,        1,    13440, 0x722aa2c8
-0,         99,         99,        1,    13440, 0xb26de5f5
-0,        100,        100,        1,    13440, 0x117f0841
-0,        101,        101,        1,    13440, 0xda2d192c
-0,        102,        102,        1,    13440, 0xb022442d
-0,        103,        103,        1,    13440, 0xbc4044f2
-0,        104,        104,        1,    13440, 0x68b330da
-0,        105,        105,        1,    13440, 0xc07228cf
-0,        106,        106,        1,    13440, 0xaa3f3d44
-0,        107,        107,        1,    13440, 0x25867aad
-0,        108,        108,        1,    13440, 0xa3ecb432
-0,        109,        109,        1,    13440, 0x93ccdcbb
-0,        110,        110,        1,    13440, 0x8302fa4f
-0,        111,        111,        1,    13440, 0x2f960f33
-0,        112,        112,        1,    13440, 0x15d41d14
-0,        113,        113,        1,    13440, 0x636529d0
-0,        114,        114,        1,    13440, 0x11035be5
-0,        115,        115,        1,    13440, 0x9b6e9167
-0,        116,        116,        1,    13440, 0x7b01adc7
+0,         61,         61,        1,    13440, 0x29c7c2d7
+0,         62,         62,        1,    13440, 0x1aaae414
+0,         63,         63,        1,    13440, 0xd9b1fc03
+0,         64,         64,        1,    13440, 0xcd2b0549
+0,         65,         65,        1,    13440, 0x6852223c
+0,         66,         66,        1,    13440, 0xaa765ce6
+0,         67,         67,        1,    13440, 0x022169d5
+0,         68,         68,        1,    13440, 0x0e478e90
+0,         69,         69,        1,    13440, 0xc2a08d9b
+0,         70,         70,        1,    13440, 0xe16a75f1
+0,         71,         71,        1,    13440, 0x3b218252
+0,         72,         72,        1,    13440, 0x5e27b3c8
+0,         73,         73,        1,    13440, 0x27a0eaf9
+0,         74,         74,        1,    13440, 0xe002ff74
+0,         75,         75,        1,    13440, 0x8585f024
+0,         76,         76,        1,    13440, 0x5a74cfe6
+0,         77,         77,        1,    13440, 0xb10ec139
+0,         78,         78,        1,    13440, 0xe9e1de94
+0,         79,         79,        1,    13440, 0x5a29fa1c
+0,         80,         80,        1,    13440, 0x75dce5f8
+0,         81,         81,        1,    13440, 0xbceaee2c
+0,         82,         82,        1,    13440, 0xf9dc00f9
+0,         83,         83,        1,    13440, 0x4b6549f4
+0,         84,         84,        1,    13440, 0x0f2097dc
+0,         85,         85,        1,    13440, 0x844d97df
+0,         86,         86,        1,    13440, 0xee47764b
+0,         87,         87,        1,    13440, 0x647938d6
+0,         88,         88,        1,    13440, 0xf4de156a
+0,         89,         89,        1,    13440, 0x53cd02e8
+0,         90,         90,        1,    13440, 0x6f39bedb
+0,         91,         91,        1,    13440, 0x3192aa64
+0,         92,         92,        1,    13440, 0xb38591cd
+0,         93,         93,        1,    13440, 0xd4407a1b
+0,         94,         94,        1,    13440, 0x3f6f69f4
+0,         95,         95,        1,    13440, 0x62cb5c21
+0,         96,         96,        1,    13440, 0x592472ea
+0,         97,         97,        1,    13440, 0xf7748d1d
+0,         98,         98,        1,    13440, 0x88ada886
+0,         99,         99,        1,    13440, 0xdc92ebc6
+0,        100,        100,        1,    13440, 0x97700e4f
+0,        101,        101,        1,    13440, 0x77f21f6e
+0,        102,        102,        1,    13440, 0x0c9f4a72
+0,        103,        103,        1,    13440, 0xd3b44b28
+0,        104,        104,        1,    13440, 0x3a023773
+0,        105,        105,        1,    13440, 0xf3c72faf
+0,        106,        106,        1,    13440, 0x2f144498
+0,        107,        107,        1,    13440, 0x96ac81db
+0,        108,        108,        1,    13440, 0xef07bb83
+0,        109,        109,        1,    13440, 0xf220e3e7
+0,        110,        110,        1,    13440, 0x2e7201dc
+0,        111,        111,        1,    13440, 0x56da16de
+0,        112,        112,        1,    13440, 0xc9ec24ed
+0,        113,        113,        1,    13440, 0x951d31d7
+0,        114,        114,        1,    13440, 0xb4e363c3
+0,        115,        115,        1,    13440, 0x4aae996d
+0,        116,        116,        1,    13440, 0xbbe0b6f6
 0,        117,        117,        1,    13440, 0xa237e05d
-0,        118,        118,        1,    13440, 0xd2f4f134
-0,        119,        119,        1,    13440, 0x2052d368
-0,        120,        120,        1,    13440, 0x08f7ae0d
-0,        121,        121,        1,    13440, 0xa89185bc
-0,        122,        122,        1,    13440, 0xfa628236
-0,        123,        123,        1,    13440, 0xdf79848b
-0,        124,        124,        1,    13440, 0xd19a906f
-0,        125,        125,        1,    13440, 0x219f9324
-0,        126,        126,        1,    13440, 0x46509b6d
-0,        127,        127,        1,    13440, 0xc5d9a568
-0,        128,        128,        1,    13440, 0xb21aaaa8
-0,        129,        129,        1,    13440, 0x925a97ed
-0,        130,        130,        1,    13440, 0xc5e3557f
-0,        131,        131,        1,    13440, 0x7c57155a
-0,        132,        132,        1,    13440, 0x6b26d005
-0,        133,        133,        1,    13440, 0xfdc7b369
-0,        134,        134,        1,    13440, 0x99919fc2
-0,        135,        135,        1,    13440, 0xcfe889e4
-0,        136,        136,        1,    13440, 0xd1196856
-0,        137,        137,        1,    13440, 0xec8348c6
-0,        138,        138,        1,    13440, 0x5ede0d9a
-0,        139,        139,        1,    13440, 0x198ef66e
-0,        140,        140,        1,    13440, 0x62fcefdf
-0,        141,        141,        1,    13440, 0x7791f415
-0,        142,        142,        1,    13440, 0xfbdb0029
-0,        143,        143,        1,    13440, 0xdab12b01
-0,        144,        144,        1,    13440, 0x646b2d5f
-0,        145,        145,        1,    13440, 0x5410f52e
-0,        146,        146,        1,    13440, 0x7186eef8
-0,        147,        147,        1,    13440, 0xca251ef6
-0,        148,        148,        1,    13440, 0x757c3b43
-0,        149,        149,        1,    13440, 0x59ff4982
-0,        150,        150,        1,    13440, 0xbe8ff084
-0,        151,        151,        1,    13440, 0xc85a9e38
-0,        152,        152,        1,    13440, 0x541b9a19
-0,        153,        153,        1,    13440, 0x274893c9
-0,        154,        154,        1,    13440, 0x7634b5d2
-0,        155,        155,        1,    13440, 0x1bd8e10c
-0,        156,        156,        1,    13440, 0xa661dfb1
-0,        157,        157,        1,    13440, 0x9d01bf92
-0,        158,        158,        1,    13440, 0xcb1eb220
-0,        159,        159,        1,    13440, 0x0ce27d25
-0,        160,        160,        1,    13440, 0x523b594f
-0,        161,        161,        1,    13440, 0xf0a04c4f
-0,        162,        162,        1,    13440, 0x0f0ffc3d
-0,        163,        163,        1,    13440, 0xb0d8b778
-0,        164,        164,        1,    13440, 0x5137a642
-0,        165,        165,        1,    13440, 0xd213a552
-0,        166,        166,        1,    13440, 0xc2fbc9b1
-0,        167,        167,        1,    13440, 0xfc2ee379
-0,        168,        168,        1,    13440, 0xfb80f737
-0,        169,        169,        1,    13440, 0xd6cb2447
-0,        170,        170,        1,    13440, 0x124b606d
-0,        171,        171,        1,    13440, 0xf788a066
-0,        172,        172,        1,    13440, 0xa16eed6e
-0,        173,        173,        1,    13440, 0x73ff0f82
+0,        118,        118,        1,    13440, 0xb683f189
+0,        119,        119,        1,    13440, 0xb8e7d3d3
+0,        120,        120,        1,    13440, 0x549daea3
+0,        121,        121,        1,    13440, 0x56158687
+0,        122,        122,        1,    13440, 0x25c6833f
+0,        123,        123,        1,    13440, 0x79618577
+0,        124,        124,        1,    13440, 0x4e77916c
+0,        125,        125,        1,    13440, 0x79bb946a
+0,        126,        126,        1,    13440, 0x28a69cc7
+0,        127,        127,        1,    13440, 0xcc03a6bb
+0,        128,        128,        1,    13440, 0x12e7ac2f
+0,        129,        129,        1,    13440, 0x66b099bc
+0,        130,        130,        1,    13440, 0xb218574c
+0,        131,        131,        1,    13440, 0xc55a172a
+0,        132,        132,        1,    13440, 0xefa9d1ca
+0,        133,        133,        1,    13440, 0xaedbb577
+0,        134,        134,        1,    13440, 0x279ca23c
+0,        135,        135,        1,    13440, 0x12a88c7b
+0,        136,        136,        1,    13440, 0xc3c46ae3
+0,        137,        137,        1,    13440, 0x41954bf2
+0,        138,        138,        1,    13440, 0xe19e1137
+0,        139,        139,        1,    13440, 0xd5c5fa3e
+0,        140,        140,        1,    13440, 0xe391f3a4
+0,        141,        141,        1,    13440, 0x6463f7e2
+0,        142,        142,        1,    13440, 0x4ad80409
+0,        143,        143,        1,    13440, 0x2de72edb
+0,        144,        144,        1,    13440, 0x120030f4
+0,        145,        145,        1,    13440, 0xc8f0f93a
+0,        146,        146,        1,    13440, 0x32e8f304
+0,        147,        147,        1,    13440, 0x86d62275
+0,        148,        148,        1,    13440, 0x98df3eec
+0,        149,        149,        1,    13440, 0x664d4d42
+0,        150,        150,        1,    13440, 0x3888f447
+0,        151,        151,        1,    13440, 0x959aa236
+0,        152,        152,        1,    13440, 0xebee9e20
+0,        153,        153,        1,    13440, 0xd1a197fb
+0,        154,        154,        1,    13440, 0x0e47b9f0
+0,        155,        155,        1,    13440, 0xe359e545
+0,        156,        156,        1,    13440, 0x02cae3c1
+0,        157,        157,        1,    13440, 0x7218c409
+0,        158,        158,        1,    13440, 0x0805b6b7
+0,        159,        159,        1,    13440, 0x13ae816f
+0,        160,        160,        1,    13440, 0x1cda5d9b
+0,        161,        161,        1,    13440, 0x125b509f
+0,        162,        162,        1,    13440, 0xb63500cf
+0,        163,        163,        1,    13440, 0x1229bc6a
+0,        164,        164,        1,    13440, 0x04e0ab7d
+0,        165,        165,        1,    13440, 0xee90aa6b
+0,        166,        166,        1,    13440, 0xe712cee3
+0,        167,        167,        1,    13440, 0xbdb1e8a4
+0,        168,        168,        1,    13440, 0xb651fc4b
+0,        169,        169,        1,    13440, 0xd1ba297a
+0,        170,        170,        1,    13440, 0xa64065df
+0,        171,        171,        1,    13440, 0x6865a618
+0,        172,        172,        1,    13440, 0x1922f326
+0,        173,        173,        1,    13440, 0xd2111537