Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Increase FLI/FLC Animation palette dynamics for some samples.

Browse Source
pull/2/head
Carl Eugen Hoyos 13 years ago
parent 2b656844f8
commit 105cf82acb
3 changed files with 158 additions and 156 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/flicvideo.c
  2. 232
      tests/ref/fate/flic-af11-palette-change
  3. 80
      tests/ref/fate/flic-magiccarpet

2
libavcodec/flicvideo.c
Unescape View File

@ -239,6 +239,8 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
g = buf[stream_ptr++] << color_shift; g = buf[stream_ptr++] << color_shift;
b = buf[stream_ptr++] << color_shift; b = buf[stream_ptr++] << color_shift;
entry = 0xFF << 24 | r << 16 | g << 8 | b; entry = 0xFF << 24 | r << 16 | g << 8 | b;
if (color_shift == 2)
entry |= entry >> 6 & 0x30303;
if (s->palette[palette_ptr] != entry) if (s->palette[palette_ptr] != entry)
s->new_palette = 1; s->new_palette = 1;
s->palette[palette_ptr++] = entry; s->palette[palette_ptr++] = entry;

232
tests/ref/fate/flic-af11-palette-change
Unescape View File

@ -1,116 +1,116 @@
0, 0, 192000, 0x64da83e8 0, 0, 192000, 0x508ff8ac
0, 2571, 192000, 0xf59ccccc 0, 2571, 192000, 0xef0d4274
0, 5143, 192000, 0xaaa06c5c 0, 5143, 192000, 0x0d50e0dd
0, 7714, 192000, 0xa98f82c0 0, 7714, 192000, 0xf638f782
0, 10286, 192000, 0x164fbbdc 0, 10286, 192000, 0x40e4314b
0, 12857, 192000, 0x0b3abc0c 0, 12857, 192000, 0x0ce5318f
0, 15429, 192000, 0x47661943 0, 15429, 192000, 0x14848fa9
0, 18000, 192000, 0x30711074 0, 18000, 192000, 0x676f83e1
0, 20571, 192000, 0x67684a84 0, 20571, 192000, 0x5b98bea9
0, 23143, 192000, 0x1d9afa70 0, 23143, 192000, 0xf5cc709d
0, 25714, 192000, 0x4fd28e78 0, 25714, 192000, 0x719a0373
0, 28286, 192000, 0x9bc5c8cc 0, 28286, 192000, 0xba5a3e74
0, 30857, 192000, 0xcf268b6c 0, 30857, 192000, 0x34e10051
0, 33429, 192000, 0xdfe65fd4 0, 33429, 192000, 0xb66dd42d
0, 36000, 192000, 0x47e75404 0, 36000, 192000, 0xfb58c833
0, 38571, 192000, 0xb3b5b448 0, 38571, 192000, 0xa28029a4
0, 41143, 192000, 0x826c94b4 0, 41143, 192000, 0x28fa09b3
0, 43714, 192000, 0x158e95f8 0, 43714, 192000, 0x676f0b08
0, 46286, 192000, 0x576f031f 0, 46286, 192000, 0x7af97965
0, 48857, 192000, 0xea3399e8 0, 48857, 192000, 0x436f0f03
0, 51429, 192000, 0x76b1e224 0, 51429, 192000, 0xbaca5814
0, 54000, 192000, 0x290073db 0, 54000, 192000, 0xca97eb51
0, 56571, 192000, 0x83741abf 0, 56571, 192000, 0x1fc89137
0, 59143, 192000, 0x50f9c4ec 0, 59143, 192000, 0x8af63a74
0, 61714, 192000, 0x6d8fdac0 0, 61714, 192000, 0xca015077
0, 64286, 192000, 0xe26e2600 0, 64286, 192000, 0x761599ad
0, 66857, 192000, 0xbeb0e11c 0, 66857, 192000, 0x1ca1570c
0, 69429, 192000, 0x38282fd4 0, 69429, 192000, 0x1209a3ac
0, 72000, 192000, 0x13d0b790 0, 72000, 192000, 0xf7d92d01
0, 74571, 192000, 0x0cf8fca9 0, 74571, 192000, 0x970d6fea
0, 77143, 192000, 0x64da83e8 0, 77143, 192000, 0x508ff8ac
0, 79714, 192000, 0xf59ccccc 0, 79714, 192000, 0xef0d4274
0, 82286, 192000, 0xaaa06c5c 0, 82286, 192000, 0x0d50e0dd
0, 84857, 192000, 0xa98f82c0 0, 84857, 192000, 0xf638f782
0, 87429, 192000, 0x164fbbdc 0, 87429, 192000, 0x40e4314b
0, 90000, 192000, 0x0b3abc0c 0, 90000, 192000, 0x0ce5318f
0, 92571, 192000, 0x47661943 0, 92571, 192000, 0x14848fa9
0, 95143, 192000, 0x30711074 0, 95143, 192000, 0x676f83e1
0, 97714, 192000, 0x67684a84 0, 97714, 192000, 0x5b98bea9
0, 100286, 192000, 0x1d9afa70 0, 100286, 192000, 0xf5cc709d
0, 102857, 192000, 0x4fd28e78 0, 102857, 192000, 0x719a0373
0, 105429, 192000, 0x9bc5c8cc 0, 105429, 192000, 0xba5a3e74
0, 108000, 192000, 0xcf268b6c 0, 108000, 192000, 0x34e10051
0, 110571, 192000, 0xdfe65fd4 0, 110571, 192000, 0xb66dd42d
0, 113143, 192000, 0x47e75404 0, 113143, 192000, 0xfb58c833
0, 115714, 192000, 0xb3b5b448 0, 115714, 192000, 0xa28029a4
0, 118286, 192000, 0x826c94b4 0, 118286, 192000, 0x28fa09b3
0, 120857, 192000, 0x158e95f8 0, 120857, 192000, 0x676f0b08
0, 123429, 192000, 0x576f031f 0, 123429, 192000, 0x7af97965
0, 126000, 192000, 0xea3399e8 0, 126000, 192000, 0x436f0f03
0, 128571, 192000, 0x76b1e224 0, 128571, 192000, 0xbaca5814
0, 131143, 192000, 0x290073db 0, 131143, 192000, 0xca97eb51
0, 133714, 192000, 0x83741abf 0, 133714, 192000, 0x1fc89137
0, 136286, 192000, 0x50f9c4ec 0, 136286, 192000, 0x8af63a74
0, 138857, 192000, 0x6d8fdac0 0, 138857, 192000, 0xca015077
0, 141429, 192000, 0xe26e2600 0, 141429, 192000, 0x761599ad
0, 144000, 192000, 0xbeb0e11c 0, 144000, 192000, 0x1ca1570c
0, 146571, 192000, 0x38282fd4 0, 146571, 192000, 0x1209a3ac
0, 149143, 192000, 0x13d0b790 0, 149143, 192000, 0xf7d92d01
0, 151714, 192000, 0x0cf8fca9 0, 151714, 192000, 0x970d6fea
0, 154286, 192000, 0x64da83e8 0, 154286, 192000, 0x508ff8ac
0, 156857, 192000, 0xf59ccccc 0, 156857, 192000, 0xef0d4274
0, 159429, 192000, 0xaaa06c5c 0, 159429, 192000, 0x0d50e0dd
0, 162000, 192000, 0xa98f82c0 0, 162000, 192000, 0xf638f782
0, 164571, 192000, 0x164fbbdc 0, 164571, 192000, 0x40e4314b
0, 167143, 192000, 0x0b3abc0c 0, 167143, 192000, 0x0ce5318f
0, 169714, 192000, 0x47661943 0, 169714, 192000, 0x14848fa9
0, 172286, 192000, 0x30711074 0, 172286, 192000, 0x676f83e1
0, 174857, 192000, 0x67684a84 0, 174857, 192000, 0x5b98bea9
0, 177429, 192000, 0x1d9afa70 0, 177429, 192000, 0xf5cc709d
0, 180000, 192000, 0x4fd28e78 0, 180000, 192000, 0x719a0373
0, 182571, 192000, 0x9bc5c8cc 0, 182571, 192000, 0xba5a3e74
0, 185143, 192000, 0xcf268b6c 0, 185143, 192000, 0x34e10051
0, 187714, 192000, 0xdfe65fd4 0, 187714, 192000, 0xb66dd42d
0, 190286, 192000, 0x47e75404 0, 190286, 192000, 0xfb58c833
0, 192857, 192000, 0xb3b5b448 0, 192857, 192000, 0xa28029a4
0, 195429, 192000, 0x826c94b4 0, 195429, 192000, 0x28fa09b3
0, 198000, 192000, 0x158e95f8 0, 198000, 192000, 0x676f0b08
0, 200571, 192000, 0x576f031f 0, 200571, 192000, 0x7af97965
0, 203143, 192000, 0xea3399e8 0, 203143, 192000, 0x436f0f03
0, 205714, 192000, 0x76b1e224 0, 205714, 192000, 0xbaca5814
0, 208286, 192000, 0x290073db 0, 208286, 192000, 0xca97eb51
0, 210857, 192000, 0x83741abf 0, 210857, 192000, 0x1fc89137
0, 213429, 192000, 0x50f9c4ec 0, 213429, 192000, 0x8af63a74
0, 216000, 192000, 0x6d8fdac0 0, 216000, 192000, 0xca015077
0, 218571, 192000, 0xe26e2600 0, 218571, 192000, 0x761599ad
0, 221143, 192000, 0xbeb0e11c 0, 221143, 192000, 0x1ca1570c
0, 223714, 192000, 0x38282fd4 0, 223714, 192000, 0x1209a3ac
0, 226286, 192000, 0x13d0b790 0, 226286, 192000, 0xf7d92d01
0, 228857, 192000, 0x0cf8fca9 0, 228857, 192000, 0x970d6fea
0, 231429, 192000, 0xfcb10883 0, 231429, 192000, 0x1ff28298
0, 234000, 192000, 0xfcb10883 0, 234000, 192000, 0x1ff28298
0, 236571, 192000, 0xd0ba80c4 0, 236571, 192000, 0x407d09ca
0, 239143, 192000, 0xd0ba80c4 0, 239143, 192000, 0x407d09ca
0, 241714, 192000, 0x690520d9 0, 241714, 192000, 0xc743a475
0, 244286, 192000, 0x690520d9 0, 244286, 192000, 0xc743a475
0, 246857, 192000, 0x5b621c3f 0, 246857, 192000, 0x46bf9f7d
0, 249429, 192000, 0x5b621c3f 0, 249429, 192000, 0x46bf9f7d
0, 252000, 192000, 0x689e231f 0, 252000, 192000, 0x57ecb2c1
0, 254571, 192000, 0x689e231f 0, 254571, 192000, 0x57ecb2c1
0, 257143, 192000, 0x20653ff2 0, 257143, 192000, 0x680fd3bf
0, 259714, 192000, 0x20653ff2 0, 259714, 192000, 0x680fd3bf
0, 262286, 192000, 0xc18b3231 0, 262286, 192000, 0x8772ca19
0, 264857, 192000, 0xc18b3231 0, 264857, 192000, 0x8772ca19
0, 267429, 192000, 0x6d87ec3d 0, 267429, 192000, 0x3cc29bbf
0, 270000, 192000, 0x6d87ec3d 0, 270000, 192000, 0x3cc29bbf
0, 272571, 192000, 0x1c5b53d6 0, 272571, 192000, 0xe745fb3c
0, 275143, 192000, 0x1c5b53d6 0, 275143, 192000, 0xe745fb3c
0, 277714, 192000, 0x152fdf12 0, 277714, 192000, 0xc5279397
0, 280286, 192000, 0xde187291 0, 280286, 192000, 0xcc902b35
0, 282857, 192000, 0x167617a5 0, 282857, 192000, 0x50a7cf32
0, 285429, 192000, 0x5067b8de 0, 285429, 192000, 0x23fd6f51
0, 288000, 192000, 0xd02ae54e 0, 288000, 192000, 0x14fe9c4d
0, 290571, 192000, 0x0d6e9402 0, 290571, 192000, 0x703249f9
0, 293143, 192000, 0xa8e98616 0, 293143, 192000, 0x47b73bce
0, 295714, 192000, 0x04762d1a 0, 295714, 192000, 0x13bce1c9

