replace vec.truncate(0) with vec.clear()

[nihav.git] / nihav-realmedia / src / codecs / rv60.rs

diff --git a/nihav-realmedia/src/codecs/rv60.rs b/nihav-realmedia/src/codecs/rv60.rs
index 45322b55910b4d53007fa0607f87110e98b14df9..c786b71a0495753f62e61de01433dba5b91b27ff 100644 (file)
--- a/nihav-realmedia/src/codecs/rv60.rs
+++ b/nihav-realmedia/src/codecs/rv60.rs
@@ -1,10 +1,12 @@
 use nihav_core::formats::YUV420_FORMAT;
 use nihav_core::frame::*;
-use nihav_core::codecs::{NADecoder, NADecoderSupport, DecoderError, DecoderResult};
+use nihav_core::codecs::{NADecoder, NADecoderSupport, DecoderError, DecoderResult, FrameSkipMode};
+use nihav_core::options::*;
 use nihav_codec_support::codecs::{MV, ZERO_MV, IPBShuffler};
 use nihav_core::io::byteio::{MemoryReader,ByteReader};
 use nihav_core::io::bitreader::{BitReader,BitReaderMode};
 use nihav_core::io::intcode::*;
+use std::str::FromStr;
 
 use super::rv60codes::*;
 use super::rv60dsp::*;
@@ -121,7 +123,7 @@ impl FrameHeader {
             signs.push(sign);
         }
         validate!(signs[0]);
-        sizes.truncate(0);
+        sizes.clear();
         let mut sum = 0;
         let first_size                                  = br.read(nbits)? as usize;
         validate!(first_size > 0);
@@ -220,7 +222,7 @@ const RV60_BLOCK_LOG2: [u8; 65] = [
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6
 ];
 const RV60_AVAIL_MASK: [u8; 64] = [
-    0, 1, 0, 3, 0, 1, 0, 7, 0, 1, 0, 3, 0, 1, 0, 0,
+    0, 1, 0, 3, 0, 1, 0, 7, 0, 1, 0, 3, 0, 1, 0, 0xF,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -614,6 +616,7 @@ struct RealVideo60Decoder {
     ipbs:       IPBShuffler,
     dsp:        RV60DSP,
     ipred:      IntraPredContext,
+    skip_mode:  FrameSkipMode,
 
     avg_buf:    NAVideoBufferRef<u8>,
 
@@ -656,6 +659,7 @@ impl RealVideo60Decoder {
             cbs:        RV60Codebooks::init(),
             ipbs:       IPBShuffler::new(),
             ipred:      IntraPredContext::new(),
+            skip_mode:  FrameSkipMode::default(),
             dsp:        RV60DSP::new(),
             avg_buf,
             y_coeffs:   [0; 16 * 16],
@@ -724,6 +728,7 @@ println!(" left {} bits", br.left());
 }
         Ok(())
     }
+    #[allow(clippy::cognitive_complexity)]
     fn decode_cb_tree(&mut self, buf: &mut NASimpleVideoFrame<u8>, hdr: &FrameHeader, br: &mut BitReader, xpos: usize, ypos: usize, log_size: u8) -> DecoderResult<()> {
         if (xpos >= hdr.width) || (ypos >= hdr.height) { return Ok(()); }
 
@@ -1442,6 +1447,24 @@ println!("???");
         let hsize = (src[0] as usize) * 8 + 9;
         let mut br = BitReader::new(&src[hsize..], BitReaderMode::BE);
         let hdr = FrameHeader::read(&mut br)?;
+        match self.skip_mode {
+            FrameSkipMode::None => {},
+            FrameSkipMode::KeyframesOnly => {
+                if hdr.ftype == FrameType::B {
+                    let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::None);
+                    frm.set_frame_type(FrameType::Skip);
+                    return Ok(frm.into_ref());
+                }
+            },
+            FrameSkipMode::IntraOnly => {
+                if hdr.ftype != FrameType::I {
+                    let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::None);
+                    frm.set_frame_type(FrameType::Skip);
+                    return Ok(frm.into_ref());
+                }
+            },
+        };
+
         let mut slices: Vec<usize> = Vec::new();
         hdr.parse_slice_sizes(&mut br, &mut slices)?;
         match hdr.ftype {
@@ -1483,7 +1506,7 @@ println!("???");
         self.pu_stride = cu_w << 3;
         self.pu_info.resize(self.pu_stride * (cu_h << 3), PUInfo::default());
         self.blk_stride = cu_w << 4;
-        self.blk_info.truncate(0);
+        self.blk_info.clear();
         self.blk_info.resize(self.blk_stride * (cu_h << 4), BlockInfo::default());
         if hdr.deblock {
             self.dblk.reinit(hdr.width, hdr.height);
@@ -1521,6 +1544,42 @@ println!("???");
     }
 }
 
