introduce NADecoderSupport and buffer pools

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

diff --git a/nihav-realmedia/src/codecs/rv20.rs b/nihav-realmedia/src/codecs/rv20.rs
index eeb56cfb9b2f59625e52968ddd6f86e2837e3070..527c23e754a622259ebe53ccac6f8797c1bdb329 100644 (file)
--- a/nihav-realmedia/src/codecs/rv20.rs
+++ b/nihav-realmedia/src/codecs/rv20.rs
@@ -1,5 +1,3 @@
-use std::rc::Rc;
-use std::cell::RefCell;
 use nihav_core::io::bitreader::*;
 use nihav_core::io::codebook::*;
 use nihav_core::formats;
@@ -32,7 +30,7 @@ struct RPRInfo {
 }
 
 struct RealVideo20Decoder {
-    info:       Rc<NACodecInfo>,
+    info:       NACodecInfoRef,
     dec:        H263BaseDecoder,
     tables:     Tables,
     w:          usize,
@@ -445,7 +443,7 @@ impl RealVideo20Decoder {
         };
 
         RealVideo20Decoder{
-            info:           Rc::new(DUMMY_CODEC_INFO),
+            info:           NACodecInfoRef::default(),
             dec:            H263BaseDecoder::new_b_frames(false),
             tables:         tables,
             w:              0,
@@ -459,13 +457,13 @@ impl RealVideo20Decoder {
 
 impl NADecoder for RealVideo20Decoder {
 #[allow(unused_variables)]
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             let w = vinfo.get_width();
             let h = vinfo.get_height();
             let fmt = formats::YUV420_FORMAT;
             let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, false, fmt));
-            self.info = Rc::new(NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()));
+            self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
             self.w = w;
             self.h = h;
 
@@ -493,7 +491,7 @@ impl NADecoder for RealVideo20Decoder {
             Err(DecoderError::InvalidData)
         }
     }
-    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+    fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let src = pkt.get_buffer();
 
         let mut ibr = RealVideo20BR::new(&src, &self.tables, self.w, self.h, self.minor_ver, self.rpr);
@@ -503,7 +501,7 @@ impl NADecoder for RealVideo20Decoder {
         let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
         frm.set_keyframe(self.dec.is_intra());
         frm.set_frame_type(self.dec.get_frame_type());
-        Ok(Rc::new(RefCell::new(frm)))
+        Ok(frm.into_ref())
     }
 }