X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv60.rs;h=2810b3ab8a00861e2bb9da9ed3356f2de5800d0d;hb=54d2b09a7863070fabde6f8df45320ba35e8030b;hp=521025dae75b2bbbe9a93044d1d614c0cd8d7cf4;hpb=d32c444b36000abaaf5c65866a2dbdfec1c1ac26;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/rv60.rs b/nihav-realmedia/src/codecs/rv60.rs
index 521025d..2810b3a 100644
--- a/nihav-realmedia/src/codecs/rv60.rs
+++ b/nihav-realmedia/src/codecs/rv60.rs
@@ -1,9 +1,12 @@
 use nihav_core::formats::YUV420_FORMAT;
 use nihav_core::frame::*;
-use nihav_core::codecs::{NADecoder, NADecoderSupport, MV, ZERO_MV, DecoderError, DecoderResult, IPBShuffler};
+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::*;
@@ -253,7 +256,7 @@ enum PUType {
 
 const RV60_PU_TYPES: [PUType; 8] = [
     PUType::Full,   PUType::N2Hor,  PUType::N2Ver,  PUType::Quarters,
-    PUType::N4Hor,  PUType::N34Hor, PUType::N4Ver,  PUType::N34Ver, 
+    PUType::N4Hor,  PUType::N34Hor, PUType::N4Ver,  PUType::N34Ver,
 ];
 
 impl PUType {
@@ -613,6 +616,7 @@ struct RealVideo60Decoder {
     ipbs:       IPBShuffler,
     dsp:        RV60DSP,
     ipred:      IntraPredContext,
+    skip_mode:  FrameSkipMode,
 
     avg_buf:    NAVideoBufferRef<u8>,
 
@@ -655,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],
@@ -682,7 +687,7 @@ impl RealVideo60Decoder {
         }
     }
     fn decode_cu_line(&mut self, buf: &mut NASimpleVideoFrame<u8>, hdr: &FrameHeader, src: &[u8], cu_y: usize) -> DecoderResult<()> {
-        let mut br = BitReader::new(src, src.len(), BitReaderMode::BE);
+        let mut br = BitReader::new(src, BitReaderMode::BE);
         let cu_w = hdr.get_width_cu();
         let dqp = hdr.read_line_qp_offset(&mut br)?;
         let qps = (hdr.qp as i8) + dqp;
@@ -1283,7 +1288,7 @@ println!(" left {} bits", br.left());
         } else {
             b_mv = ZERO_MV;
         }
-        
+
         MVInfo { f_mv: mvi.f_mv + f_mv, b_mv: mvi.b_mv + b_mv, mvref: mvi.mvref }
     }
     fn fill_skip_cand(&mut self, hdr: &FrameHeader, skip_cand: &mut UniqueList<MVInfo>, size: usize) {
@@ -1439,8 +1444,26 @@ println!("???");
 
         validate!(src.len() > 9);
         let hsize = (src[0] as usize) * 8 + 9;
-        let mut br = BitReader::new(&src[hsize..], src.len() - hsize, BitReaderMode::BE);
+        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 {
@@ -1520,7 +1543,43 @@ println!("???");
     }
 }
 
-pub fn get_decoder() -> Box<dyn NADecoder> {
+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())
 }
 
@@ -1528,9 +1587,9 @@ pub fn get_decoder() -> Box<dyn NADecoder> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
-    use crate::codecs::realmedia_register_all_codecs;
-    use crate::demuxers::realmedia_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::realmedia_register_all_codecs;
+    use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_rv60() {
         let mut dmx_reg = RegisteredDemuxers::new();