X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp3.rs;h=114237abf7233656ee485fa3fa80dc81e1e02cc7;hb=ed4165117e3348e3b2b8484733469012b7b4c182;hp=c363d9770f41cf230cf43769d0d7acb90a96a0fd;hpb=b8fb8e36449e29b6811ed5debcba36ed0705161c;p=nihav.git

diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs
index c363d97..114237a 100644
--- a/nihav-duck/src/codecs/vp3.rs
+++ b/nihav-duck/src/codecs/vp3.rs
@@ -425,7 +425,7 @@ fn rescale_qmat(dst_qmat: &mut [i16; 64], base_qmat: &[i16; 64], dc_quant: i16,
     dst_qmat[0] = (base_qmat[0] * dc_quant / 100).max(minval * 2) << 2;
 }
 
-fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, coef_no: usize, token: u8) -> DecoderResult<()> {
+fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, token: u8) -> DecoderResult<()> {
     match token {
         // EOBs
         0 | 1 | 2 => { *eob_run = (token as usize) + 1; },
@@ -527,7 +527,7 @@ fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, coef_n
     if *eob_run > 0 {
         blk.idx = 64;
         *eob_run -= 1;
-    } else if coef_no > 0 {
+    } else if (token > 8) && (blk.idx > 1) {
         blk.has_ac = true;
     }
     Ok(())
@@ -820,7 +820,7 @@ println!("intra, ver {} (self {})", version, self.version);
                         &codes.ac_p_cb[table]
                     };
                 let token                       = br.read_cb(cb)?;
-                expand_token(blk, br, &mut self.eob_run, coef_no, token)?;
+                expand_token(blk, br, &mut self.eob_run, token)?;
             }
             Ok(())
         } else {
@@ -1013,7 +1013,7 @@ println!("intra, ver {} (self {})", version, self.version);
                 }
                 let cb = if (blkaddr & 3) == 0 { cbs[0] } else { cbs[1] };
                 let token                       = br.read_cb(cb)?;
-                expand_token(blk, br, &mut self.eob_run, coef_no, token)?;
+                expand_token(blk, br, &mut self.eob_run, token)?;
             }
             Ok(())
         } else {
@@ -1212,7 +1212,7 @@ println!("intra, ver {} (self {})", version, self.version);
                         };
                     let cb = if (blkaddr & 3) == 0 { cbs[0] } else { cbs[1] };
                     let token                   = br.read_cb(cb)?;
-                    expand_token(blk, br, &mut coef_eob[blk.idx], blk.idx, token)?;
+                    expand_token(blk, br, &mut coef_eob[blk.idx], token)?;
                     if blk.idx == 64 { break; }
                 }
                 let idx = blkaddr >> 2;
@@ -1709,12 +1709,27 @@ println!("intra, ver {} (self {})", version, self.version);
             }
             blk_idx += blk_w;
         }
-/*        for plane in 1..3 {
+        let blk_w = self.mb_w;
+        for plane in 1..3 {
             for by in 0..self.mb_h {
                 for bx in 0..self.mb_w {
+                    let blk = &self.blocks[blk_idx + bx];
+                    if (bx > 0) && blk.coded {
+                        vp31_loop_filter_v(frm, bx * 8, by * 8, plane, self.loop_str);
+                    }
+                    if (by > 0) && blk.coded {
+                        vp31_loop_filter_h(frm, bx * 8, by * 8, plane, self.loop_str);
+                    }
+                    if (bx < blk_w - 1) && !self.blocks[blk_idx + bx + 1].coded {
+                        vp31_loop_filter_v(frm, bx * 8 + 8, by * 8, plane, self.loop_str);
+                    }
+                    if (by < self.mb_h - 1) && !self.blocks[blk_idx + bx + blk_w].coded {
+                        vp31_loop_filter_h(frm, bx * 8, by * 8 + 8, plane, self.loop_str);
+                    }
                 }
+                blk_idx += blk_w;
             }
-        }*/
+        }
     }
     fn generate_block_addr(&mut self) {
         let sb_w_y = (self.width         + 31) >> 5;