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 1229615 - Catch panics in mp4parse_get_track_info. r=kinetik

Browse Source 
Wrap calls in a thread the way we do for read_mp4().

Patch from upstream.
This commit is contained in:
Ralph Giles 2015-12-02 17:09:02 -08:00
parent 005d79b39a
commit a3c2025049
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1046,11 +1046,13 @@ fn skip<T: BufRead>(src: &mut T, bytes: usize) -> Result<usize> {
}
fn media_time_to_ms(time: MediaScaledTime, scale: MediaTimeScale) -> u64 {
assert!(scale.0 != 0);
time.0 * 1000000 / scale.0
}
fn track_time_to_ms(time: TrackScaledTime, scale: TrackTimeScale) -> u64 {
assert!(time.1 == scale.1);
assert!(scale.0 != 0);
time.0 * 1000000 / scale.0
}

42
media/libstagefright/binding/capi.rs
View File

@ -117,14 +117,14 @@ pub unsafe extern "C" fn mp4parse_get_track_info(context: *mut MediaContext, tra
}
let context: &mut MediaContext = &mut *context;
let track_index: usize = track as usize;
let info: &mut TrackInfo = &mut *info;
if track as usize >= context.tracks.len() {
if track_index >= context.tracks.len() {
return -1;
}
let track = &context.tracks[track as usize];
(*info).track_type = match track.track_type {
info.track_type = match context.tracks[track_index].track_type {
TrackType::Video => TRACK_TYPE_H264,
TrackType::Audio => TRACK_TYPE_AAC,
TrackType::Unknown => return -1,
@ -132,26 +132,28 @@ pub unsafe extern "C" fn mp4parse_get_track_info(context: *mut MediaContext, tra
// Maybe context & track should just have a single simple is_valid() instead?
if context.timescale.is_none() ||
track.timescale.is_none() ||
track.duration.is_none() ||
track.track_id.is_none() {
context.tracks[track_index].timescale.is_none() ||
context.tracks[track_index].duration.is_none() ||
context.tracks[track_index].track_id.is_none() {
return -1;
}
let empty_duration = if track.empty_duration.is_some() {
media_time_to_ms(track.empty_duration.unwrap(), context.timescale.unwrap())
} else {
std::thread::spawn(move || {
let track = &context.tracks[track_index];
let empty_duration = if track.empty_duration.is_some() {
media_time_to_ms(track.empty_duration.unwrap(), context.timescale.unwrap())
} else {
0
};
info.media_time = if track.media_time.is_some() {
track_time_to_ms(track.media_time.unwrap(), track.timescale.unwrap()) as i64 - empty_duration as i64
} else {
0
};
info.duration = track_time_to_ms(track.duration.unwrap(), track.timescale.unwrap());
info.track_id = track.track_id.unwrap();
0
};
(*info).media_time = if track.media_time.is_some() {
track_time_to_ms(track.media_time.unwrap(), track.timescale.unwrap()) as i64 - empty_duration as i64
} else {
0
};
(*info).duration = track_time_to_ms(track.duration.unwrap(), track.timescale.unwrap());
(*info).track_id = track.track_id.unwrap();
0
}).join().unwrap_or(-1)
}
#[no_mangle]