[FFmpeg-devel] [PATCH 3/4 v3] avcodec/vc1: rewrite vc1_decode_i_blocks to align with VC-1 spec
Michael Niedermayer
michael at niedermayer.cc
Mon Jun 18 02:00:36 EEST 2018
On Tue, Jun 12, 2018 at 11:34:58AM +0200, Jerome Borsboom wrote:
> Change vc1_decode_i_blocks to use vc1_put_blocks_clamped and
> ff_vc1_i_loop_filter.
>
> Signed-off-by: Jerome Borsboom <jerome.borsboom at carpalis.nl>
> ---
> The v3 patch should resolve the crashing that was seen on corrupted source files.
This (commit 77a3dfb328df535fb98d43ed2204fc6a42d6dd5e) broke fate
that is fate-mss2-wmv
fate-suite//mss2/msscreencodec.wmv with this shows a large green column and checksums
changed
--- ./tests/ref/fate/mss2-wmv 2018-06-15 22:31:04.412555973 +0200
+++ tests/data/fate/mss2-wmv 2018-06-18 00:54:56.484378249 +0200
@@ -36,70 +36,70 @@
0, 36, 36, 1, 230400, 0x08bb41ee
0, 37, 37, 1, 230400, 0x43ccbd29
0, 38, 38, 1, 230400, 0x46666ee3
-0, 39, 39, 1, 230400, 0xbfd2ef29
-0, 40, 40, 1, 230400, 0x6504545f
-0, 41, 41, 1, 230400, 0x8fb86901
+0, 39, 39, 1, 230400, 0x527879e5
+0, 40, 40, 1, 230400, 0x1cc7e329
+0, 41, 41, 1, 230400, 0xde1706ab
0, 42, 42, 1, 230400, 0xc95f0917
-0, 43, 43, 1, 230400, 0x21f6a54b
-0, 44, 44, 1, 230400, 0xf808106b
-0, 45, 45, 1, 230400, 0x34150020
-0, 46, 46, 1, 230400, 0x50fdfe89
+0, 43, 43, 1, 230400, 0x81353456
+0, 44, 44, 1, 230400, 0x8a15a752
+0, 45, 45, 1, 230400, 0xede88dbb
+0, 46, 46, 1, 230400, 0xb22fa577
0, 47, 47, 1, 230400, 0x920b7708
-0, 48, 48, 1, 230400, 0xed64fcc4
-0, 49, 49, 1, 230400, 0x6291a170
-0, 50, 50, 1, 230400, 0x20524643
+0, 48, 48, 1, 230400, 0x581c924c
+0, 49, 49, 1, 230400, 0x18952c56
+0, 50, 50, 1, 230400, 0x45d9e3f3
0, 51, 51, 1, 230400, 0x92aafecd
-0, 52, 52, 1, 230400, 0xf00ee14d
-0, 53, 53, 1, 230400, 0xfa3113ea
-0, 54, 54, 1, 230400, 0x99c06df1
-0, 55, 55, 1, 230400, 0x625c6918
+0, 52, 52, 1, 230400, 0x1f789647
+0, 53, 53, 1, 230400, 0x12ba8c93
+0, 54, 54, 1, 230400, 0x6aabb970
+0, 55, 55, 1, 230400, 0x1b3e003d
0, 56, 56, 1, 230400, 0xb277b25e
-0, 57, 57, 1, 230400, 0x2e913006
-0, 58, 58, 1, 230400, 0x3f6f1d99
-0, 59, 59, 1, 230400, 0x100ab60f
+0, 57, 57, 1, 230400, 0x511eb729
+0, 58, 58, 1, 230400, 0x7328a657
+0, 59, 59, 1, 230400, 0xfa2d5eed
0, 60, 60, 1, 230400, 0x9b73d0bf
-0, 61, 61, 1, 230400, 0xda0df2ce
-0, 62, 62, 1, 230400, 0x67f7ca24
-0, 63, 63, 1, 230400, 0xbde9b3d0
-0, 64, 64, 1, 230400, 0x92e14d07
+0, 61, 61, 1, 230400, 0xd5698c41
+0, 62, 62, 1, 230400, 0xa9c332d7
+0, 63, 63, 1, 230400, 0x22451f10
+0, 64, 64, 1, 230400, 0x6fc0b571
0, 65, 65, 1, 230400, 0x9426c3d9
-0, 66, 66, 1, 230400, 0x6104be70
-0, 67, 67, 1, 230400, 0xc4d1078a
-0, 68, 68, 1, 230400, 0x89426a42
-0, 69, 69, 1, 230400, 0x5271324a
+0, 66, 66, 1, 230400, 0x375932bf
+0, 67, 67, 1, 230400, 0xaf3f9d2e
+0, 68, 68, 1, 230400, 0xefced725
+0, 69, 69, 1, 230400, 0xaa85d8b3
0, 70, 70, 1, 230400, 0x1cb1c735
-0, 71, 71, 1, 230400, 0x4249b8c6
-0, 72, 72, 1, 230400, 0x4b88cad3
-0, 73, 73, 1, 230400, 0x76af545d
+0, 71, 71, 1, 230400, 0xe2805640
+0, 72, 72, 1, 230400, 0xe6a22093
+0, 73, 73, 1, 230400, 0xa95ddab7
0, 74, 74, 1, 230400, 0xfe47e3c4
-0, 75, 75, 1, 230400, 0xa2e0e721
-0, 76, 76, 1, 230400, 0xde974a42
-0, 77, 77, 1, 230400, 0x87bf38ba
-0, 78, 78, 1, 230400, 0xd52318fd
-0, 79, 79, 1, 230400, 0x0bbb1526
+0, 75, 75, 1, 230400, 0xed3970ea
+0, 76, 76, 1, 230400, 0x2ba6ee17
+0, 77, 77, 1, 230400, 0x9ba57cda
+0, 78, 78, 1, 230400, 0x1a9aa724
+0, 79, 79, 1, 230400, 0x2546bc9c
0, 80, 80, 1, 230400, 0xa22c5e5e
-0, 81, 81, 1, 230400, 0x4532c5d2
-0, 82, 82, 1, 230400, 0x88b560ec
-0, 83, 83, 1, 230400, 0xcee9d9c9
-0, 84, 84, 1, 230400, 0x0429358f
+0, 81, 81, 1, 230400, 0x217e6d12
+0, 82, 82, 1, 230400, 0xee00ace1
+0, 83, 83, 1, 230400, 0xf2d65ecf
+0, 84, 84, 1, 230400, 0xdfb3b2c5
0, 85, 85, 1, 230400, 0xf18a9b98
-0, 86, 86, 1, 230400, 0x63f7a12c
-0, 87, 87, 1, 230400, 0x98635515
-0, 88, 88, 1, 230400, 0x36affebc
+0, 86, 86, 1, 230400, 0xc57d134f
+0, 87, 87, 1, 230400, 0x3b27d674
+0, 88, 88, 1, 230400, 0xcfc17764
0, 89, 89, 1, 230400, 0xd8c19629
-0, 90, 90, 1, 230400, 0x9ef5344d
-0, 91, 91, 1, 230400, 0x545668dc
-0, 92, 92, 1, 230400, 0x50e65e74
+0, 90, 90, 1, 230400, 0xf77cb092
+0, 91, 91, 1, 230400, 0xb2fcdd2f
+0, 92, 92, 1, 230400, 0x9acce6c3
0, 93, 93, 1, 230400, 0xe3258be3
-0, 94, 94, 1, 230400, 0xeb479e1b
-0, 95, 95, 1, 230400, 0x91894243
-0, 96, 96, 1, 230400, 0x3c5660fc
-0, 97, 97, 1, 230400, 0xf0c35673
+0, 94, 94, 1, 230400, 0x2a492882
+0, 95, 95, 1, 230400, 0x9d95c5c6
+0, 96, 96, 1, 230400, 0x785adf0d
+0, 97, 97, 1, 230400, 0x0d86cb2c
0, 98, 98, 1, 230400, 0x552832e8
-0, 99, 99, 1, 230400, 0x1970f2b1
-0, 100, 100, 1, 230400, 0x812d4c91
-0, 101, 101, 1, 230400, 0xa3fbd4ef
-0, 102, 102, 1, 230400, 0x486f9649
+0, 99, 99, 1, 230400, 0x2e825094
+0, 100, 100, 1, 230400, 0xe1b4a349
+0, 101, 101, 1, 230400, 0xb5756aac
+0, 102, 102, 1, 230400, 0x5fcf0651
0, 103, 103, 1, 230400, 0x850f315a
-0, 104, 104, 1, 230400, 0xc18ec66b
-0, 105, 105, 1, 230400, 0xc9ef266e
+0, 104, 104, 1, 230400, 0xad5f2cdf
+0, 105, 105, 1, 230400, 0x2576930b
Test mss2-wmv failed. Look at tests/data/fate/mss2-wmv.err for details.
make: *** [fate-mss2-wmv] Error 1
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Dictatorship naturally arises out of democracy, and the most aggravated
form of tyranny and slavery out of the most extreme liberty. -- Plato
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20180618/0df912fd/attachment.sig>
More information about the ffmpeg-devel
mailing list