wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1215696 - Update mp4parse-rust to v0.1.1. r=kinetik

Browse Source 
Change is just to loop over the input buffer in read_box_from_buffer()
so we parse the entire contents instead of just the first box.

'extern crate byteorder' converted to 'mod byteorder'.
This commit is contained in:
Ralph Giles 2015-10-16 14:04:46 -07:00
parent 8cb0d929ec
commit e8609957d7
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
media/libstagefright/binding/MP4Metadata.rs
View File

@ -266,8 +266,7 @@ fn recurse<T: Read>(f: &mut T, h: &BoxHeader, context: &mut MediaContext) -> byt
}
/// Read the contents of a box, including sub boxes.
/// Right now it just prints the box value rather than
/// returning anything.
/// Metadata is accumulated in the passed-through MediaContext struct.
pub fn read_box<T: BufRead>(f: &mut T, context: &mut MediaContext) -> byteorder::Result<()> {
read_box_header(f).and_then(|h| {
let mut content = limit(f, &h);
@ -329,11 +328,12 @@ pub fn read_box<T: BufRead>(f: &mut T, context: &mut MediaContext) -> byteorder:
"soun" => Some(TrackType::Audio),
_ => None
};
// Ignore unrecognized track types.
track_type.map(|track_type|
context.tracks.push(Track { track_type: track_type }))
.or_else(|| { println!("unknown track type!"); None } );
println!(" {}", hdlr);
// Save track types with recognized types.
match track_type {
Some(track_type) =>
context.tracks.push(Track { track_type: track_type }),
None => println!("unknown track type!"),
};
},
"stsd" => {
let track = &context.tracks[context.tracks.len() - 1];
@ -343,11 +343,11 @@ pub fn read_box<T: BufRead>(f: &mut T, context: &mut MediaContext) -> byteorder:
_ => {
// Skip the contents of unknown chunks.
println!("{} (skipped)", h);
try!(skip_box_content(&mut content, &h).and(Ok(())));
try!(skip_box_content(&mut content, &h));
},
};
assert!(content.limit() == 0);
println!("Parse result: {}", context);
println!("read_box context: {}", context);
Ok(()) // and_then needs a Result to return.
})
}
@ -373,14 +373,13 @@ pub extern fn read_box_from_buffer(buffer: *const u8, size: usize) -> i32 {
// Parse in a subthread.
let task = thread::spawn(move || {
let mut context = MediaContext { tracks: Vec::new() };
read_box(&mut c, &mut context)
.or_else(|e| { match e {
// TODO: Catch EOF earlier so we can get the return value.
// Catch EOF. We naturally hit it at end-of-input.
byteorder::Error::UnexpectedEOF => { Ok(()) },
e => { Err(e) },
}})
.unwrap();
loop {
match read_box(&mut c, &mut context) {
Ok(_) => {},
Err(byteorder::Error::UnexpectedEOF) => { break },
Err(e) => { panic!(e) },
}
}
// Make sure the track count fits in an i32 so we can use
// negative values for failure.
assert!(context.tracks.len() < i32::MAX as usize);