generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cinepak: Use correct colorspace.

Browse Source 
The new code is also faster and more robust.

As for the performance:

old decoder + conversion to rgb:         fps = 2618
old decoder, without converting to rgb:  fps = 4012

new decoder, producing rgb:              fps = 4502

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
u-bo1b@0w.se
2013-02-18 18:00:33 +01:00
committed by Michael Niedermayer
parent f5c00b347d
commit 4e635e10e2
4 changed files with 455 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

304
tests/ref/fate/cvid-grayscale
View File

@@ -1,153 +1,153 @@
#tb 0: 99561/500000
0, 0, 0, 1, 11300, 0x46c78923
0, 1, 1, 1, 11300, 0x3f2a1175
0, 2, 2, 1, 11300, 0x722de221
0, 3, 3, 1, 11300, 0x01746b88
0, 4, 4, 1, 11300, 0x549587a7
0, 5, 5, 1, 11300, 0x843ab943
0, 6, 6, 1, 11300, 0x62fdee48
0, 7, 7, 1, 11300, 0x74a62867
0, 8, 8, 1, 11300, 0x35a20e2f
0, 9, 9, 1, 11300, 0x4e9ef54d
0, 10, 10, 1, 11300, 0xec7201f5
0, 11, 11, 1, 11300, 0x363bfe27
0, 12, 12, 1, 11300, 0x2aaab418
0, 13, 13, 1, 11300, 0x6a48ab3f
0, 14, 14, 1, 11300, 0x3fecea34
0, 15, 15, 1, 11300, 0xa371f55e
0, 16, 16, 1, 11300, 0xa86b147c
0, 17, 17, 1, 11300, 0x49e9206e
0, 18, 18, 1, 11300, 0x6c9a2155
0, 19, 19, 1, 11300, 0x2c8a4798
0, 20, 20, 1, 11300, 0x3485676c
0, 21, 21, 1, 11300, 0xb0b293f2
0, 22, 22, 1, 11300, 0xe4a9b068
0, 23, 23, 1, 11300, 0xd68d0556
0, 24, 24, 1, 11300, 0xc28e5193
0, 25, 25, 1, 11300, 0xf6948483
0, 26, 26, 1, 11300, 0xf21fbf57
0, 27, 27, 1, 11300, 0x8345eb44
0, 28, 28, 1, 11300, 0x8124f045
0, 29, 29, 1, 11300, 0x18e31f10
0, 30, 30, 1, 11300, 0xdb1943fc
0, 31, 31, 1, 11300, 0x8701699f
0, 32, 32, 1, 11300, 0xd7b18550
0, 33, 33, 1, 11300, 0xa56faccc
0, 34, 34, 1, 11300, 0xf8bcc17c
0, 35, 35, 1, 11300, 0x446acab9
0, 36, 36, 1, 11300, 0x755fd295
0, 37, 37, 1, 11300, 0x92e3d100
0, 38, 38, 1, 11300, 0x54895bb3
0, 39, 39, 1, 11300, 0xd18bffda
0, 40, 40, 1, 11300, 0x480dbe4f
0, 41, 41, 1, 11300, 0x49ea9dbe
0, 42, 42, 1, 11300, 0x00d3a003
0, 43, 43, 1, 11300, 0xda7bbfb2
0, 44, 44, 1, 11300, 0x9700d9c2
0, 45, 45, 1, 11300, 0xa0a9e490
0, 46, 46, 1, 11300, 0x00eb0979
0, 47, 47, 1, 11300, 0x32b04630
0, 48, 48, 1, 11300, 0xdfb73e51
0, 49, 49, 1, 11300, 0x3d8e4f96
0, 50, 50, 1, 11300, 0x2ca83271
0, 51, 51, 1, 11300, 0xb5b123c0
0, 52, 52, 1, 11300, 0x8a570e58
0, 53, 53, 1, 11300, 0xc6c805bc
0, 54, 54, 1, 11300, 0x27caf7a5
0, 55, 55, 1, 11300, 0x5319ecb0
0, 56, 56, 1, 11300, 0x5471e3fd
0, 57, 57, 1, 11300, 0x6d68a6f4
0, 58, 58, 1, 11300, 0x872b7194
0, 59, 59, 1, 11300, 0x007c36bd
0, 60, 60, 1, 11300, 0x2714f1b5
0, 61, 61, 1, 11300, 0x6c8eb50f
0, 62, 62, 1, 11300, 0xf5d57be8
0, 63, 63, 1, 11300, 0x981f412b
0, 64, 64, 1, 11300, 0x1a9804a1
0, 65, 65, 1, 11300, 0xf0c1d24a
0, 66, 66, 1, 11300, 0xa70a9d9b
0, 67, 67, 1, 11300, 0x8c466876
0, 68, 68, 1, 11300, 0xcf2e32df
0, 69, 69, 1, 11300, 0xcb8cfebf
0, 70, 70, 1, 11300, 0xb961ca99
0, 71, 71, 1, 11300, 0x666d9619
0, 72, 72, 1, 11300, 0x84bf5b55
0, 73, 73, 1, 11300, 0xbfa22ccc
0, 74, 74, 1, 11300, 0xcde41849
0, 75, 75, 1, 11300, 0x71372dcd
0, 76, 76, 1, 11300, 0x13402cfd
0, 77, 77, 1, 11300, 0xdebdd321
0, 78, 78, 1, 11300, 0xdda66de1
0, 79, 79, 1, 11300, 0x7f4bb682
0, 80, 80, 1, 11300, 0xf67fd528
0, 81, 81, 1, 11300, 0xe739ff8c
0, 82, 82, 1, 11300, 0x2e131774
0, 83, 83, 1, 11300, 0xfa942811
0, 84, 84, 1, 11300, 0x0cd93ac2
0, 85, 85, 1, 11300, 0xd0445e0e
0, 86, 86, 1, 11300, 0x3f3497c7
0, 87, 87, 1, 11300, 0x11b5bd2c
0, 88, 88, 1, 11300, 0xccd5e62a
0, 89, 89, 1, 11300, 0xa9d4fcb5
0, 90, 90, 1, 11300, 0x34aa1a03
0, 91, 91, 1, 11300, 0x1ce6299e
0, 92, 92, 1, 11300, 0x661c2745
0, 93, 93, 1, 11300, 0x27d8a8b3
0, 94, 94, 1, 11300, 0x9eb07467
0, 95, 95, 1, 11300, 0x128374d2
0, 96, 96, 1, 11300, 0x05c36ff5
0, 97, 97, 1, 11300, 0x8a136bde
0, 98, 98, 1, 11300, 0x15c47c99
0, 99, 99, 1, 11300, 0xcc4a93f4
0, 100, 100, 1, 11300, 0x19529b2b
0, 101, 101, 1, 11300, 0x9943c076
0, 102, 102, 1, 11300, 0xf898e583
0, 103, 103, 1, 11300, 0x40f71f94
0, 104, 104, 1, 11300, 0x5b604afb
0, 105, 105, 1, 11300, 0x8c176af4
0, 106, 106, 1, 11300, 0x0f1a6216
0, 107, 107, 1, 11300, 0x38bbd13d
0, 108, 108, 1, 11300, 0x90c8d1fc
0, 109, 109, 1, 11300, 0x253000d7
0, 110, 110, 1, 11300, 0xb94b03b1
0, 111, 111, 1, 11300, 0xbc872268
0, 112, 112, 1, 11300, 0xe77adb8c
0, 113, 113, 1, 11300, 0xa38936b7
0, 114, 114, 1, 11300, 0xd6153632
0, 115, 115, 1, 11300, 0x1ae633cc
0, 116, 116, 1, 11300, 0xb90c286e
0, 117, 117, 1, 11300, 0xbc7e333d
0, 118, 118, 1, 11300, 0x1b5421f8
0, 119, 119, 1, 11300, 0xdde6506d
0, 120, 120, 1, 11300, 0xd3eb757e
0, 121, 121, 1, 11300, 0x5ad1929c
0, 122, 122, 1, 11300, 0x4f6aa47d
0, 123, 123, 1, 11300, 0xab3caf55
0, 124, 124, 1, 11300, 0x5ff9b39a
0, 125, 125, 1, 11300, 0x1454e12e
0, 126, 126, 1, 11300, 0xf18216e8
0, 127, 127, 1, 11300, 0x62144880
0, 128, 128, 1, 11300, 0x54284241
0, 129, 129, 1, 11300, 0x8e8c7228
0, 130, 130, 1, 11300, 0xb498d06e
0, 131, 131, 1, 11300, 0x7b1e6be1
0, 132, 132, 1, 11300, 0x5e5ea1f4
0, 133, 133, 1, 11300, 0x41eda28e
0, 134, 134, 1, 11300, 0x7ba6aa92
0, 135, 135, 1, 11300, 0xa8a8b1c7
0, 136, 136, 1, 11300, 0x0d30bd08
0, 137, 137, 1, 11300, 0xc610bf16
0, 138, 138, 1, 11300, 0xed57c075
0, 139, 139, 1, 11300, 0xb86dbfea
0, 140, 140, 1, 11300, 0x0970c03d
0, 141, 141, 1, 11300, 0x743ac2ac
0, 142, 142, 1, 11300, 0x0a44c816
0, 143, 143, 1, 11300, 0xe32acd6b
0, 144, 144, 1, 11300, 0x209bcdab
0, 145, 145, 1, 11300, 0x3cd0d105
0, 146, 146, 1, 11300, 0xc0bcd330
0, 147, 147, 1, 11300, 0x4785d6dc
0, 148, 148, 1, 11300, 0xe85f9c90
0, 149, 149, 1, 11300, 0xd4a72850
0, 150, 150, 1, 11300, 0x04766e41
0, 151, 151, 1, 11300, 0x04766e41
0, 0, 0, 1, 22500, 0x0f8e562e
0, 1, 1, 1, 22500, 0x507aef06
0, 2, 2, 1, 22500, 0x059d6137
0, 3, 3, 1, 22500, 0xfb1bfd4e
0, 4, 4, 1, 22500, 0xe97a51ba
0, 5, 5, 1, 22500, 0xfc77e68e
0, 6, 6, 1, 22500, 0x7f1985ac
0, 7, 7, 1, 22500, 0xdfb933eb
0, 8, 8, 1, 22500, 0x6dafe534
0, 9, 9, 1, 22500, 0xb7b69abb
0, 10, 10, 1, 22500, 0xc435c086
0, 11, 11, 1, 22500, 0xf8ddb549
0, 12, 12, 1, 22500, 0x76c0d70d
0, 13, 13, 1, 22500, 0x1120bc82
0, 14, 14, 1, 22500, 0x3f7c7970
0, 15, 15, 1, 22500, 0xd37c9aee
0, 16, 16, 1, 22500, 0x7407f81b
0, 17, 17, 1, 22500, 0xce2f1c00
0, 18, 18, 1, 22500, 0x70921eb5
0, 19, 19, 1, 22500, 0x0abc917e
0, 20, 20, 1, 22500, 0xeff1f0fa
0, 21, 21, 1, 22500, 0x5e0d769b
0, 22, 22, 1, 22500, 0xc984cbfd
0, 23, 23, 1, 22500, 0x73f1caa9
0, 24, 24, 1, 22500, 0x9108af6f
0, 25, 25, 1, 22500, 0x4f33484e
0, 26, 26, 1, 22500, 0x9810f8ca
0, 27, 27, 1, 22500, 0xa0b97ca0
0, 28, 28, 1, 22500, 0xd9c28ba3
0, 29, 29, 1, 22500, 0xc97e17e6
0, 30, 30, 1, 22500, 0x85cf86aa
0, 31, 31, 1, 22500, 0xf15ff793
0, 32, 32, 1, 22500, 0x35c54ab5
0, 33, 33, 1, 22500, 0xe80ec129
0, 34, 34, 1, 22500, 0x3d6cff39
0, 35, 35, 1, 22500, 0x54e41aff
0, 36, 36, 1, 22500, 0xc1d63293
0, 37, 37, 1, 22500, 0x362c2dd4
0, 38, 38, 1, 22500, 0xa1f8cdcf
0, 39, 39, 1, 22500, 0x5b59ba62
0, 40, 40, 1, 22500, 0x6d02f5b2
0, 41, 41, 1, 22500, 0x899293ff
0, 42, 42, 1, 22500, 0xad0e9ace
0, 43, 43, 1, 22500, 0x4263f9db
0, 44, 44, 1, 22500, 0xff1e481a
0, 45, 45, 1, 22500, 0x70c86884
0, 46, 46, 1, 22500, 0x203ed712
0, 47, 47, 1, 22500, 0x2f0e8d46
0, 48, 48, 1, 22500, 0x215075a9
0, 49, 49, 1, 22500, 0x9882a978
0, 50, 50, 1, 22500, 0xc2fd5209
0, 51, 51, 1, 22500, 0xe1c925f6
0, 52, 52, 1, 22500, 0x012be5af
0, 53, 53, 1, 22500, 0xa718cbdb
0, 54, 54, 1, 22500, 0x2494a1c3
0, 55, 55, 1, 22500, 0xeb8980e4
0, 56, 56, 1, 22500, 0x7f2766cb
0, 57, 57, 1, 22500, 0xdf3cafa1
0, 58, 58, 1, 22500, 0x9a390f81
0, 59, 59, 1, 22500, 0xfdad5eed
0, 60, 60, 1, 22500, 0x94f58ff3
0, 61, 61, 1, 22500, 0xd7c6d9f2
0, 62, 62, 1, 22500, 0x48b72e7d
0, 63, 63, 1, 22500, 0x8a7a7e37
0, 64, 64, 1, 22500, 0x5413c88a
0, 65, 65, 1, 22500, 0x3f4531b2
0, 66, 66, 1, 22500, 0x152d9396
0, 67, 67, 1, 22500, 0x2ac3f418
0, 68, 68, 1, 22500, 0x0e1c5353
0, 69, 69, 1, 22500, 0xe058b711
0, 70, 70, 1, 22500, 0x262e1a9f
0, 71, 71, 1, 22500, 0x20057d10
0, 72, 72, 1, 22500, 0x65c5ccb5
0, 73, 73, 1, 22500, 0x3e36411a
0, 74, 74, 1, 22500, 0xd9740391
0, 75, 75, 1, 22500, 0x53d1441d
0, 76, 76, 1, 22500, 0x9a3941ad
0, 77, 77, 1, 22500, 0x61553437
0, 78, 78, 1, 22500, 0xfe0c0468
0, 79, 79, 1, 22500, 0xd57bde4b
0, 80, 80, 1, 22500, 0x4a183a4c
0, 81, 81, 1, 22500, 0xd618b978
0, 82, 82, 1, 22500, 0x6b480112
0, 83, 83, 1, 22500, 0x7a1732e9
0, 84, 84, 1, 22500, 0x45836afc
0, 85, 85, 1, 22500, 0x3548d4e0
0, 86, 86, 1, 22500, 0x476c821a
0, 87, 87, 1, 22500, 0x6be5f249
0, 88, 88, 1, 22500, 0xf79b6d52
0, 89, 89, 1, 22500, 0x2edeb0f3
0, 90, 90, 1, 22500, 0xbaf808bf
0, 91, 91, 1, 22500, 0x71013790
0, 92, 92, 1, 22500, 0xbf4e3085
0, 93, 93, 1, 22500, 0x15c2b4de
0, 94, 94, 1, 22500, 0x031d17fa
0, 95, 95, 1, 22500, 0x3a2c193b
0, 96, 96, 1, 22500, 0xb0420aa4
0, 97, 97, 1, 22500, 0xe448fe50
0, 98, 98, 1, 22500, 0x02173090
0, 99, 99, 1, 22500, 0x4b2f76a1
0, 100, 100, 1, 22500, 0xd6458c46
0, 101, 101, 1, 22500, 0xa698fc27
0, 102, 102, 1, 22500, 0xaeca6b5d
0, 103, 103, 1, 22500, 0x4a591972
0, 104, 104, 1, 22500, 0x19e49ba7
0, 105, 105, 1, 22500, 0x1d4ffb92
0, 106, 106, 1, 22500, 0xb1f8e0f8
0, 107, 107, 1, 22500, 0x32c82e8b
0, 108, 108, 1, 22500, 0x96e930c8
0, 109, 109, 1, 22500, 0x0e6ebd2c
0, 110, 110, 1, 22500, 0x315bc5ba
0, 111, 111, 1, 22500, 0xb22321ee
0, 112, 112, 1, 22500, 0xbe464d78
0, 113, 113, 1, 22500, 0xdb4b5edb
0, 114, 114, 1, 22500, 0x0ff65d4c
0, 115, 115, 1, 22500, 0xff68561a
0, 116, 116, 1, 22500, 0xa0033400
0, 117, 117, 1, 22500, 0x5414546d
0, 118, 118, 1, 22500, 0x7e43209e
0, 119, 119, 1, 22500, 0x0037abfd
0, 120, 120, 1, 22500, 0x3dd31b3f
0, 121, 121, 1, 22500, 0xe0777299
0, 122, 122, 1, 22500, 0x35a2a83c
0, 123, 123, 1, 22500, 0x5282c8c4
0, 124, 124, 1, 22500, 0x1ccdd593
0, 125, 125, 1, 22500, 0x92525e5e
0, 126, 126, 1, 22500, 0x5fa3ff5f
0, 127, 127, 1, 22500, 0xd1169436
0, 128, 128, 1, 22500, 0x07dc8179
0, 129, 129, 1, 22500, 0x9a83113d
0, 130, 130, 1, 22500, 0x9c722c1e
0, 131, 131, 1, 22500, 0xccbcfe59
0, 132, 132, 1, 22500, 0x8606a0a1
0, 133, 133, 1, 22500, 0x2210a26f
0, 134, 134, 1, 22500, 0xfc73ba7b
0, 135, 135, 1, 22500, 0x731fd01a
0, 136, 136, 1, 22500, 0x0e21f1dd
0, 137, 137, 1, 22500, 0xf9c4f807
0, 138, 138, 1, 22500, 0x2123fc24
0, 139, 139, 1, 22500, 0xd42cfa83
0, 140, 140, 1, 22500, 0x5927fb7c
0, 141, 141, 1, 22500, 0xe32e02d8
0, 142, 142, 1, 22500, 0xa5c11316
0, 143, 143, 1, 22500, 0xb9112315
0, 144, 144, 1, 22500, 0x78f223d5
0, 145, 145, 1, 22500, 0x93202de3
0, 146, 146, 1, 22500, 0x7eb03464
0, 147, 147, 1, 22500, 0x899c3f68
0, 148, 148, 1, 22500, 0xc2169075
0, 149, 149, 1, 22500, 0x419f33a6
0, 150, 150, 1, 22500, 0x3de50588
0, 151, 151, 1, 22500, 0x3de50588