# HG changeset patch
# User kostya
# Date 1229542796 0
# Node ID a7c85cdc11b535e9ca7e7596da4112043a458f43
# Parent  84a066542cd4ec1f7e97589819dfda58867994aa
Generate correct deblock pattern for RV30

diff -r 84a066542cd4 -r a7c85cdc11b5 rv34.c
--- a/rv34.c	Wed Dec 17 19:37:45 2008 +0000
+++ b/rv34.c	Wed Dec 17 19:39:56 2008 +0000
@@ -1109,7 +1109,15 @@
         hmvmask &= ~0x000F;
     if(!s->mb_x)
         vmvmask &= ~0x1111;
-    return hmvmask | vmvmask; //XXX: should be stored separately for RV3
+    if(r->rv30){ //RV30 marks both subblocks on the edge for filtering
+        vmvmask |= (vmvmask & 0x4444) >> 1;
+        hmvmask |= (hmvmask & 0x0F00) >> 4;
+        if(s->mb_x)
+            r->deblock_coefs[s->mb_x - 1 + s->mb_y*s->mb_stride] |= (vmvmask & 0x1111) << 3;
+        if(!s->first_slice_line)
+            r->deblock_coefs[s->mb_x + (s->mb_y - 1)*s->mb_stride] |= (hmvmask & 0xF) << 12;
+    }
+    return hmvmask | vmvmask;
 }
 
 static int rv34_decode_macroblock(RV34DecContext *r, int8_t *intra_types)