roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-06-10 02:18:57 +00:00
Code Issues Projects Releases Wiki Activity

Properly set dts on plain MP4 media

Browse Source 
This fixes a problem of frames being displayed out of order with some versions of LibAV/FFmpeg.
This commit is contained in:
trav90
2016-11-23 08:21:20 -06:00
committed by roytam1
parent 56ac5a7199
commit 8cfee64c42
5 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media/libstagefright/binding/Index.cpp
+1
View File
@@ -255,6 +255,7 @@ Index::Index(const nsTArray<Indice>& aIndex,
indice.end_offset);
sample.mCompositionRange = Interval<Microseconds>(indice.start_composition,
indice.end_composition);
sample.mDecodeTime = indice.start_decode;
sample.mSync = indice.sync;
MOZ_ALWAYS_TRUE(mIndex.AppendElement(sample));
}
media/libstagefright/binding/MP4Metadata.cpp
+1
View File
@@ -80,6 +80,7 @@ ConvertIndex(FallibleTArray<Index::Indice>& aDest,
indice.end_offset = s_indice.end_offset;
indice.start_composition = s_indice.start_composition;
indice.end_composition = s_indice.end_composition;
indice.start_decode = s_indice.start_decode;
indice.sync = s_indice.sync;
MOZ_ALWAYS_TRUE(aDest.AppendElement(indice));
}
media/libstagefright/binding/include/mp4_demuxer/Index.h
+1
View File
@@ -50,6 +50,7 @@ public:
uint64_t end_offset;
uint64_t start_composition;
uint64_t end_composition;
uint64_t start_decode;
bool sync;
};
media/libstagefright/frameworks/av/include/media/stagefright/MediaSource.h
+1
View File
@@ -116,6 +116,7 @@ struct MediaSource : public virtual RefBase {
uint64_t end_offset;
uint64_t start_composition;
uint64_t end_composition;
uint64_t start_decode;
bool sync;
};
media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
+3 -1
View File
@@ -4150,9 +4150,10 @@ nsTArray<MediaSource::Indice> MPEG4Source::exportIndex()
uint32_t compositionTime;
uint32_t duration;
bool isSyncSample;
uint32_t decodeTime;
if (mSampleTable->getMetaDataForSample(sampleIndex, &offset, &size,
&compositionTime, &duration,
&isSyncSample) != OK) {
&isSyncSample, &decodeTime) != OK) {
ALOGE("Unexpected sample table problem");
continue;
}
@@ -4166,6 +4167,7 @@ nsTArray<MediaSource::Indice> MPEG4Source::exportIndex()
indice.end_composition =
(compositionTime * 1000000ll + duration * 1000000ll) / mTimescale;
indice.sync = isSyncSample;
indice.start_decode = (decodeTime * 1000000ll) / mTimescale;
MOZ_ALWAYS_TRUE(index.AppendElement(indice));
}