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

prettify the chunker match blocks a bit

This commit is contained in:
Tangent Wantwight 2019-11-16 15:46:25 -05:00
parent d3b147f8ea
commit e6d8b58492
1 changed files with 64 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/chunk.rs
View File

@ -144,23 +144,25 @@ impl<I: Buf, S: Stream<Item = Result<I, WebmetroError>> + Unpin> Stream for Webm
Err(passthru) => return Ready(Some(Err(passthru))), Err(passthru) => return Ready(Some(Err(passthru))),
Ok(Async::NotReady) => return Pending, Ok(Async::NotReady) => return Pending,
Ok(Async::Ready(None)) => return Ready(None), Ok(Async::Ready(None)) => return Ready(None),
Ok(Async::Ready(Some(WebmElement::Cluster))) => { Ok(Async::Ready(Some(element))) => match element {
let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new())); WebmElement::Cluster => {
let header_chunk = Chunk::Headers {bytes: Bytes::from(liberated_buffer.into_inner())}; let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new()));
let header_chunk = Chunk::Headers {bytes: Bytes::from(liberated_buffer.into_inner())};
chunker.state = ChunkerState::BuildingCluster( chunker.state = ChunkerState::BuildingCluster(
ClusterHead::new(0), ClusterHead::new(0),
Cursor::new(Vec::new()) Cursor::new(Vec::new())
); );
return Ready(Some(Ok(header_chunk))); return Ready(Some(Ok(header_chunk)));
}, },
Ok(Async::Ready(Some(WebmElement::Info))) => {}, WebmElement::Info => {},
Ok(Async::Ready(Some(WebmElement::Void))) => {}, WebmElement::Void => {},
Ok(Async::Ready(Some(WebmElement::Unknown(_)))) => {}, WebmElement::Unknown(_) => {},
Ok(Async::Ready(Some(element))) => { element => {
if let Err(err) = encode(element, buffer, chunker.buffer_size_limit) { if let Err(err) = encode(element, buffer, chunker.buffer_size_limit) {
chunker.state = ChunkerState::End; chunker.state = ChunkerState::End;
return Ready(Some(Err(err))); return Ready(Some(Err(err)));
}
} }
} }
} }
@ -169,55 +171,56 @@ impl<I: Buf, S: Stream<Item = Result<I, WebmetroError>> + Unpin> Stream for Webm
match chunker.source.poll_event(cx) { match chunker.source.poll_event(cx) {
Err(passthru) => return Ready(Some(Err(passthru))), Err(passthru) => return Ready(Some(Err(passthru))),
Ok(Async::NotReady) => return Pending, Ok(Async::NotReady) => return Pending,
Ok(Async::Ready(Some(element @ WebmElement::EbmlHead))) Ok(Async::Ready(Some(element))) => match element {
| Ok(Async::Ready(Some(element @ WebmElement::Segment))) => { WebmElement::EbmlHead | WebmElement::Segment => {
let liberated_cluster_head = mem::replace(cluster_head, ClusterHead::new(0)); let liberated_cluster_head = mem::replace(cluster_head, ClusterHead::new(0));
let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new())); let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new()));
let mut new_header_cursor = Cursor::new(Vec::new()); let mut new_header_cursor = Cursor::new(Vec::new());
match encode(element, &mut new_header_cursor, chunker.buffer_size_limit) { match encode(element, &mut new_header_cursor, chunker.buffer_size_limit) {
Ok(_) => { Ok(_) => {
chunker.state = ChunkerState::EmittingClusterBodyBeforeNewHeader{ chunker.state = ChunkerState::EmittingClusterBodyBeforeNewHeader{
body: liberated_buffer.into_inner(), body: liberated_buffer.into_inner(),
new_header: new_header_cursor new_header: new_header_cursor
}; };
return Ready(Some(Ok(Chunk::ClusterHead(liberated_cluster_head)))); return Ready(Some(Ok(Chunk::ClusterHead(liberated_cluster_head))));
}, },
Err(err) => { Err(err) => {
chunker.state = ChunkerState::End;
return Ready(Some(Err(err)));
}
}
},
WebmElement::Cluster => {
let liberated_cluster_head = mem::replace(cluster_head, ClusterHead::new(0));
let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new()));
chunker.state = ChunkerState::EmittingClusterBody(liberated_buffer.into_inner());
return Ready(Some(Ok(Chunk::ClusterHead(liberated_cluster_head))));
},
WebmElement::Timecode(timecode) => {
cluster_head.update_timecode(timecode);
},
WebmElement::SimpleBlock(ref block) => {
if (block.flags & 0b10000000) != 0 {
// TODO: this is incorrect, condition needs to also affirm we're the first video block of the cluster
cluster_head.keyframe = true;
}
cluster_head.observe_simpleblock_timecode(block.timecode);
if let Err(err) = encode(WebmElement::SimpleBlock(*block), buffer, chunker.buffer_size_limit) {
chunker.state = ChunkerState::End; chunker.state = ChunkerState::End;
return Ready(Some(Err(err))); return Ready(Some(Err(err)));
} }
} },
} WebmElement::Info => {},
Ok(Async::Ready(Some(WebmElement::Cluster))) => { WebmElement::Void => {},
let liberated_cluster_head = mem::replace(cluster_head, ClusterHead::new(0)); WebmElement::Unknown(_) => {},
let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new())); element => {
if let Err(err) = encode(element, buffer, chunker.buffer_size_limit) {
chunker.state = ChunkerState::EmittingClusterBody(liberated_buffer.into_inner()); chunker.state = ChunkerState::End;
return Ready(Some(Ok(Chunk::ClusterHead(liberated_cluster_head)))); return Ready(Some(Err(err)));
}, }
Ok(Async::Ready(Some(WebmElement::Timecode(timecode)))) => { },
cluster_head.update_timecode(timecode);
},
Ok(Async::Ready(Some(WebmElement::SimpleBlock(ref block)))) => {
if (block.flags & 0b10000000) != 0 {
// TODO: this is incorrect, condition needs to also affirm we're the first video block of the cluster
cluster_head.keyframe = true;
}
cluster_head.observe_simpleblock_timecode(block.timecode);
if let Err(err) = encode(WebmElement::SimpleBlock(*block), buffer, chunker.buffer_size_limit) {
chunker.state = ChunkerState::End;
return Ready(Some(Err(err)));
}
},
Ok(Async::Ready(Some(WebmElement::Info))) => {},
Ok(Async::Ready(Some(WebmElement::Void))) => {},
Ok(Async::Ready(Some(WebmElement::Unknown(_)))) => {},
Ok(Async::Ready(Some(element))) => {
if let Err(err) = encode(element, buffer, chunker.buffer_size_limit) {
chunker.state = ChunkerState::End;
return Ready(Some(Err(err)));
}
}, },
Ok(Async::Ready(None)) => { Ok(Async::Ready(None)) => {
// flush final Cluster on end of stream // flush final Cluster on end of stream