Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1267887 - Experiment with exporting track mime-type. r=kinetik

Browse Source 
MozReview-Commit-ID: 9CynVkwtUn2
This commit is contained in:
Ralph Giles 2016-04-04 11:28:05 -07:00
parent b1a7d53d2f
commit c1c627c22a
2 changed files with 22 additions and 0 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,6 +22,12 @@ 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;

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

@ -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
@ -173,6 +181,14 @@ 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() ||