wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-31 11:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2022-05-27 07:02:13 +08:00
commit 52f164545b
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
media/libstagefright/frameworks/av/media/libstagefright/SampleTable.cpp
View file

@ -385,6 +385,7 @@ status_t SampleTable::setTimeToSampleParams(
// contains signed values, however some software creates version 0 files that // contains signed values, however some software creates version 0 files that
// contain signed values, so we're always treating the values as signed, // contain signed values, so we're always treating the values as signed,
// regardless of version. // regardless of version.
// We do the same with ctts flags to work around encoder software issues.
status_t SampleTable::setCompositionTimeToSampleParams( status_t SampleTable::setCompositionTimeToSampleParams(
off64_t data_offset, size_t data_size) { off64_t data_offset, size_t data_size) {
ALOGV("There are reordered frames present."); ALOGV("There are reordered frames present.");
@ -406,7 +407,7 @@ status_t SampleTable::setCompositionTimeToSampleParams(
uint32_t version = flags >> 24; uint32_t version = flags >> 24;
flags &= 0xffffff; flags &= 0xffffff;
if ((version != 0 && version != 1) || flags > 1) { if ((version != 0 && version != 1) || (flags != 0 && flags != 1)) {
// Expected version = 0 or 1, flags = 0 or 1. // Expected version = 0 or 1, flags = 0 or 1.
return ERROR_MALFORMED; return ERROR_MALFORMED;
} }