h263: improve slice state a bit plus report proper frame type

[nihav.git] / src / codecs / h263 / decoder.rs

diff --git a/src/codecs/h263/decoder.rs b/src/codecs/h263/decoder.rs
index 15e18fc7ce491e26927863d76612861669706c78..13e289b1fa6f0a2b5cc20798f0da9f145b48a1a0 100644 (file)
--- a/src/codecs/h263/decoder.rs
+++ b/src/codecs/h263/decoder.rs
@@ -161,6 +161,16 @@ impl H263BaseDecoder {
     }
 
     pub fn is_intra(&self) -> bool { self.ftype == Type::I }
+    pub fn get_frame_type(&self) -> FrameType {
+        match self.ftype {
+            Type::I       => FrameType::I,
+            Type::P       => FrameType::P,
+            Type::B       => FrameType::B,
+            Type::PB      => FrameType::P,
+            Type::Skip    => FrameType::Skip,
+            Type::Special => FrameType::Skip,
+        }
+    }
     pub fn get_dimensions(&self) -> (usize, usize) { (self.w, self.h) }
 
     pub fn parse_frame(&mut self, bd: &mut BlockDecoder, bdsp: &BlockDSP) -> DecoderResult<NABufferType> {
@@ -215,8 +225,12 @@ impl H263BaseDecoder {
 
                 if slice.is_at_end(mb_pos) || (slice.needs_check() && mb_pos > 0 && bd.is_slice_end()) {
                     slice = bd.decode_slice_header(&pinfo)?;
-                    //mvi.reset(self.mb_w, mb_x, pinfo.get_mvmode());
-                    //cbpi.reset(self.mb_w);
+                    if !self.is_gob {
+                        mvi.reset(self.mb_w, mb_x, pinfo.get_mvmode());
+                        cbpi.reset(self.mb_w);
+                        sstate.first_line = true;
+                        sstate.first_mb   = true;
+                    }
                 }
 
                 let binfo = bd.decode_block_header(&pinfo, &slice, &sstate)?;
@@ -227,8 +241,8 @@ impl H263BaseDecoder {
                     for i in 0..6 {
                         bd.decode_block_intra(&binfo, &sstate, binfo.get_q(), i, (cbp & (1 << (5 - i))) != 0, &mut blk[i])?;
                         if apply_acpred && (binfo.acpred != ACPredMode::None) {
-                            let has_b = (i == 1) || (i == 3) || (mb_x > 0);
-                            let has_a = (i == 2) || (i == 3) || (mb_y > 0);
+                            let has_b = (i == 1) || (i == 3) || !sstate.first_mb;
+                            let has_a = (i == 2) || (i == 3) || !sstate.first_line;
                             let (b_mb, b_blk) = if has_b {
                                     if (i == 1) || (i == 3) {
                                         (mb_pos, i - 1)
@@ -296,7 +310,7 @@ impl H263BaseDecoder {
                     }
                     blockdsp::put_blocks(&mut buf, mb_x, mb_y, &blk);
                     mvi.set_zero_mv(mb_x);
-                } else if !binfo.is_skipped() {
+                } else if (binfo.mode != Type::B) && !binfo.is_skipped() {
                     if binfo.get_num_mvs() == 1 {
                         let mv = mvi.predict(mb_x, 0, false, binfo.get_mv(0));
                         if let Some(ref srcbuf) = self.prev_frm {
@@ -317,11 +331,20 @@ impl H263BaseDecoder {
                         h263_idct(&mut blk[i]);
                     }
                     blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk);
-                } else {
+                } else if binfo.mode != Type::B {
                     mvi.set_zero_mv(mb_x);
                     if let Some(ref srcbuf) = self.prev_frm {
                         bdsp.copy_blocks(&mut buf, srcbuf, mb_x * 16, mb_y * 16, 16, 16, ZERO_MV);
                     }
+                } else {
+//todo
+                    if cbp != 0 {
+                        for i in 0..6 {
+                            bd.decode_block_inter(&binfo, &sstate, binfo.get_q(), i, ((cbp >> (5 - i)) & 1) != 0, &mut blk[i])?;
+                            h263_idct(&mut blk[i]);
+                        }
+                    }
+                    blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk);
                 }
                 if pinfo.is_pb() {
                     let mut b_mb = BMB::new();