projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch NABufferType to use refs for video buffers
[nihav.git]
/
nihav-core
/
src
/
codecs
/
mod.rs
diff --git
a/nihav-core/src/codecs/mod.rs
b/nihav-core/src/codecs/mod.rs
index 692269ea7572dd1c03a535ff3a441982a486ab60..4f81d9eb8a2ffe61c6a8f2b09e65d6cf3b2a359f 100644
(file)
--- a/
nihav-core/src/codecs/mod.rs
+++ b/
nihav-core/src/codecs/mod.rs
@@
-45,7
+45,7
@@
impl From<AllocatorError> for DecoderError {
#[allow(dead_code)]
pub struct HAMShuffler {
#[allow(dead_code)]
pub struct HAMShuffler {
- lastframe: Option<NAVideoBuffer<u8>>,
+ lastframe: Option<NAVideoBuffer
Ref
<u8>>,
}
impl HAMShuffler {
}
impl HAMShuffler {
@@
-54,21
+54,21
@@
impl HAMShuffler {
#[allow(dead_code)]
pub fn clear(&mut self) { self.lastframe = None; }
#[allow(dead_code)]
#[allow(dead_code)]
pub fn clear(&mut self) { self.lastframe = None; }
#[allow(dead_code)]
- pub fn add_frame(&mut self, buf: NAVideoBuffer<u8>) {
+ pub fn add_frame(&mut self, buf: NAVideoBuffer
Ref
<u8>) {
self.lastframe = Some(buf);
}
#[allow(dead_code)]
self.lastframe = Some(buf);
}
#[allow(dead_code)]
- pub fn clone_ref(&mut self) -> Option<NAVideoBuffer<u8>> {
+ pub fn clone_ref(&mut self) -> Option<NAVideoBuffer
Ref
<u8>> {
if let Some(ref mut frm) = self.lastframe {
let newfrm = frm.copy_buffer();
if let Some(ref mut frm) = self.lastframe {
let newfrm = frm.copy_buffer();
- *frm = newfrm.clone();
- Some(newfrm)
+ *frm = newfrm.clone()
.into_ref()
;
+ Some(newfrm
.into_ref()
)
} else {
None
}
}
#[allow(dead_code)]
} else {
None
}
}
#[allow(dead_code)]
- pub fn get_output_frame(&mut self) -> Option<NAVideoBuffer<u8>> {
+ pub fn get_output_frame(&mut self) -> Option<NAVideoBuffer
Ref
<u8>> {
match self.lastframe {
Some(ref frm) => Some(frm.clone()),
None => None,
match self.lastframe {
Some(ref frm) => Some(frm.clone()),
None => None,
@@
-82,7
+82,7
@@
impl Default for HAMShuffler {
#[allow(dead_code)]
pub struct IPShuffler {
#[allow(dead_code)]
pub struct IPShuffler {
- lastframe: Option<NAVideoBuffer<u8>>,
+ lastframe: Option<NAVideoBuffer
Ref
<u8>>,
}
impl IPShuffler {
}
impl IPShuffler {
@@
-91,11
+91,11
@@
impl IPShuffler {
#[allow(dead_code)]
pub fn clear(&mut self) { self.lastframe = None; }
#[allow(dead_code)]
#[allow(dead_code)]
pub fn clear(&mut self) { self.lastframe = None; }
#[allow(dead_code)]
- pub fn add_frame(&mut self, buf: NAVideoBuffer<u8>) {
+ pub fn add_frame(&mut self, buf: NAVideoBuffer
Ref
<u8>) {
self.lastframe = Some(buf);
}
#[allow(dead_code)]
self.lastframe = Some(buf);
}
#[allow(dead_code)]
- pub fn get_ref(&mut self) -> Option<NAVideoBuffer<u8>> {
+ pub fn get_ref(&mut self) -> Option<NAVideoBuffer
Ref
<u8>> {
if let Some(ref frm) = self.lastframe {
Some(frm.clone())
} else {
if let Some(ref frm) = self.lastframe {
Some(frm.clone())
} else {
@@
-110,8
+110,8
@@
impl Default for IPShuffler {
#[allow(dead_code)]
pub struct IPBShuffler {
#[allow(dead_code)]
pub struct IPBShuffler {
- lastframe: Option<NAVideoBuffer<u8>>,
- nextframe: Option<NAVideoBuffer<u8>>,
+ lastframe: Option<NAVideoBuffer
Ref
<u8>>,
+ nextframe: Option<NAVideoBuffer
Ref
<u8>>,
}
impl IPBShuffler {
}
impl IPBShuffler {
@@
-120,12
+120,12
@@
impl IPBShuffler {
#[allow(dead_code)]
pub fn clear(&mut self) { self.lastframe = None; self.nextframe = None; }
#[allow(dead_code)]
#[allow(dead_code)]
pub fn clear(&mut self) { self.lastframe = None; self.nextframe = None; }
#[allow(dead_code)]
- pub fn add_frame(&mut self, buf: NAVideoBuffer<u8>) {
+ pub fn add_frame(&mut self, buf: NAVideoBuffer
Ref
<u8>) {
mem::swap(&mut self.lastframe, &mut self.nextframe);
self.lastframe = Some(buf);
}
#[allow(dead_code)]
mem::swap(&mut self.lastframe, &mut self.nextframe);
self.lastframe = Some(buf);
}
#[allow(dead_code)]
- pub fn get_lastref(&mut self) -> Option<NAVideoBuffer<u8>> {
+ pub fn get_lastref(&mut self) -> Option<NAVideoBuffer
Ref
<u8>> {
if let Some(ref frm) = self.lastframe {
Some(frm.clone())
} else {
if let Some(ref frm) = self.lastframe {
Some(frm.clone())
} else {
@@
-133,7
+133,7
@@
impl IPBShuffler {
}
}
#[allow(dead_code)]
}
}
#[allow(dead_code)]
- pub fn get_nextref(&mut self) -> Option<NAVideoBuffer<u8>> {
+ pub fn get_nextref(&mut self) -> Option<NAVideoBuffer
Ref
<u8>> {
if let Some(ref frm) = self.nextframe {
Some(frm.clone())
} else {
if let Some(ref frm) = self.nextframe {
Some(frm.clone())
} else {
@@
-141,7
+141,7
@@
impl IPBShuffler {
}
}
#[allow(dead_code)]
}
}
#[allow(dead_code)]
- pub fn get_b_fwdref(&mut self) -> Option<NAVideoBuffer<u8>> {
+ pub fn get_b_fwdref(&mut self) -> Option<NAVideoBuffer
Ref
<u8>> {
if let Some(ref frm) = self.nextframe {
Some(frm.clone())
} else {
if let Some(ref frm) = self.nextframe {
Some(frm.clone())
} else {
@@
-149,7
+149,7
@@
impl IPBShuffler {
}
}
#[allow(dead_code)]
}
}
#[allow(dead_code)]
- pub fn get_b_bwdref(&mut self) -> Option<NAVideoBuffer<u8>> {
+ pub fn get_b_bwdref(&mut self) -> Option<NAVideoBuffer
Ref
<u8>> {
if let Some(ref frm) = self.lastframe {
Some(frm.clone())
} else {
if let Some(ref frm) = self.lastframe {
Some(frm.clone())
} else {