From: Michael Niedermayer <[email protected]>
Fixes read of uninitialized memory.
---
In a comment on github, Mashiat wrote:
---
In-loop filtering process is same for both progressive pictures
and interlaced field pictures, if the difference in stride is
accounted for. Interlaced frame picture has it's own process
defined and needs to be implemented. If I remember correctly,
SA10143 consists of interlaced field pictures, so in-loop
filtering mechanism should be the same.
Unless someone steps forward to fix the existing code to account
for stride so that it works on both progressive and interlaced
field pictures, this patch is an acceptable compromise. I just
wanted the above fact to be noted.
---
---
libavcodec/vc1dec.c | 2 +-
tests/ref/fate/vc1_sa10143 | 58 ++++++++++++++++++++++----------------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 994f5df..7714113 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -4650,7 +4650,7 @@ static void vc1_decode_p_blocks(VC1Context *v)
if (s->mb_y != s->start_mb_y) ff_mpeg_draw_horiz_band(s, (s->mb_y - 1)
* 16, 16);
s->first_slice_line = 0;
}
- if (apply_loop_filter) {
+ if (apply_loop_filter && v->fcm == PROGRESSIVE) {
s->mb_x = 0;
ff_init_block_index(s);
for (; s->mb_x < s->mb_width; s->mb_x++) {
diff --git a/tests/ref/fate/vc1_sa10143 b/tests/ref/fate/vc1_sa10143
index a008356..0d2e697 100644
--- a/tests/ref/fate/vc1_sa10143
+++ b/tests/ref/fate/vc1_sa10143
@@ -1,31 +1,31 @@
#tb 0: 1/25
0, 0, 0, 1, 518400, 0x89407f55
-0, 2, 2, 1, 518400, 0xeb8d84a1
-0, 3, 3, 1, 518400, 0x2121ff57
-0, 4, 4, 1, 518400, 0xd81adb3d
-0, 5, 5, 1, 518400, 0x01e36aa2
-0, 6, 6, 1, 518400, 0x6b802361
-0, 7, 7, 1, 518400, 0xc8403c77
-0, 8, 8, 1, 518400, 0xdd342b5d
-0, 9, 9, 1, 518400, 0x2100eea5
-0, 10, 10, 1, 518400, 0x92a22da6
-0, 11, 11, 1, 518400, 0x6bacdef7
-0, 12, 12, 1, 518400, 0x4a00715f
-0, 13, 13, 1, 518400, 0x59b98727
-0, 14, 14, 1, 518400, 0xbf912ee1
-0, 15, 15, 1, 518400, 0x8c966cd6
-0, 16, 16, 1, 518400, 0x2c9a2535
-0, 17, 17, 1, 518400, 0x29085c06
-0, 18, 18, 1, 518400, 0x46ae6b7d
-0, 19, 19, 1, 518400, 0x283100f4
-0, 20, 20, 1, 518400, 0x2731b5ff
-0, 21, 21, 1, 518400, 0x1132ea54
-0, 22, 22, 1, 518400, 0x37cbe539
-0, 23, 23, 1, 518400, 0x08ff75cf
-0, 24, 24, 1, 518400, 0xafb6bc45
-0, 25, 25, 1, 518400, 0x19d3873d
-0, 26, 26, 1, 518400, 0xd494a8be
-0, 27, 27, 1, 518400, 0x285f41ef
-0, 28, 28, 1, 518400, 0xd4b1ffa1
-0, 29, 29, 1, 518400, 0xc3876c3a
-0, 30, 30, 1, 518400, 0xb73dbb62
+0, 2, 2, 1, 518400, 0x1480849d
+0, 3, 3, 1, 518400, 0x0e69ff59
+0, 4, 4, 1, 518400, 0x00d6db06
+0, 5, 5, 1, 518400, 0x1a5b6a69
+0, 6, 6, 1, 518400, 0xc1a1232e
+0, 7, 7, 1, 518400, 0x9a4e3c54
+0, 8, 8, 1, 518400, 0x04122b44
+0, 9, 9, 1, 518400, 0x0fcfeebc
+0, 10, 10, 1, 518400, 0xc7882dc1
+0, 11, 11, 1, 518400, 0x9d79df09
+0, 12, 12, 1, 518400, 0xff6b716f
+0, 13, 13, 1, 518400, 0x638a8746
+0, 14, 14, 1, 518400, 0x07572efb
+0, 15, 15, 1, 518400, 0x306f6cef
+0, 16, 16, 1, 518400, 0xd7602518
+0, 17, 17, 1, 518400, 0x49ab5bf5
+0, 18, 18, 1, 518400, 0x3c736b6c
+0, 19, 19, 1, 518400, 0x95ae00c9
+0, 20, 20, 1, 518400, 0x7b9ab64e
+0, 21, 21, 1, 518400, 0x5205ea68
+0, 22, 22, 1, 518400, 0xb486e618
+0, 23, 23, 1, 518400, 0xa3217616
+0, 24, 24, 1, 518400, 0xc66bbc56
+0, 25, 25, 1, 518400, 0xf024872a
+0, 26, 26, 1, 518400, 0x97d2a8ba
+0, 27, 27, 1, 518400, 0xa3a2418e
+0, 28, 28, 1, 518400, 0x08460005
+0, 29, 29, 1, 518400, 0x50fb6c94
+0, 30, 30, 1, 518400, 0x5584bb40
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