+const DECODER_OPTIONS: &[NAOptionDefinition] = &[
+    NAOptionDefinition {
+        name: FRAME_SKIP_OPTION, description: FRAME_SKIP_OPTION_DESC,
+        opt_type: NAOptionDefinitionType::String(Some(&[
+                FRAME_SKIP_OPTION_VAL_NONE,
+                FRAME_SKIP_OPTION_VAL_KEYFRAME,
+                FRAME_SKIP_OPTION_VAL_INTRA
+            ])) },
+];
+
+impl NAOptionHandler for RealVideo60Decoder {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { DECODER_OPTIONS }
+    fn set_options(&mut self, options: &[NAOption]) {
+        for option in options.iter() {
+            for opt_def in DECODER_OPTIONS.iter() {
+                if opt_def.check(option).is_ok() {
+                    match (option.name, &option.value) {
+                        (FRAME_SKIP_OPTION, NAValue::String(ref str)) => {
+                            if let Ok(smode) = FrameSkipMode::from_str(str) {
+                                self.skip_mode = smode;
+                            }
+                        },
+                        _ => {},
+                    }
+                }
+            }
+        }
+    }
+    fn query_option_value(&self, name: &str) -> Option<NAValue> {
+        match name {
+            FRAME_SKIP_OPTION => Some(NAValue::String(self.skip_mode.to_string())),
+            _ => None,
+        }
+    }
+}
+
 pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(RealVideo60Decoder::new())
 }
@@ -1530,16 +1589,29 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::realmedia_register_all_codecs;
+    use crate::realmedia_register_all_decoders;
     use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_rv60() {
         let mut dmx_reg = RegisteredDemuxers::new();
         realmedia_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        realmedia_register_all_codecs(&mut dec_reg);
+        realmedia_register_all_decoders(&mut dec_reg);
 
-        test_file_decoding("realmedia", "assets/RV/RV60.rmhd", Some(4000), true, false, None/*Some("rv60")*/, &dmx_reg, &dec_reg);
-//panic!("end");
+        test_decoding("realmedia", "realvideo6", "assets/RV/RV60.rmhd", Some(1000), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5Frames(vec![
+                            [0x2b1f1807, 0x09edef33, 0x0e6c78c1, 0x3b3c8179],
+                            [0xea406850, 0x400802b8, 0xac106fb6, 0xe1e2e766],
+                            [0x2b1f1807, 0x09edef33, 0x0e6c78c1, 0x3b3c8179],
+                            [0xb04e2626, 0x976e16f5, 0xc41a7a78, 0x2d8765da],
+                            [0xf4f30d97, 0x7f2876eb, 0x265ffad4, 0x3542a7c4],
+                            [0xa5082524, 0x38a86952, 0x35bf1fee, 0xfc830d3f],
+                            [0x75eab1a2, 0x62e2222f, 0xe96a20d9, 0x652140b4],
+                            [0x7590fa49, 0x78c83490, 0x239eeff9, 0x64282ac7],
+                            [0x70b19e9f, 0x66c1f866, 0xb8d7142a, 0xf3e424b2],
+                            [0xc2934123, 0x3bf72fc4, 0x12d8d123, 0x1f39525b],
+                            [0x13344919, 0xecd01190, 0x2f69079b, 0xbf4d7026],
+                            [0xcefb3284, 0xa9b36d4d, 0xf1aa6752, 0xaae17d44],
+                            [0x57f01275, 0xf8e883ea, 0x4865752e, 0xc760a777]]));
     }
 }