Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 22:35:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset aa1d245e0af3 (bug 1275812) for mass win32 debug crashes.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2016-05-26 13:53:26 -04:00
parent 6d59286af6
commit ac870fd3ee
4 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/libstagefright/binding/include/mp4parse.h
View File

@ -22,12 +22,6 @@ struct mp4parse_state;
#define MP4PARSE_TRACK_TYPE_H264 0 // "video/avc"
#define MP4PARSE_TRACK_TYPE_AAC 1 // "audio/mp4a-latm"
#define MP4PARSE_TRACK_CODEC_UNKNOWN 0
#define MP4PARSE_TRACK_CODEC_AAC 1
#define MP4PARSE_TRACK_CODEC_OPUS 2
#define MP4PARSE_TRACK_CODEC_H264 3
#define MP4PARSE_TRACK_CODEC_VP9 4
struct mp4parse_track_audio_info {
uint16_t channels;
uint16_t bit_depth;

42
media/libstagefright/binding/mp4parse-codecs.patch
View File

@ -1,42 +0,0 @@
diff --git a/media/libstagefright/binding/mp4parse/capi.rs b/media/libstagefright/binding/mp4parse/capi.rs
index ed7e566..2441d2a 100644
--- a/media/libstagefright/binding/mp4parse/capi.rs
+++ b/media/libstagefright/binding/mp4parse/capi.rs
@@ -49,12 +49,20 @@ const MP4PARSE_ERROR_IO: i32 = 6;
const TRACK_TYPE_H264: u32 = 0;
const TRACK_TYPE_AAC: u32 = 1;
+/// Map Track mime_type to uint32 constants.
+const TRACK_CODEC_UNKNOWN: u32 = 0;
+const TRACK_CODEC_AAC: u32 = 1;
+const TRACK_CODEC_OPUS: u32 = 2;
+const TRACK_CODEC_H264: u32 = 3;
+const TRACK_CODEC_VP9: u32 = 4;
+
// These structs *must* match those declared in include/mp4parse.h.
#[repr(C)]
pub struct TrackInfo {
track_type: u32,
track_id: u32,
+ codec: u32,
duration: u64,
media_time: i64, // wants to be u64? understand how elst adjustment works
// TODO(kinetik): include crypto guff
@@ -166,6 +174,16 @@ pub unsafe extern "C" fn mp4parse_get_track_info(context: *mut MediaContext, tra
TrackType::Unknown => return MP4PARSE_ERROR_UNSUPPORTED,
};
+ info.codec = match &*context.tracks[track_index].mime_type {
+ "audio/opus" => TRACK_CODEC_OPUS,
+ "audio/aac" |
+ "audio/mp4a-latm" => TRACK_CODEC_AAC,
+ "video/vp9" => TRACK_CODEC_VP9,
+ "video/h264" |
+ "video/avc" => TRACK_CODEC_H264,
+ _ => TRACK_CODEC_UNKNOWN,
+ };
+
// Maybe context & track should just have a single simple is_valid() instead?
if context.timescale.is_none() ||
context.tracks[track_index].timescale.is_none() ||

16
media/libstagefright/binding/mp4parse/capi.rs
View File

@ -49,20 +49,12 @@ const MP4PARSE_ERROR_IO: i32 = 6;
const TRACK_TYPE_H264: u32 = 0;
const TRACK_TYPE_AAC: u32 = 1;
/// Map Track mime_type to uint32 constants.
const TRACK_CODEC_UNKNOWN: u32 = 0;
const TRACK_CODEC_AAC: u32 = 1;
const TRACK_CODEC_OPUS: u32 = 2;
const TRACK_CODEC_H264: u32 = 3;
const TRACK_CODEC_VP9: u32 = 4;
// These structs *must* match those declared in include/mp4parse.h.
#[repr(C)]
pub struct TrackInfo {
track_type: u32,
track_id: u32,
codec: u32,
duration: u64,
media_time: i64, // wants to be u64? understand how elst adjustment works
// TODO(kinetik): include crypto guff
@ -181,14 +173,6 @@ pub unsafe extern "C" fn mp4parse_get_track_info(context: *mut MediaContext, tra
TrackType::Unknown => return MP4PARSE_ERROR_UNSUPPORTED,
};
info.codec = match &*context.tracks[track_index].mime_type {
"audio/opus" => TRACK_CODEC_OPUS,
"video/vp9" => TRACK_CODEC_VP9,
"video/h264" => TRACK_CODEC_H264,
"audio/aac" => TRACK_CODEC_AAC,
_ => TRACK_CODEC_UNKNOWN,
};
// Maybe context & track should just have a single simple is_valid() instead?
if context.timescale.is_none() ||
context.tracks[track_index].timescale.is_none() ||

1
media/libstagefright/binding/update-rust.sh
View File

@ -35,7 +35,6 @@ echo "Applying patches..."
patch -p4 < byteorder-mod.patch
patch -p4 < mp4parse-mod.patch
patch -p4 < mp4parse-thread.patch
patch -p4 < mp4parse-codecs.patch
echo "Cleaning up..."
rm -rf _upstream