use std::cmp::max;
use std::collections::HashMap;
use std::fmt;
-use std::rc::Rc;
-use std::cell::*;
-use crate::formats::*;
+pub use std::rc::Rc;
+pub use std::cell::*;
+use std::sync::Arc;
+pub use crate::formats::*;
+pub use crate::refs::*;
#[allow(dead_code)]
#[derive(Clone,Copy,PartialEq)]
}
}
-pub type NABufferRefT<T> = Rc<RefCell<Vec<T>>>;
-
#[derive(Clone)]
pub struct NAVideoBuffer<T> {
info: NAVideoInfo,
- data: NABufferRefT<T>,
+ data: NABufferRef<Vec<T>>,
offs: Vec<usize>,
strides: Vec<usize>,
}
else { self.offs[idx] }
}
pub fn get_info(&self) -> NAVideoInfo { self.info }
- pub fn get_data(&self) -> Ref<Vec<T>> { self.data.borrow() }
- pub fn get_data_mut(&mut self) -> RefMut<Vec<T>> { self.data.borrow_mut() }
+ pub fn get_data(&self) -> &Vec<T> { self.data.as_ref() }
+ pub fn get_data_mut(&mut self) -> Option<&mut Vec<T>> { self.data.as_mut() }
pub fn copy_buffer(&mut self) -> Self {
- let mut data: Vec<T> = Vec::with_capacity(self.data.borrow().len());
- data.clone_from(self.data.borrow().as_ref());
+ let mut data: Vec<T> = Vec::with_capacity(self.data.len());
+ data.clone_from(self.data.as_ref());
let mut offs: Vec<usize> = Vec::with_capacity(self.offs.len());
offs.clone_from(&self.offs);
let mut strides: Vec<usize> = Vec::with_capacity(self.strides.len());
strides.clone_from(&self.strides);
- NAVideoBuffer { info: self.info, data: Rc::new(RefCell::new(data)), offs: offs, strides: strides }
+ NAVideoBuffer { info: self.info, data: NABufferRef::new(data), offs: offs, strides: strides }
}
pub fn get_stride(&self, idx: usize) -> usize {
if idx >= self.strides.len() { return 0; }
#[derive(Clone)]
pub struct NAAudioBuffer<T> {
info: NAAudioInfo,
- data: NABufferRefT<T>,
+ data: NABufferRef<Vec<T>>,
offs: Vec<usize>,
chmap: NAChannelMap,
len: usize,
}
pub fn get_info(&self) -> NAAudioInfo { self.info }
pub fn get_chmap(&self) -> NAChannelMap { self.chmap.clone() }
- pub fn get_data(&self) -> Ref<Vec<T>> { self.data.borrow() }
- pub fn get_data_mut(&mut self) -> RefMut<Vec<T>> { self.data.borrow_mut() }
+ pub fn get_data(&self) -> &Vec<T> { self.data.as_ref() }
+ pub fn get_data_mut(&mut self) -> Option<&mut Vec<T>> { self.data.as_mut() }
pub fn copy_buffer(&mut self) -> Self {
- let mut data: Vec<T> = Vec::with_capacity(self.data.borrow().len());
- data.clone_from(self.data.borrow().as_ref());
+ let mut data: Vec<T> = Vec::with_capacity(self.data.len());
+ data.clone_from(self.data.as_ref());
let mut offs: Vec<usize> = Vec::with_capacity(self.offs.len());
offs.clone_from(&self.offs);
- NAAudioBuffer { info: self.info, data: Rc::new(RefCell::new(data)), offs: offs, chmap: self.get_chmap(), len: self.len }
+ NAAudioBuffer { info: self.info, data: NABufferRef::new(data), offs: offs, chmap: self.get_chmap(), len: self.len }
}
pub fn get_length(&self) -> usize { self.len }
}
impl NAAudioBuffer<u8> {
- pub fn new_from_buf(info: NAAudioInfo, data: NABufferRefT<u8>, chmap: NAChannelMap) -> Self {
- let len = data.borrow().len();
+ pub fn new_from_buf(info: NAAudioInfo, data: NABufferRef<Vec<u8>>, chmap: NAChannelMap) -> Self {
+ let len = data.len();
NAAudioBuffer { info: info, data: data, chmap: chmap, offs: Vec::new(), len: len }
}
}
pub enum NABufferType {
Video (NAVideoBuffer<u8>),
Video16 (NAVideoBuffer<u16>),
+ Video32 (NAVideoBuffer<u32>),
VideoPacked(NAVideoBuffer<u8>),
AudioU8 (NAAudioBuffer<u8>),
AudioI16 (NAAudioBuffer<i16>),
AudioI32 (NAAudioBuffer<i32>),
AudioF32 (NAAudioBuffer<f32>),
AudioPacked(NAAudioBuffer<u8>),
- Data (NABufferRefT<u8>),
+ Data (NABufferRef<Vec<u8>>),
None,
}
match *self {
NABufferType::Video(ref vb) => vb.get_offset(idx),
NABufferType::Video16(ref vb) => vb.get_offset(idx),
+ NABufferType::Video32(ref vb) => vb.get_offset(idx),
NABufferType::VideoPacked(ref vb) => vb.get_offset(idx),
NABufferType::AudioU8(ref ab) => ab.get_offset(idx),
NABufferType::AudioI16(ref ab) => ab.get_offset(idx),
_ => 0,
}
}
- pub fn get_vbuf(&mut self) -> Option<NAVideoBuffer<u8>> {
+ pub fn get_video_info(&self) -> Option<NAVideoInfo> {
+ match *self {
+ NABufferType::Video(ref vb) => Some(vb.get_info()),
+ NABufferType::Video16(ref vb) => Some(vb.get_info()),
+ NABufferType::Video32(ref vb) => Some(vb.get_info()),
+ NABufferType::VideoPacked(ref vb) => Some(vb.get_info()),
+ _ => None,
+ }
+ }
+ pub fn get_vbuf(&self) -> Option<NAVideoBuffer<u8>> {
match *self {
NABufferType::Video(ref vb) => Some(vb.clone()),
NABufferType::VideoPacked(ref vb) => Some(vb.clone()),
_ => None,
}
}
- pub fn get_vbuf16(&mut self) -> Option<NAVideoBuffer<u16>> {
+ pub fn get_vbuf16(&self) -> Option<NAVideoBuffer<u16>> {
match *self {
NABufferType::Video16(ref vb) => Some(vb.clone()),
_ => None,
}
}
- pub fn get_abuf_u8(&mut self) -> Option<NAAudioBuffer<u8>> {
+ pub fn get_vbuf32(&self) -> Option<NAVideoBuffer<u32>> {
+ match *self {
+ NABufferType::Video32(ref vb) => Some(vb.clone()),
+ _ => None,
+ }
+ }
+ pub fn get_abuf_u8(&self) -> Option<NAAudioBuffer<u8>> {
match *self {
NABufferType::AudioU8(ref ab) => Some(ab.clone()),
NABufferType::AudioPacked(ref ab) => Some(ab.clone()),
_ => None,
}
}
- pub fn get_abuf_i16(&mut self) -> Option<NAAudioBuffer<i16>> {
+ pub fn get_abuf_i16(&self) -> Option<NAAudioBuffer<i16>> {
match *self {
NABufferType::AudioI16(ref ab) => Some(ab.clone()),
_ => None,
}
}
- pub fn get_abuf_i32(&mut self) -> Option<NAAudioBuffer<i32>> {
+ pub fn get_abuf_i32(&self) -> Option<NAAudioBuffer<i32>> {
match *self {
NABufferType::AudioI32(ref ab) => Some(ab.clone()),
_ => None,
}
}
- pub fn get_abuf_f32(&mut self) -> Option<NAAudioBuffer<f32>> {
+ pub fn get_abuf_f32(&self) -> Option<NAAudioBuffer<f32>> {
match *self {
NABufferType::AudioF32(ref ab) => Some(ab.clone()),
_ => None,
}
}
+const NA_SIMPLE_VFRAME_COMPONENTS: usize = 4;
+pub struct NASimpleVideoFrame<'a, T: Copy> {
+ pub width: [usize; NA_SIMPLE_VFRAME_COMPONENTS],
+ pub height: [usize; NA_SIMPLE_VFRAME_COMPONENTS],
+ pub flip: bool,
+ pub stride: [usize; NA_SIMPLE_VFRAME_COMPONENTS],
+ pub offset: [usize; NA_SIMPLE_VFRAME_COMPONENTS],
+ pub components: usize,
+ pub data: &'a mut Vec<T>,
+}
+
+impl<'a, T:Copy> NASimpleVideoFrame<'a, T> {
+ pub fn from_video_buf(vbuf: &'a mut NAVideoBuffer<T>) -> Option<Self> {
+ let vinfo = vbuf.get_info();
+ let components = vinfo.format.components as usize;
+ if components > NA_SIMPLE_VFRAME_COMPONENTS {
+ return None;
+ }
+ let mut w: [usize; NA_SIMPLE_VFRAME_COMPONENTS] = [0; NA_SIMPLE_VFRAME_COMPONENTS];
+ let mut h: [usize; NA_SIMPLE_VFRAME_COMPONENTS] = [0; NA_SIMPLE_VFRAME_COMPONENTS];
+ let mut s: [usize; NA_SIMPLE_VFRAME_COMPONENTS] = [0; NA_SIMPLE_VFRAME_COMPONENTS];
+ let mut o: [usize; NA_SIMPLE_VFRAME_COMPONENTS] = [0; NA_SIMPLE_VFRAME_COMPONENTS];
+ for comp in 0..components {
+ let (width, height) = vbuf.get_dimensions(comp);
+ w[comp] = width;
+ h[comp] = height;
+ s[comp] = vbuf.get_stride(comp);
+ o[comp] = vbuf.get_offset(comp);
+ }
+ let flip = vinfo.flipped;
+ Some(NASimpleVideoFrame {
+ width: w,
+ height: h,
+ flip,
+ stride: s,
+ offset: o,
+ components,
+ data: vbuf.data.as_mut().unwrap(),
+ })
+ }
+}
+
#[derive(Debug,Clone,Copy,PartialEq)]
pub enum AllocatorError {
TooLargeDimensions,
let height = ((vinfo.height as usize) + align_mod) & !align_mod;
let mut max_depth = 0;
let mut all_packed = true;
+ let mut all_bytealigned = true;
for i in 0..fmt.get_num_comp() {
let ochr = fmt.get_chromaton(i);
if let None = ochr { continue; }
let chr = ochr.unwrap();
if !chr.is_packed() {
all_packed = false;
- break;
+ } else if ((chr.get_shift() + chr.get_depth()) & 7) != 0 {
+ all_bytealigned = false;
}
max_depth = max(max_depth, chr.get_depth());
}
+ let unfit_elem_size = match fmt.get_elem_size() {
+ 2 | 4 => false,
+ _ => true,
+ };
//todo semi-packed like NV12
if fmt.is_paletted() {
strides.push(stride);
let mut data: Vec<u8> = Vec::with_capacity(new_size.unwrap());
data.resize(new_size.unwrap(), 0);
- let buf: NAVideoBuffer<u8> = NAVideoBuffer { data: Rc::new(RefCell::new(data)), info: vinfo, offs: offs, strides: strides };
+ let buf: NAVideoBuffer<u8> = NAVideoBuffer { data: NABufferRef::new(data), info: vinfo, offs: offs, strides: strides };
Ok(NABufferType::Video(buf))
} else if !all_packed {
for i in 0..fmt.get_num_comp() {
if max_depth <= 8 {
let mut data: Vec<u8> = Vec::with_capacity(new_size);
data.resize(new_size, 0);
- let buf: NAVideoBuffer<u8> = NAVideoBuffer { data: Rc::new(RefCell::new(data)), info: vinfo, offs: offs, strides: strides };
+ let buf: NAVideoBuffer<u8> = NAVideoBuffer { data: NABufferRef::new(data), info: vinfo, offs: offs, strides: strides };
Ok(NABufferType::Video(buf))
- } else {
+ } else if max_depth <= 16 {
let mut data: Vec<u16> = Vec::with_capacity(new_size);
data.resize(new_size, 0);
- let buf: NAVideoBuffer<u16> = NAVideoBuffer { data: Rc::new(RefCell::new(data)), info: vinfo, offs: offs, strides: strides };
+ let buf: NAVideoBuffer<u16> = NAVideoBuffer { data: NABufferRef::new(data), info: vinfo, offs: offs, strides: strides };
Ok(NABufferType::Video16(buf))
+ } else {
+ let mut data: Vec<u32> = Vec::with_capacity(new_size);
+ data.resize(new_size, 0);
+ let buf: NAVideoBuffer<u32> = NAVideoBuffer { data: NABufferRef::new(data), info: vinfo, offs: offs, strides: strides };
+ Ok(NABufferType::Video32(buf))
}
- } else {
+ } else if all_bytealigned || unfit_elem_size {
let elem_sz = fmt.get_elem_size();
let line_sz = width.checked_mul(elem_sz as usize);
if line_sz == None { return Err(AllocatorError::TooLargeDimensions); }
let mut data: Vec<u8> = Vec::with_capacity(new_size);
data.resize(new_size, 0);
strides.push(line_sz.unwrap());
- let buf: NAVideoBuffer<u8> = NAVideoBuffer { data: Rc::new(RefCell::new(data)), info: vinfo, offs: offs, strides: strides };
+ let buf: NAVideoBuffer<u8> = NAVideoBuffer { data: NABufferRef::new(data), info: vinfo, offs: offs, strides: strides };
Ok(NABufferType::VideoPacked(buf))
+ } else {
+ let elem_sz = fmt.get_elem_size();
+ let new_sz = width.checked_mul(height);
+ if new_sz == None { return Err(AllocatorError::TooLargeDimensions); }
+ new_size = new_sz.unwrap();
+ match elem_sz {
+ 2 => {
+ let mut data: Vec<u16> = Vec::with_capacity(new_size);
+ data.resize(new_size, 0);
+ strides.push(width);
+ let buf: NAVideoBuffer<u16> = NAVideoBuffer { data: NABufferRef::new(data), info: vinfo, offs: offs, strides: strides };
+ Ok(NABufferType::Video16(buf))
+ },
+ 4 => {
+ let mut data: Vec<u32> = Vec::with_capacity(new_size);
+ data.resize(new_size, 0);
+ strides.push(width);
+ let buf: NAVideoBuffer<u32> = NAVideoBuffer { data: NABufferRef::new(data), info: vinfo, offs: offs, strides: strides };
+ Ok(NABufferType::Video32(buf))
+ },
+ _ => unreachable!(),
+ }
}
}
if ainfo.format.get_bits() == 32 {
let mut data: Vec<f32> = Vec::with_capacity(length);
data.resize(length, 0.0);
- let buf: NAAudioBuffer<f32> = NAAudioBuffer { data: Rc::new(RefCell::new(data)), info: ainfo, offs: offs, chmap: chmap, len: nsamples };
+ let buf: NAAudioBuffer<f32> = NAAudioBuffer { data: NABufferRef::new(data), info: ainfo, offs: offs, chmap: chmap, len: nsamples };
Ok(NABufferType::AudioF32(buf))
} else {
Err(AllocatorError::TooLargeDimensions)
if ainfo.format.get_bits() == 8 && !ainfo.format.is_signed() {
let mut data: Vec<u8> = Vec::with_capacity(length);
data.resize(length, 0);
- let buf: NAAudioBuffer<u8> = NAAudioBuffer { data: Rc::new(RefCell::new(data)), info: ainfo, offs: offs, chmap: chmap, len: nsamples };
+ let buf: NAAudioBuffer<u8> = NAAudioBuffer { data: NABufferRef::new(data), info: ainfo, offs: offs, chmap: chmap, len: nsamples };
Ok(NABufferType::AudioU8(buf))
} else if ainfo.format.get_bits() == 16 && ainfo.format.is_signed() {
let mut data: Vec<i16> = Vec::with_capacity(length);
data.resize(length, 0);
- let buf: NAAudioBuffer<i16> = NAAudioBuffer { data: Rc::new(RefCell::new(data)), info: ainfo, offs: offs, chmap: chmap, len: nsamples };
+ let buf: NAAudioBuffer<i16> = NAAudioBuffer { data: NABufferRef::new(data), info: ainfo, offs: offs, chmap: chmap, len: nsamples };
Ok(NABufferType::AudioI16(buf))
} else {
Err(AllocatorError::TooLargeDimensions)
let length = ainfo.format.get_audio_size(len.unwrap() as u64);
let mut data: Vec<u8> = Vec::with_capacity(length);
data.resize(length, 0);
- let buf: NAAudioBuffer<u8> = NAAudioBuffer { data: Rc::new(RefCell::new(data)), info: ainfo, offs: offs, chmap: chmap, len: nsamples };
+ let buf: NAAudioBuffer<u8> = NAAudioBuffer { data: NABufferRef::new(data), info: ainfo, offs: offs, chmap: chmap, len: nsamples };
Ok(NABufferType::AudioPacked(buf))
}
}
pub fn alloc_data_buffer(size: usize) -> Result<NABufferType, AllocatorError> {
let mut data: Vec<u8> = Vec::with_capacity(size);
data.resize(size, 0);
- let buf: NABufferRefT<u8> = Rc::new(RefCell::new(data));
+ let buf: NABufferRef<Vec<u8>> = NABufferRef::new(data);
Ok(NABufferType::Data(buf))
}
buf.clone()
}
+pub struct NABufferPool {
+ pool: Vec<NABufferRef<NABufferType>>,
+ max_len: usize,
+}
+
+impl NABufferPool {
+ pub fn new(max_len: usize) -> Self {
+ Self {
+ pool: Vec::with_capacity(max_len),
+ max_len,
+ }
+ }
+ pub fn prealloc_video(&mut self, vinfo: NAVideoInfo, align: u8) -> Result<(), AllocatorError> {
+ let nbufs = self.max_len - self.pool.len();
+ for _ in 0..nbufs {
+ let buf = alloc_video_buffer(vinfo.clone(), align)?;
+ self.pool.push(NABufferRef::new(buf));
+ }
+ Ok(())
+ }
+ pub fn prealloc_audio(&mut self, ainfo: NAAudioInfo, nsamples: usize, chmap: NAChannelMap) -> Result<(), AllocatorError> {
+ let nbufs = self.max_len - self.pool.len();
+ for _ in 0..nbufs {
+ let buf = alloc_audio_buffer(ainfo.clone(), nsamples, chmap.clone())?;
+ self.pool.push(NABufferRef::new(buf));
+ }
+ Ok(())
+ }
+ pub fn add(&mut self, buf: NABufferType) -> bool {
+ if self.pool.len() < self.max_len {
+ self.pool.push(NABufferRef::new(buf));
+ true
+ } else {
+ false
+ }
+ }
+ pub fn get_free(&mut self) -> Option<NABufferRef<NABufferType>> {
+ for e in self.pool.iter() {
+ if e.get_num_refs() == 1 {
+ return Some(e.clone());
+ }
+ }
+ None
+ }
+}
+
#[allow(dead_code)]
#[derive(Clone)]
pub struct NACodecInfo {
name: &'static str,
properties: NACodecTypeInfo,
- extradata: Option<Rc<Vec<u8>>>,
+ extradata: Option<Arc<Vec<u8>>>,
}
+pub type NACodecInfoRef = Arc<NACodecInfo>;
+
impl NACodecInfo {
pub fn new(name: &'static str, p: NACodecTypeInfo, edata: Option<Vec<u8>>) -> Self {
let extradata = match edata {
None => None,
- Some(vec) => Some(Rc::new(vec)),
+ Some(vec) => Some(Arc::new(vec)),
};
NACodecInfo { name: name, properties: p, extradata: extradata }
}
- pub fn new_ref(name: &'static str, p: NACodecTypeInfo, edata: Option<Rc<Vec<u8>>>) -> Self {
+ pub fn new_ref(name: &'static str, p: NACodecTypeInfo, edata: Option<Arc<Vec<u8>>>) -> Self {
NACodecInfo { name: name, properties: p, extradata: edata }
}
+ pub fn into_ref(self) -> NACodecInfoRef { Arc::new(self) }
pub fn get_properties(&self) -> NACodecTypeInfo { self.properties }
- pub fn get_extradata(&self) -> Option<Rc<Vec<u8>>> {
+ pub fn get_extradata(&self) -> Option<Arc<Vec<u8>>> {
if let Some(ref vec) = self.extradata { return Some(vec.clone()); }
None
}
if let NACodecTypeInfo::Audio(_) = self.properties { return true; }
false
}
- pub fn new_dummy() -> Rc<Self> {
- Rc::new(DUMMY_CODEC_INFO)
+ pub fn new_dummy() -> Arc<Self> {
+ Arc::new(DUMMY_CODEC_INFO)
}
- pub fn replace_info(&self, p: NACodecTypeInfo) -> Rc<Self> {
- Rc::new(NACodecInfo { name: self.name, properties: p, extradata: self.extradata.clone() })
+ pub fn replace_info(&self, p: NACodecTypeInfo) -> Arc<Self> {
+ Arc::new(NACodecInfo { name: self.name, properties: p, extradata: self.extradata.clone() })
}
}
+impl Default for NACodecInfo {
+ fn default() -> Self { DUMMY_CODEC_INFO }
+}
+
impl fmt::Display for NACodecInfo {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let edata = match self.extradata.clone() {
Int(i32),
Long(i64),
String(String),
- Data(Rc<Vec<u8>>),
+ Data(Arc<Vec<u8>>),
}
#[derive(Debug,Clone,Copy,PartialEq)]
pub struct NAFrame {
ts: NATimeInfo,
buffer: NABufferType,
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
ftype: FrameType,
key: bool,
options: HashMap<String, NAValue>,
pub fn new(ts: NATimeInfo,
ftype: FrameType,
keyframe: bool,
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
options: HashMap<String, NAValue>,
buffer: NABufferType) -> Self {
NAFrame { ts: ts, buffer: buffer, info: info, ftype: ftype, key: keyframe, options: options }
}
- pub fn get_info(&self) -> Rc<NACodecInfo> { self.info.clone() }
+ pub fn get_info(&self) -> NACodecInfoRef { self.info.clone() }
pub fn get_frame_type(&self) -> FrameType { self.ftype }
pub fn is_keyframe(&self) -> bool { self.key }
pub fn set_frame_type(&mut self, ftype: FrameType) { self.ftype = ftype; }
media_type: StreamType,
id: u32,
num: usize,
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
tb_num: u32,
tb_den: u32,
}
impl NAStream {
pub fn new(mt: StreamType, id: u32, info: NACodecInfo, tb_num: u32, tb_den: u32) -> Self {
let (n, d) = reduce_timebase(tb_num, tb_den);
- NAStream { media_type: mt, id: id, num: 0, info: Rc::new(info), tb_num: n, tb_den: d }
+ NAStream { media_type: mt, id: id, num: 0, info: info.into_ref(), tb_num: n, tb_den: d }
}
pub fn get_id(&self) -> u32 { self.id }
pub fn get_num(&self) -> usize { self.num }
pub fn set_num(&mut self, num: usize) { self.num = num; }
- pub fn get_info(&self) -> Rc<NACodecInfo> { self.info.clone() }
+ pub fn get_info(&self) -> NACodecInfoRef { self.info.clone() }
pub fn get_timebase(&self) -> (u32, u32) { (self.tb_num, self.tb_den) }
pub fn set_timebase(&mut self, tb_num: u32, tb_den: u32) {
let (n, d) = reduce_timebase(tb_num, tb_den);
pub struct NAPacket {
stream: Rc<NAStream>,
ts: NATimeInfo,
- buffer: Rc<Vec<u8>>,
+ buffer: NABufferRef<Vec<u8>>,
keyframe: bool,
// options: HashMap<String, NAValue<'a>>,
}
pub fn new(str: Rc<NAStream>, ts: NATimeInfo, kf: bool, vec: Vec<u8>) -> Self {
// let mut vec: Vec<u8> = Vec::new();
// vec.resize(size, 0);
- NAPacket { stream: str, ts: ts, keyframe: kf, buffer: Rc::new(vec) }
+ NAPacket { stream: str, ts: ts, keyframe: kf, buffer: NABufferRef::new(vec) }
}
pub fn get_stream(&self) -> Rc<NAStream> { self.stream.clone() }
pub fn get_time_information(&self) -> NATimeInfo { self.ts }
pub fn get_dts(&self) -> Option<u64> { self.ts.get_dts() }
pub fn get_duration(&self) -> Option<u64> { self.ts.get_duration() }
pub fn is_keyframe(&self) -> bool { self.keyframe }
- pub fn get_buffer(&self) -> Rc<Vec<u8>> { self.buffer.clone() }
+ pub fn get_buffer(&self) -> NABufferRef<Vec<u8>> { self.buffer.clone() }
}
impl Drop for NAPacket {
}
pub trait FrameFromPacket {
- fn new_from_pkt(pkt: &NAPacket, info: Rc<NACodecInfo>, buf: NABufferType) -> NAFrame;
+ fn new_from_pkt(pkt: &NAPacket, info: NACodecInfoRef, buf: NABufferType) -> NAFrame;
fn fill_timestamps(&mut self, pkt: &NAPacket);
}
impl FrameFromPacket for NAFrame {
- fn new_from_pkt(pkt: &NAPacket, info: Rc<NACodecInfo>, buf: NABufferType) -> NAFrame {
+ fn new_from_pkt(pkt: &NAPacket, info: NACodecInfoRef, buf: NABufferType) -> NAFrame {
NAFrame::new(pkt.ts, FrameType::Other, pkt.keyframe, info, HashMap::new(), buf)
}
fn fill_timestamps(&mut self, pkt: &NAPacket) {
projects / nihav.git / blobdiff