Increase Westwood Studios VQA palette dynamics.

diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 5db8a22b09c6b7a3060b39e8f172dfce1eff0e53..917e04be47d1b2b43802794da0ca69f9ff816d1c 100644 (file)
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -403,6 +403,7 @@ static void vqa_decode_chunk(VqaContext *s)
             g = s->buf[cpl0_chunk++] * 4;
             b = s->buf[cpl0_chunk++] * 4;
             s->palette[i] = 0xFF << 24 | r << 16 | g << 8 | b;
+            s->palette[i] |= s->palette[i] >> 6 & 0x30303;
         }
     }
 

diff --git a/tests/ref/fate/vqa-cc b/tests/ref/fate/vqa-cc
index d7d7f10e9f6eb071fcb0db578dc0be0b7936b098..e15e727fa180f6f8446d4ae83a399cb1309a1b50 100644 (file)
--- a/tests/ref/fate/vqa-cc
+++ b/tests/ref/fate/vqa-cc
@@ -3,70 +3,70 @@
 0, 6000, 192000, 0x00000000
 0, 12000, 192000, 0x00000000
 0, 18000, 192000, 0x00000000
-0, 24000, 192000, 0xcd900ccc
-0, 30000, 192000, 0xfd496438
-0, 36000, 192000, 0x965f0bf3
-0, 42000, 192000, 0x378fca5f
+0, 24000, 192000, 0x9ee00ccf
+0, 30000, 192000, 0x67256507
+0, 36000, 192000, 0x74c70e87
+0, 42000, 192000, 0x8ecdce9a
 1, 44996, 2940, 0x0f3c64cb
-0, 48000, 192000, 0x5ccd8966
+0, 48000, 192000, 0xc40f8efd
 1, 50996, 2940, 0xc90b9e78
-0, 54000, 192000, 0x859676f9
+0, 54000, 192000, 0xb8107dfb
 1, 56996, 2940, 0x146246a3
-0, 60000, 192000, 0x820bfb1c
+0, 60000, 192000, 0xb4e504eb
 1, 62996, 2940, 0xd22c714e
-0, 66000, 192000, 0x7570cc05
+0, 66000, 192000, 0x0c7fdb95
 1, 68996, 2940, 0xd86b681e
-0, 72000, 192000, 0xf38bdb06
+0, 72000, 192000, 0x58c9f045
 1, 74996, 2940, 0x12ec8186
-0, 78000, 192000, 0x9b0cbb44
+0, 78000, 192000, 0xcba9d0e9
 1, 80996, 2940, 0x69aa85b6
-0, 84000, 192000, 0x0ed70665
+0, 84000, 192000, 0x392a20f6
 1, 86996, 2940, 0xb24d33b0
-0, 90000, 192000, 0xd16de7fc
+0, 90000, 192000, 0xc37905cc
 1, 92996, 2940, 0x3f7b0f0d
-0, 96000, 192000, 0x97afb484
+0, 96000, 192000, 0xe278cf95
 1, 98996, 2940, 0x64f10f7e
-0, 102000, 192000, 0x012893f3
+0, 102000, 192000, 0x3d03b01d
 1, 104996, 2940, 0xd6ea379a
-0, 108000, 192000, 0x742a4b43
+0, 108000, 192000, 0x16a26f28
 1, 110996, 2940, 0x7c38e830
-0, 114000, 192000, 0x309dcd75
+0, 114000, 192000, 0xdd17f51c
 1, 116996, 2940, 0xc28ff132
-0, 120000, 192000, 0xed7814ac
+0, 120000, 192000, 0x19703b85
 1, 122996, 2940, 0xe7b11629
-0, 126000, 192000, 0xdb7de3d7
+0, 126000, 192000, 0xe51f0e70
 1, 128996, 2940, 0xeb86fdcb
-0, 132000, 192000, 0xe18679a3
+0, 132000, 192000, 0x6f94ad2a
 1, 134996, 2940, 0x5508f586
-0, 138000, 192000, 0xb1f213f4
+0, 138000, 192000, 0x71e449f1
 1, 140996, 2940, 0xf4fa1f1b
-0, 144000, 192000, 0x33c99b5c
+0, 144000, 192000, 0x1dcacc52
 1, 146996, 2940, 0x9e5ff976
-0, 150000, 192000, 0xf66c0c91
+0, 150000, 192000, 0x49c23f58
 1, 152996, 2940, 0xcfc4e08f
-0, 156000, 192000, 0x929cdc73
+0, 156000, 192000, 0x4ce61551
 1, 158996, 2940, 0x74bde7ed
-0, 162000, 192000, 0xa723fc3b
+0, 162000, 192000, 0xe54832d5
 1, 164996, 2940, 0x3e4ae245
-0, 168000, 192000, 0xe6395ccc
+0, 168000, 192000, 0xbae28a59
 1, 170996, 2940, 0x4c6a8e56
-0, 174000, 192000, 0x147fbf74
+0, 174000, 192000, 0xe8a4efbe
 1, 176996, 2940, 0xa09d86ab
-0, 180000, 192000, 0x3ec62d28
+0, 180000, 192000, 0xe9e96883
 1, 182996, 2940, 0xc8531912
-0, 186000, 192000, 0x22104ffb
+0, 186000, 192000, 0xa5468c49
 1, 188996, 2940, 0xa5f266aa
-0, 192000, 192000, 0x91f25f58
+0, 192000, 192000, 0x7ec6936a
 1, 194996, 2940, 0x587a4187
-0, 198000, 192000, 0xc91b0e4e
+0, 198000, 192000, 0x46e53ee4
 1, 200996, 2940, 0x14752d45
-0, 204000, 192000, 0x4683df56
+0, 204000, 192000, 0x937b168a
 1, 206996, 2940, 0x558cde10
-0, 210000, 192000, 0x8ef8932a
+0, 210000, 192000, 0xed76cec4
 1, 212996, 2940, 0x735fee38
-0, 216000, 192000, 0xce6c0ec0
+0, 216000, 192000, 0x4b9f454d
 1, 218996, 2940, 0xac8bb6c8
-0, 222000, 192000, 0xcc10e2a0
+0, 222000, 192000, 0xb58c1566
 1, 224996, 2940, 0xa503c73b
 1, 230996, 2940, 0x7cd588a3
 1, 236996, 2940, 0xa6974b04