зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1296531 - Allow MediaSegment::AppendSlice to combine with last chunk. r=jesup
This makes it consistent with MediaSegment::AppendFrom. MozReview-Commit-ID: JNvLlURAqE7 --HG-- extra : rebase_source : 2fa023c91c43c19c3df799bab64f275c72eb1994 extra : source : d2c4bebc340fbd579450b42e271181e20f475c59
This commit is contained in:
Родитель
fa90a37a68
Коммит
3822256061
|
@ -461,7 +461,14 @@ protected:
|
||||||
StreamTime nextOffset = offset + c.GetDuration();
|
StreamTime nextOffset = offset + c.GetDuration();
|
||||||
StreamTime end = std::min(aEnd, nextOffset);
|
StreamTime end = std::min(aEnd, nextOffset);
|
||||||
if (start < end) {
|
if (start < end) {
|
||||||
mChunks.AppendElement(c)->SliceTo(start - offset, end - offset);
|
if (!mChunks.IsEmpty() &&
|
||||||
|
mChunks[mChunks.Length() - 1].CanCombineWithFollowing(c)) {
|
||||||
|
MOZ_ASSERT(start - offset >= 0 && end - offset <= aSource.mDuration,
|
||||||
|
"Slice out of bounds");
|
||||||
|
mChunks[mChunks.Length() - 1].mDuration += end - start;
|
||||||
|
} else {
|
||||||
|
mChunks.AppendElement(c)->SliceTo(start - offset, end - offset);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
offset = nextOffset;
|
offset = nextOffset;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче