Mercurial > libavcodec.hg

changeset 8368:a7c85cdc11b5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Generate correct deblock pattern for RV30
author kostya
date Wed, 17 Dec 2008 19:39:56 +0000
parents 84a066542cd4
children 45c3780b1a96
files rv34.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)