Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 15:51:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 9cc4ece5f9d5 (bug 1374774)

Browse Source
This commit is contained in:
Sebastian Hengst 2017-06-24 00:47:42 +02:00
parent 80ef003d65
commit 2650b6b3ca
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
media/libstagefright/binding/H264.cpp
View File

@ -721,11 +721,11 @@ H264::vui_parameters(BitReader& aBr, SPSData& aDest)
READUE(chroma_sample_loc_type_bottom_field, 5);
}
bool timing_info_present_flag = aBr.ReadBit();
if (timing_info_present_flag) {
aBr.ReadBits(32); // num_units_in_tick
aBr.ReadBits(32); // time_scale
aBr.ReadBit(); // fixed_frame_rate_flag
aDest.timing_info_present_flag = aBr.ReadBit();
if (aDest.timing_info_present_flag) {
aDest.num_units_in_tick = aBr.ReadBits(32);
aDest.time_scale = aBr.ReadBits(32);
aDest.fixed_frame_rate_flag = aBr.ReadBit();
}
return true;
}

4
media/libstagefright/binding/include/mp4_demuxer/H264.h
View File

@ -396,6 +396,10 @@ struct SPSData
*/
uint8_t chroma_sample_loc_type_top_field;
uint8_t chroma_sample_loc_type_bottom_field;
bool timing_info_present_flag;
uint32_t num_units_in_tick;
uint32_t time_scale;
bool fixed_frame_rate_flag;
bool scaling_matrix_present;
uint8_t scaling_matrix4x4[6][16];