Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1227396: P14. Reduce memory usage of sample index for audio tracks. r=cpearce

Browse Source 
All samples in an audio track are keyframes. As such, use block on 128 samples instead.
This commit is contained in:
Jean-Yves Avenard 2015-11-27 15:51:58 +11:00
parent bb0aacbf79
commit 5b14282671
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
media/libstagefright/binding/Index.cpp
View File

@ -238,6 +238,7 @@ Index::Index(const nsTArray<Indice>& aIndex,
uint32_t aTrackId,
bool aIsAudio)
: mSource(aSource)
, mIsAudio(aIsAudio)
{
if (aIndex.IsEmpty()) {
mMoofParser = new MoofParser(aSource, aTrackId, aIsAudio);
@ -251,7 +252,8 @@ Index::Index(const nsTArray<Indice>& aIndex,
bool haveSync = false;
bool progressive = true;
int64_t lastOffset = 0;
for (const Indice& indice : aIndex) {
for (size_t i = 0; i < aIndex.Length(); i++) {
const Indice& indice = aIndex[i];
if (indice.sync) {
haveSync = true;
}
@ -274,7 +276,8 @@ Index::Index(const nsTArray<Indice>& aIndex,
}
lastOffset = indice.end_offset;
if (sample.mSync && progressive) {
// Pack audio samples in group of 128.
if (sample.mSync && progressive && (!mIsAudio || !(i % 128))) {
if (mDataOffset.Length()) {
auto& last = mDataOffset.LastElement();
last.mEndOffset = intervalRange.mEnd;
@ -358,13 +361,25 @@ Index::ConvertByteRangesToTimeRanges(const MediaByteRangeSet& aByteRanges)
TimeIntervals timeRanges;
for (const auto& range : aByteRanges) {
uint32_t start = mDataOffset.IndexOfFirstElementGt(range.mStart - 1);
if (start == mDataOffset.Length()) {
if (!mIsAudio && start == mDataOffset.Length()) {
continue;
}
uint32_t end = mDataOffset.IndexOfFirstElementGt(range.mEnd, MP4DataOffset::EndOffsetComparator());
if (end < start) {
if (!mIsAudio && end < start) {
continue;
}
if (mIsAudio && start &&
range.Intersects(MediaByteRange(mDataOffset[start-1].mStartOffset,
mDataOffset[start-1].mEndOffset))) {
// Check if previous audio data block contains some available samples.
for (size_t i = mDataOffset[start-1].mIndex; i < mIndex.Length(); i++) {
if (range.ContainsStrict(mIndex[i].mByteRange)) {
timeRanges +=
TimeInterval(TimeUnit::FromMicroseconds(mIndex[i].mCompositionRange.start),
TimeUnit::FromMicroseconds(mIndex[i].mCompositionRange.end));
}
}
}
if (end > start) {
timeRanges +=
TimeInterval(TimeUnit::FromMicroseconds(mDataOffset[start].mTime.start),

1
media/libstagefright/binding/include/mp4_demuxer/Index.h
View File

@ -115,6 +115,7 @@ private:
// ConvertByteRangesToTimeRanges cache
mozilla::MediaByteRangeSet mLastCachedRanges;
mozilla::media::TimeIntervals mLastBufferedRanges;
bool mIsAudio;
};
}