[FFmpeg-cvslog] Fix opacity and increase colour dynamics of initial vmd palette.
Carl Eugen Hoyos
git at videolan.org
Thu Jul 4 19:13:49 CEST 2013
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Jul 4 17:01:03 2013 +0200| [f32b8130f434fd33317c73f947514854ce466206] | committer: Carl Eugen Hoyos
Fix opacity and increase colour dynamics of initial vmd palette.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f32b8130f434fd33317c73f947514854ce466206
---
libavcodec/vmdav.c | 3 +-
tests/ref/fate/filter-gradfun-sample | 40 +++---
tests/ref/fate/sierra-vmd-video | 234 +++++++++++++++++-----------------
3 files changed, 139 insertions(+), 138 deletions(-)
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 846d7c2..fcb8a9b 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -408,7 +408,8 @@ static av_cold int vmdvideo_decode_init(AVCodecContext *avctx)
r = raw_palette[palette_index++] * 4;
g = raw_palette[palette_index++] * 4;
b = raw_palette[palette_index++] * 4;
- palette32[i] = (r << 16) | (g << 8) | (b);
+ palette32[i] = 0xFFU << 24 | (r << 16) | (g << 8) | (b);
+ palette32[i] |= palette32[i] >> 6 & 0x30303;
}
avcodec_get_frame_defaults(&s->prev_frame);
diff --git a/tests/ref/fate/filter-gradfun-sample b/tests/ref/fate/filter-gradfun-sample
index 3c31bde..f8a111e 100644
--- a/tests/ref/fate/filter-gradfun-sample
+++ b/tests/ref/fate/filter-gradfun-sample
@@ -1,21 +1,21 @@
#tb 0: 1/10
-0, 0, 0, 1, 76800, 0xc87b6728
-0, 1, 1, 1, 76800, 0xb0b24bc8
-0, 2, 2, 1, 76800, 0x45a22d68
-0, 3, 3, 1, 76800, 0x1821013b
-0, 4, 4, 1, 76800, 0xfb17dc4f
-0, 5, 5, 1, 76800, 0x07714cf0
-0, 6, 6, 1, 76800, 0x7a5f14df
-0, 7, 7, 1, 76800, 0x421fe837
-0, 8, 8, 1, 76800, 0x39b9af40
-0, 9, 9, 1, 76800, 0x42b47d6b
-0, 10, 10, 1, 76800, 0xb1084cc8
-0, 11, 11, 1, 76800, 0x0772794c
-0, 12, 12, 1, 76800, 0x99544be0
-0, 13, 13, 1, 76800, 0x5f1a16c1
-0, 14, 14, 1, 76800, 0x90bfe8ac
-0, 15, 15, 1, 76800, 0xbd9bb834
-0, 16, 16, 1, 76800, 0x658d8053
-0, 17, 17, 1, 76800, 0x21cc5656
-0, 18, 18, 1, 76800, 0x6d39208b
-0, 19, 19, 1, 76800, 0x17b0f8cb
+0, 0, 0, 1, 76800, 0x8228830e
+0, 1, 1, 1, 76800, 0x1c196731
+0, 2, 2, 1, 76800, 0xf7924863
+0, 3, 3, 1, 76800, 0x66e41b5e
+0, 4, 4, 1, 76800, 0x79ccf593
+0, 5, 5, 1, 76800, 0xd35b667c
+0, 6, 6, 1, 76800, 0xd70b2d3a
+0, 7, 7, 1, 76800, 0x122fffcd
+0, 8, 8, 1, 76800, 0x1989c5b8
+0, 9, 9, 1, 76800, 0x94de92e9
+0, 10, 10, 1, 76800, 0x5f946148
+0, 11, 11, 1, 76800, 0x3b448caa
+0, 12, 12, 1, 76800, 0xbbab5e46
+0, 13, 13, 1, 76800, 0x8977280a
+0, 14, 14, 1, 76800, 0x1ad8f8f4
+0, 15, 15, 1, 76800, 0x719dc79c
+0, 16, 16, 1, 76800, 0xf3598e9a
+0, 17, 17, 1, 76800, 0xe7b86365
+0, 18, 18, 1, 76800, 0x4e492c41
+0, 19, 19, 1, 76800, 0x922e036a
diff --git a/tests/ref/fate/sierra-vmd-video b/tests/ref/fate/sierra-vmd-video
index 5b9dde1..668faee 100644
--- a/tests/ref/fate/sierra-vmd-video
+++ b/tests/ref/fate/sierra-vmd-video
@@ -1,118 +1,118 @@
#tb 0: 1/10
-0, 0, 0, 1, 230400, 0x0224ab01
-0, 1, 1, 1, 230400, 0x449e4d81
-0, 2, 2, 1, 230400, 0x3e15e07a
-0, 3, 3, 1, 230400, 0xdabe4172
-0, 4, 4, 1, 230400, 0x0947b7db
-0, 5, 5, 1, 230400, 0x934e243b
-0, 6, 6, 1, 230400, 0x6b5c5b6c
-0, 7, 7, 1, 230400, 0x4bf7bbb5
-0, 8, 8, 1, 230400, 0x423eec8e
-0, 9, 9, 1, 230400, 0x63663b5e
-0, 10, 10, 1, 230400, 0x9c258a67
-0, 11, 11, 1, 230400, 0x1c92b6e0
-0, 12, 12, 1, 230400, 0xdd0a0e28
-0, 13, 13, 1, 230400, 0x51d64af1
-0, 14, 14, 1, 230400, 0x5776ac12
-0, 15, 15, 1, 230400, 0x49070132
-0, 16, 16, 1, 230400, 0xa59635ab
-0, 17, 17, 1, 230400, 0xb1f99504
-0, 18, 18, 1, 230400, 0x61fac725
-0, 19, 19, 1, 230400, 0xc32c28d5
-0, 20, 20, 1, 230400, 0x2b7a91d6
-0, 21, 21, 1, 230400, 0x917be717
-0, 22, 22, 1, 230400, 0xd3c5a2ff
-0, 23, 23, 1, 230400, 0x0678a707
-0, 24, 24, 1, 230400, 0x122504e6
-0, 25, 25, 1, 230400, 0x76aebdae
-0, 26, 26, 1, 230400, 0x81357545
-0, 27, 27, 1, 230400, 0x38baeebd
-0, 28, 28, 1, 230400, 0x1c5c44d4
-0, 29, 29, 1, 230400, 0x60e189cc
-0, 30, 30, 1, 230400, 0xb1f4381c
-0, 31, 31, 1, 230400, 0xb5048fed
-0, 32, 32, 1, 230400, 0xc947c30e
-0, 33, 33, 1, 230400, 0xe8e31c07
-0, 34, 34, 1, 230400, 0x6d49dd02
-0, 35, 35, 1, 230400, 0x293e15d3
-0, 36, 36, 1, 230400, 0x354d792e
-0, 37, 37, 1, 230400, 0x35468780
-0, 38, 38, 1, 230400, 0x365d3991
-0, 39, 39, 1, 230400, 0xc9debef2
-0, 40, 40, 1, 230400, 0x4c4634c2
-0, 41, 41, 1, 230400, 0x347c2dca
-0, 42, 42, 1, 230400, 0x1efa0aaa
-0, 43, 43, 1, 230400, 0xa79a0b5a
-0, 44, 44, 1, 230400, 0xfdb2dcdb
-0, 45, 45, 1, 230400, 0x42dbea33
-0, 46, 46, 1, 230400, 0x2a207e43
-0, 47, 47, 1, 230400, 0x86573783
-0, 48, 48, 1, 230400, 0xc3968473
-0, 49, 49, 1, 230400, 0x8f62a7b4
-0, 50, 50, 1, 230400, 0x5a2e3073
-0, 51, 51, 1, 230400, 0xd24f5e2c
-0, 52, 52, 1, 230400, 0x1df3c67d
-0, 53, 53, 1, 230400, 0xe4fd884d
-0, 57, 57, 1, 230400, 0x9a228555
-0, 58, 58, 1, 230400, 0x9eba8ed5
-0, 59, 59, 1, 230400, 0x3d808a3d
-0, 60, 60, 1, 230400, 0xf57e866d
-0, 61, 61, 1, 230400, 0x85f594f5
-0, 62, 62, 1, 230400, 0xb09f99dd
-0, 63, 63, 1, 230400, 0x2b368475
-0, 64, 64, 1, 230400, 0xa2417afd
-0, 65, 65, 1, 230400, 0x590b709d
-0, 66, 66, 1, 230400, 0x5d617705
-0, 67, 67, 1, 230400, 0xabf981ad
-0, 68, 68, 1, 230400, 0x5a8590cd
-0, 69, 69, 1, 230400, 0x1bff853d
-0, 70, 70, 1, 230400, 0x71d08055
-0, 71, 71, 1, 230400, 0x2ebd817d
-0, 72, 72, 1, 230400, 0x6e838255
-0, 73, 73, 1, 230400, 0x043984cd
-0, 74, 74, 1, 230400, 0x7ff18495
-0, 75, 75, 1, 230400, 0xa43b8385
-0, 76, 76, 1, 230400, 0x72b5825d
-0, 77, 77, 1, 230400, 0x3a178085
-0, 78, 78, 1, 230400, 0x67748245
-0, 79, 79, 1, 230400, 0xeddf81d5
-0, 80, 80, 1, 230400, 0x8b088665
-0, 81, 81, 1, 230400, 0x6c408e15
-0, 82, 82, 1, 230400, 0x81f196dd
-0, 83, 83, 1, 230400, 0xab9f953d
-0, 84, 84, 1, 230400, 0xa5f69795
-0, 85, 85, 1, 230400, 0xa772950d
-0, 86, 86, 1, 230400, 0x6a5596d5
-0, 87, 87, 1, 230400, 0x1355958d
-0, 88, 88, 1, 230400, 0x4134981d
-0, 89, 89, 1, 230400, 0x8b929515
-0, 90, 90, 1, 230400, 0x482f95c5
-0, 91, 91, 1, 230400, 0x7a9795d5
-0, 92, 92, 1, 230400, 0x21c29abd
-0, 93, 93, 1, 230400, 0x9ae6a475
-0, 94, 94, 1, 230400, 0x3734aee5
-0, 95, 95, 1, 230400, 0xa0a1b365
-0, 96, 96, 1, 230400, 0x2dcab1c5
-0, 97, 97, 1, 230400, 0x9c8b6c44
-0, 98, 98, 1, 230400, 0x5da75feb
-0, 99, 99, 1, 230400, 0x4d02f8e3
-0, 100, 100, 1, 230400, 0x66824f3a
-0, 101, 101, 1, 230400, 0x0c9257e2
-0, 102, 102, 1, 230400, 0xb2927092
-0, 103, 103, 1, 230400, 0xb5dc6e9a
-0, 104, 104, 1, 230400, 0x6e567bc6
-0, 105, 105, 1, 230400, 0xbf9e0f7a
-0, 106, 106, 1, 230400, 0xb16f684a
-0, 107, 107, 1, 230400, 0xf9e55e81
-0, 108, 108, 1, 230400, 0xd8d0bcba
-0, 109, 109, 1, 230400, 0x44720ac0
-0, 110, 110, 1, 230400, 0x7d4c2058
-0, 113, 113, 1, 230400, 0xb0973eb9
-0, 114, 114, 1, 230400, 0x405a13ce
-0, 115, 115, 1, 230400, 0x6422f00a
-0, 116, 116, 1, 230400, 0x924b6c1e
-0, 145, 145, 1, 230400, 0xcf7809c0
-0, 146, 146, 1, 230400, 0x883a3863
-0, 147, 147, 1, 230400, 0x6adc9e03
-0, 148, 148, 1, 230400, 0x4f5ab7a8
-0, 214, 214, 1, 230400, 0xdc0aab94
+0, 0, 0, 1, 230400, 0x54b4bfe2
+0, 1, 1, 1, 230400, 0x9e1460e3
+0, 2, 2, 1, 230400, 0x8136f21c
+0, 3, 3, 1, 230400, 0xadfc5089
+0, 4, 4, 1, 230400, 0x76f2c4bc
+0, 5, 5, 1, 230400, 0x73862ec8
+0, 6, 6, 1, 230400, 0xba2562e3
+0, 7, 7, 1, 230400, 0xf908c0b6
+0, 8, 8, 1, 230400, 0x3596ee56
+0, 9, 9, 1, 230400, 0x97cc3a1e
+0, 10, 10, 1, 230400, 0xe2c585f9
+0, 11, 11, 1, 230400, 0x1732aedb
+0, 12, 12, 1, 230400, 0xa6d20354
+0, 13, 13, 1, 230400, 0x0e1e3d11
+0, 14, 14, 1, 230400, 0xe4f09bbd
+0, 15, 15, 1, 230400, 0x5c15ee1a
+0, 16, 16, 1, 230400, 0x33f51f69
+0, 17, 17, 1, 230400, 0xb6067c26
+0, 18, 18, 1, 230400, 0x985faab2
+0, 19, 19, 1, 230400, 0x3f0a09ae
+0, 20, 20, 1, 230400, 0x4052702f
+0, 21, 21, 1, 230400, 0xcd7fc29c
+0, 22, 22, 1, 230400, 0x73c97d9f
+0, 23, 23, 1, 230400, 0xf0fb8235
+0, 24, 24, 1, 230400, 0x7651e231
+0, 25, 25, 1, 230400, 0x3e749ecf
+0, 26, 26, 1, 230400, 0x20515985
+0, 27, 27, 1, 230400, 0xd086d4b0
+0, 28, 28, 1, 230400, 0x343c2c77
+0, 29, 29, 1, 230400, 0xb9a47309
+0, 30, 30, 1, 230400, 0x39de2037
+0, 31, 31, 1, 230400, 0x9fc2745a
+0, 32, 32, 1, 230400, 0x0868a2f3
+0, 33, 33, 1, 230400, 0xfe53f34d
+0, 34, 34, 1, 230400, 0xf2abaa57
+0, 35, 35, 1, 230400, 0x2dafdc4b
+0, 36, 36, 1, 230400, 0xf7d6353a
+0, 37, 37, 1, 230400, 0x8aa63c0a
+0, 38, 38, 1, 230400, 0xd1afe885
+0, 39, 39, 1, 230400, 0x64626c50
+0, 40, 40, 1, 230400, 0x2654dfca
+0, 41, 41, 1, 230400, 0x6183d8c7
+0, 42, 42, 1, 230400, 0xededb578
+0, 43, 43, 1, 230400, 0xadeeb629
+0, 44, 44, 1, 230400, 0x0009873a
+0, 45, 45, 1, 230400, 0xe2ec94eb
+0, 46, 46, 1, 230400, 0x62132788
+0, 47, 47, 1, 230400, 0x8cc5e014
+0, 48, 48, 1, 230400, 0x2ded2ecd
+0, 49, 49, 1, 230400, 0x81204eec
+0, 50, 50, 1, 230400, 0x4f9fda58
+0, 51, 51, 1, 230400, 0x9d7f073b
+0, 52, 52, 1, 230400, 0x607a6ee6
+0, 53, 53, 1, 230400, 0xed1c305c
+0, 57, 57, 1, 230400, 0x52b52d62
+0, 58, 58, 1, 230400, 0x4ae0370a
+0, 59, 59, 1, 230400, 0xe437326a
+0, 60, 60, 1, 230400, 0xefb82e8c
+0, 61, 61, 1, 230400, 0xa0f13d4b
+0, 62, 62, 1, 230400, 0x473a424a
+0, 63, 63, 1, 230400, 0x205a2c84
+0, 64, 64, 1, 230400, 0xe83022e5
+0, 65, 65, 1, 230400, 0x5db21854
+0, 66, 66, 1, 230400, 0x11991ed7
+0, 67, 67, 1, 230400, 0x649429b1
+0, 68, 68, 1, 230400, 0x840a3912
+0, 69, 69, 1, 230400, 0x8bb72d49
+0, 70, 70, 1, 230400, 0xedfc2850
+0, 71, 71, 1, 230400, 0x1b9b2977
+0, 72, 72, 1, 230400, 0x63912a4f
+0, 73, 73, 1, 230400, 0x971c2ccc
+0, 74, 74, 1, 230400, 0x1f022c98
+0, 75, 75, 1, 230400, 0x5dc42b8c
+0, 76, 76, 1, 230400, 0x25172a53
+0, 77, 77, 1, 230400, 0x31fd287f
+0, 78, 78, 1, 230400, 0x95182a44
+0, 79, 79, 1, 230400, 0xbf7d29ea
+0, 80, 80, 1, 230400, 0xdeb82e84
+0, 81, 81, 1, 230400, 0xc3ad3659
+0, 82, 82, 1, 230400, 0xfef23f36
+0, 83, 83, 1, 230400, 0xf4a23d8c
+0, 84, 84, 1, 230400, 0x90713fef
+0, 85, 85, 1, 230400, 0x5fad3d58
+0, 86, 86, 1, 230400, 0x69283f2e
+0, 87, 87, 1, 230400, 0x8f3d3dde
+0, 88, 88, 1, 230400, 0x3129407a
+0, 89, 89, 1, 230400, 0x266e3d64
+0, 90, 90, 1, 230400, 0xc41b3e19
+0, 91, 91, 1, 230400, 0x64203e29
+0, 92, 92, 1, 230400, 0x3f7e4328
+0, 93, 93, 1, 230400, 0xacef4d0e
+0, 94, 94, 1, 230400, 0xf0ca57a7
+0, 95, 95, 1, 230400, 0x87c75c41
+0, 96, 96, 1, 230400, 0x9db75a9c
+0, 97, 97, 1, 230400, 0x4152164c
+0, 98, 98, 1, 230400, 0x8a330ac8
+0, 99, 99, 1, 230400, 0x5113a45d
+0, 100, 100, 1, 230400, 0x60effb12
+0, 101, 101, 1, 230400, 0x01dc03c5
+0, 102, 102, 1, 230400, 0x7ae81caf
+0, 103, 103, 1, 230400, 0x35c31ab0
+0, 104, 104, 1, 230400, 0xd59e171e
+0, 105, 105, 1, 230400, 0x35c3989e
+0, 106, 106, 1, 230400, 0xf93656a5
+0, 107, 107, 1, 230400, 0x0962745c
+0, 108, 108, 1, 230400, 0x6a90cdb2
+0, 109, 109, 1, 230400, 0x4bc2216d
+0, 110, 110, 1, 230400, 0x7a6d3744
+0, 113, 113, 1, 230400, 0xf16a5742
+0, 114, 114, 1, 230400, 0x1495ce79
+0, 115, 115, 1, 230400, 0x3b4397b0
+0, 116, 116, 1, 230400, 0x33ed8506
+0, 145, 145, 1, 230400, 0xf953256d
+0, 146, 146, 1, 230400, 0xd7faaef9
+0, 147, 147, 1, 230400, 0xb37e6161
+0, 148, 148, 1, 230400, 0x526b6797
+0, 214, 214, 1, 230400, 0x8ec35bc5
More information about the ffmpeg-cvslog
mailing list