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

Don't require encode_ functions to consume their argument element.

Browse source
This commit is contained in:
Tangent 128 2017-09-05 00:24:38 -04:00
parent 271782bb91
commit 84c7ec734b
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bin/resynth.rs
View file

@ -34,11 +34,11 @@ pub fn main() {
let mut output = Vec::new(); let mut output = Vec::new();
let mut cursor = Cursor::new(output); let mut cursor = Cursor::new(output);
for element in head { for element in &head {
encode_webm_element(element, &mut cursor).unwrap(); encode_webm_element(element, &mut cursor).unwrap();
} }
for element in body { for element in &body {
encode_webm_element(element, &mut cursor).unwrap(); encode_webm_element(element, &mut cursor).unwrap();
} }

22
src/webm.rs
View file

@ -83,8 +83,8 @@ fn decode_simple_block(bytes: &[u8]) -> Result<WebmElement, Error> {
} }
} }
pub fn encode_simple_block<T: Write>(block: SimpleBlock, output: &mut T) -> IoResult<()> { pub fn encode_simple_block<T: Write>(block: &SimpleBlock, output: &mut T) -> IoResult<()> {
let SimpleBlock { let &SimpleBlock {
track, track,
timecode, timecode,
flags, flags,
@ -108,18 +108,18 @@ pub fn encode_simple_block<T: Write>(block: SimpleBlock, output: &mut T) -> IoRe
output.write_all(data) output.write_all(data)
} }
pub fn encode_webm_element<T: Write + Seek>(element: WebmElement, output: &mut T) -> IoResult<()> { pub fn encode_webm_element<T: Write + Seek>(element: &WebmElement, output: &mut T) -> IoResult<()> {
match element { match element {
WebmElement::EbmlHead => encode_element(EBML_HEAD_ID, output, |output| { &WebmElement::EbmlHead => encode_element(EBML_HEAD_ID, output, |output| {
encode_bytes(DOC_TYPE_ID, "webm".as_bytes(), output) encode_bytes(DOC_TYPE_ID, "webm".as_bytes(), output)
}), }),
WebmElement::Segment => encode_tag_header(SEGMENT_ID, Varint::Unknown, output), &WebmElement::Segment => encode_tag_header(SEGMENT_ID, Varint::Unknown, output),
WebmElement::SeekHead => Ok(()), &WebmElement::SeekHead => Ok(()),
WebmElement::Cues => Ok(()), &WebmElement::Cues => Ok(()),
WebmElement::Tracks(data) => encode_bytes(TRACKS_ID, data, output), &WebmElement::Tracks(data) => encode_bytes(TRACKS_ID, data, output),
WebmElement::Cluster => encode_tag_header(CLUSTER_ID, Varint::Unknown, output), &WebmElement::Cluster => encode_tag_header(CLUSTER_ID, Varint::Unknown, output),
WebmElement::Timecode(time) => encode_integer(TIMECODE_ID, time, output), &WebmElement::Timecode(time) => encode_integer(TIMECODE_ID, time, output),
WebmElement::SimpleBlock(block) => encode_simple_block(block, output), &WebmElement::SimpleBlock(ref block) => encode_simple_block(block, output),
_ => Err(IoError::new(ErrorKind::InvalidInput, WriteError::OutOfRange)) _ => Err(IoError::new(ErrorKind::InvalidInput, WriteError::OutOfRange))
} }
} }