diff --git a/src/chunk.rs b/src/chunk.rs
index 566277b..fa703c2 100644
--- a/src/chunk.rs
+++ b/src/chunk.rs
@@ -100,7 +100,10 @@ impl<'a, S: EbmlEventSource> Stream for WebmChunker<S>
fn poll(&mut self) -> Result<Async<Option<Self::Item>>, Self::Error> {
loop {
- let (return_value, next_state) = match self.state {
+ let mut return_value = None;
+ let mut new_state = None;
+
+ match self.state {
ChunkerState::BuildingHeader(ref mut buffer) => {
match self.source.poll_event() {
Err(passthru) => return Err(ChunkingError::OtherError(passthru)),
@@ -109,23 +112,22 @@ impl<'a, S: EbmlEventSource> Stream for WebmChunker<S>
Ok(Async::Ready(Some(WebmElement::Cluster))) => {
let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new()));
let header_chunk = Chunk::Headers {bytes: Arc::new(liberated_buffer.into_inner())};
- (
- Ok(Async::Ready(Some(header_chunk))),
- ChunkerState::BuildingCluster(
- ClusterHead::new(0),
- Cursor::new(Vec::new())
- )
- )
+
+ return_value = Some(Ok(Async::Ready(Some(header_chunk))));
+ new_state = Some(ChunkerState::BuildingCluster(
+ ClusterHead::new(0),
+ Cursor::new(Vec::new())
+ ));
},
- Ok(Async::Ready(Some(WebmElement::Info))) => continue,
- Ok(Async::Ready(Some(WebmElement::Void))) => continue,
- Ok(Async::Ready(Some(element @ _))) => {
+ Ok(Async::Ready(Some(WebmElement::Info))) => {},
+ Ok(Async::Ready(Some(WebmElement::Void))) => {},
+ Ok(Async::Ready(Some(element))) => {
match encode_webm_element(element, buffer) {
- Ok(_) => continue,
- Err(err) => (
- Err(ChunkingError::IoError(err)),
- ChunkerState::End
- )
+ Ok(_) => {},
+ Err(err) => {
+ return_value = Some(Err(ChunkingError::IoError(err)));
+ new_state = Some(ChunkerState::End);
+ }
}
}
}
@@ -137,14 +139,12 @@ impl<'a, S: EbmlEventSource> Stream for WebmChunker<S>
Ok(Async::Ready(Some(WebmElement::Cluster))) => {
let liberated_cluster_head = mem::replace(cluster_head, ClusterHead::new(0));
let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new()));
- (
- Ok(Async::Ready(Some(Chunk::ClusterHead(liberated_cluster_head)))),
- ChunkerState::EmittingClusterBody(liberated_buffer.into_inner())
- )
+
+ return_value = Some(Ok(Async::Ready(Some(Chunk::ClusterHead(liberated_cluster_head)))));
+ new_state = Some(ChunkerState::EmittingClusterBody(liberated_buffer.into_inner()));
},
Ok(Async::Ready(Some(WebmElement::Timecode(timecode)))) => {
cluster_head.update_timecode(timecode);
- continue;
},
Ok(Async::Ready(Some(WebmElement::SimpleBlock(ref block)))) => {
if (block.flags & 0b10000000) != 0 {
@@ -153,59 +153,60 @@ impl<'a, S: EbmlEventSource> Stream for WebmChunker<S>
}
cluster_head.observe_simpleblock_timecode(block.timecode);
match encode_webm_element(WebmElement::SimpleBlock(*block), buffer) {
- Ok(_) => continue,
- Err(err) => (
- Err(ChunkingError::IoError(err)),
- ChunkerState::End
- )
+ Ok(_) => {},
+ Err(err) => {
+ return_value = Some(Err(ChunkingError::IoError(err)));
+ new_state = Some(ChunkerState::End);
+ }
}
},
- Ok(Async::Ready(Some(WebmElement::Info))) => continue,
- Ok(Async::Ready(Some(WebmElement::Void))) => continue,
- Ok(Async::Ready(Some(WebmElement::Unknown(_)))) => continue,
- Ok(Async::Ready(Some(element @ _))) => {
+ Ok(Async::Ready(Some(WebmElement::Info))) => {},
+ Ok(Async::Ready(Some(WebmElement::Void))) => {},
+ Ok(Async::Ready(Some(WebmElement::Unknown(_)))) => {},
+ Ok(Async::Ready(Some(element))) => {
match encode_webm_element(element, buffer) {
- Ok(_) => continue,
- Err(err) => (
- Err(ChunkingError::IoError(err)),
- ChunkerState::End
- )
+ Ok(_) => {},
+ Err(err) => {
+ return_value = Some(Err(ChunkingError::IoError(err)));
+ new_state = Some(ChunkerState::End);
+ }
}
},
Ok(Async::Ready(None)) => {
// flush final Cluster on end of stream
let liberated_cluster_head = mem::replace(cluster_head, ClusterHead::new(0));
let liberated_buffer = mem::replace(buffer, Cursor::new(Vec::new()));
- (
- Ok(Async::Ready(Some(Chunk::ClusterHead(liberated_cluster_head)))),
- ChunkerState::EmittingFinalClusterBody(liberated_buffer.into_inner())
- )
+
+ return_value = Some(Ok(Async::Ready(Some(Chunk::ClusterHead(liberated_cluster_head)))));
+ new_state = Some(ChunkerState::EmittingFinalClusterBody(liberated_buffer.into_inner()));
}
}
},
ChunkerState::EmittingClusterBody(ref mut buffer) => {
let liberated_buffer = mem::replace(buffer, Vec::new());
- (
- Ok(Async::Ready(Some(Chunk::ClusterBody {bytes: Arc::new(liberated_buffer)}))),
- ChunkerState::BuildingCluster(
- ClusterHead::new(0),
- Cursor::new(Vec::new())
- )
- )
+
+ return_value = Some(Ok(Async::Ready(Some(Chunk::ClusterBody {bytes: Arc::new(liberated_buffer)}))));
+ new_state = Some(ChunkerState::BuildingCluster(
+ ClusterHead::new(0),
+ Cursor::new(Vec::new())
+ ));
},
ChunkerState::EmittingFinalClusterBody(ref mut buffer) => {
// flush final Cluster on end of stream
let liberated_buffer = mem::replace(buffer, Vec::new());
- (
- Ok(Async::Ready(Some(Chunk::ClusterBody {bytes: Arc::new(liberated_buffer)}))),
- ChunkerState::End
- )
+
+ return_value = Some(Ok(Async::Ready(Some(Chunk::ClusterBody {bytes: Arc::new(liberated_buffer)}))));
+ new_state = Some(ChunkerState::End);
},
ChunkerState::End => return Ok(Async::Ready(None))
};
- self.state = next_state;
- return return_value;
+ if let Some(new_state) = new_state {
+ self.state = new_state;
+ }
+ if let Some(return_value) = return_value {
+ return return_value;
+ }
}
}
}