tangent128/webmetro
1
0
Fork 0
Code Issues 1 Pull requests Releases Packages Wiki Activity

Fix dumping the whole cluster head buffer instead of the used portion

Browse source
This commit is contained in:
Tangent 128 2017-09-29 00:07:56 -04:00
parent 7f214920ae
commit 031d32352a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/chunk.rs
View file

@ -12,7 +12,8 @@ pub enum Chunk<B: AsRef<[u8]> = Vec<u8>> {
start: u64, start: u64,
end: u64, end: u64,
// space for a Cluster tag and a Timecode tag // space for a Cluster tag and a Timecode tag
bytes: [u8;16] bytes: [u8;16],
bytes_used: u8
}, },
ClusterBody { ClusterBody {
bytes: Arc<B> bytes: Arc<B>
@ -21,7 +22,7 @@ pub enum Chunk<B: AsRef<[u8]> = Vec<u8>> {
impl<B: AsRef<[u8]>> Chunk<B> { impl<B: AsRef<[u8]>> Chunk<B> {
pub fn update_timecode(&mut self, timecode: u64) { pub fn update_timecode(&mut self, timecode: u64) {
if let &mut Chunk::ClusterHead {ref mut start, ref mut end, ref mut bytes, ..} = self { if let &mut Chunk::ClusterHead {ref mut start, ref mut end, ref mut bytes, ref mut bytes_used, ..} = self {
let delta = *end - *start; let delta = *end - *start;
*start = timecode; *start = timecode;
*end = *start + delta; *end = *start + delta;
@ -29,6 +30,7 @@ impl<B: AsRef<[u8]>> Chunk<B> {
// buffer is sized so these should never fail // buffer is sized so these should never fail
encode_webm_element(&WebmElement::Cluster, &mut cursor).unwrap(); encode_webm_element(&WebmElement::Cluster, &mut cursor).unwrap();
encode_webm_element(&WebmElement::Timecode(timecode), &mut cursor).unwrap(); encode_webm_element(&WebmElement::Timecode(timecode), &mut cursor).unwrap();
*bytes_used = cursor.position() as u8;
} }
} }
} }
@ -37,7 +39,7 @@ impl<B: AsRef<[u8]>> AsRef<[u8]> for Chunk<B> {
fn as_ref(&self) -> &[u8] { fn as_ref(&self) -> &[u8] {
match self { match self {
&Chunk::Headers {ref bytes, ..} => bytes.as_ref().as_ref(), &Chunk::Headers {ref bytes, ..} => bytes.as_ref().as_ref(),
&Chunk::ClusterHead {ref bytes, ..} => bytes, &Chunk::ClusterHead {ref bytes, bytes_used, ..} => bytes[..bytes_used as usize].as_ref(),
&Chunk::ClusterBody {ref bytes, ..} => bytes.as_ref().as_ref() &Chunk::ClusterBody {ref bytes, ..} => bytes.as_ref().as_ref()
} }
} }