80
tests/ref/fate/flic-magiccarpet
Unescape View File

@ -1,42 +1,42 @@
0, 0, 192000, 0x00000000 0, 0, 192000, 0x00000000
0, 6429, 192000, 0x9c057d9c 0, 6429, 192000, 0x03567eeb
0, 12857, 192000, 0xab1aacaf 0, 12857, 192000, 0xe73db12c
0, 19286, 192000, 0x49a1dccd 0, 19286, 192000, 0x7cefe740
0, 25714, 192000, 0xebb7e245 0, 25714, 192000, 0xb769f827
0, 32143, 192000, 0x6287759e 0, 32143, 192000, 0x71669dea
0, 38571, 192000, 0xbf007410 0, 38571, 192000, 0xc203b934
0, 45000, 192000, 0x6c72b247 0, 45000, 192000, 0x30671ee2
0, 51429, 192000, 0x4c26a8c3 0, 51429, 192000, 0xaea33a1b
0, 57857, 192000, 0x99f06050 0, 57857, 192000, 0x50f220c3
0, 64286, 192000, 0x663f2d23 0, 64286, 192000, 0x1ddd090f
0, 70714, 192000, 0x813c3a1f 0, 70714, 192000, 0x17ac22a4
0, 77143, 192000, 0x6d6cfbe7 0, 77143, 192000, 0x19f9f412
0, 83571, 192000, 0x7b04163a 0, 83571, 192000, 0xa2df0e55
0, 90000, 192000, 0x6792e679 0, 90000, 192000, 0x5abcd663
0, 96429, 192000, 0x939ac626 0, 96429, 192000, 0x5b09b38d
0, 102857, 192000, 0xc7a139c0 0, 102857, 192000, 0x894d1f43
0, 109286, 192000, 0xcac7ef0c 0, 109286, 192000, 0xbc95caaf
0, 115714, 192000, 0xf4ec59e0 0, 115714, 192000, 0xeaca27fc
0, 122143, 192000, 0x56060f59 0, 122143, 192000, 0x49c5ccb4
0, 128571, 192000, 0xf45ecb3b 0, 128571, 192000, 0x8b3e78b0
0, 135000, 192000, 0xe7e634ff 0, 135000, 192000, 0x1645d3ae
0, 141429, 192000, 0x7ac04aa4 0, 141429, 192000, 0x4407da0f
0, 147857, 192000, 0x4eaba5a1 0, 147857, 192000, 0x7d0826ac
0, 154286, 192000, 0x89b84e25 0, 154286, 192000, 0xc17ec1b8
0, 160714, 192000, 0xc368ec1e 0, 160714, 192000, 0x4a82520d
0, 167143, 192000, 0xeeafb59e 0, 167143, 192000, 0xa89f0e2f
0, 173571, 192000, 0x0b630619 0, 173571, 192000, 0xd58b537a
0, 180000, 192000, 0x59cb8954 0, 180000, 192000, 0x7123dafe
0, 186429, 192000, 0x16b2875f 0, 186429, 192000, 0x15d1d065
0, 192857, 192000, 0x524e32bd 0, 192857, 192000, 0xa86873f6
0, 199286, 192000, 0x96000ba2 0, 199286, 192000, 0x32704a91
0, 205714, 192000, 0x18ec28af 0, 205714, 192000, 0xbf2b63d7
0, 212143, 192000, 0x2609c56c 0, 212143, 192000, 0xb98e0126
0, 218571, 192000, 0xff25bb5a 0, 218571, 192000, 0x412a03ee
0, 225000, 192000, 0xb19a8819 0, 225000, 192000, 0x601ad161
0, 231429, 192000, 0xa5ff8727 0, 231429, 192000, 0x01ead407
0, 237857, 192000, 0xe83f6289 0, 237857, 192000, 0x75a7bbe5
0, 244286, 192000, 0xc6cb4903 0, 244286, 192000, 0x155ea759
0, 250714, 192000, 0xa4d93eb5 0, 250714, 192000, 0xe3a0a6aa
0, 257143, 192000, 0xec84ef6c 0, 257143, 192000, 0x2b5a5770
0, 263571, 192000, 0x00000000 0, 263571, 192000, 0x00000000

Write Preview
Loading…
Cancel
Save