Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1050060 - Clean up MP4 index fields; r=edwin

Browse Source
This commit is contained in:
Anthony Jones 2014-08-13 17:13:27 +12:00
parent 8efb306126
commit ae0690b0eb
2 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/binding/Box.cpp
View File

@ -58,7 +58,7 @@ Box::Box(BoxContext* aContext, uint64_t aOffset, const Box* aParent)
}
MediaByteRange boxRange(aOffset, aOffset + size);
if (boxRange.mEnd > mChildOffset ||
if (mChildOffset >= boxRange.mEnd ||
(mParent && !mParent->mRange.Contains(boxRange)) ||
!byteRange->Contains(boxRange)) {
return;

41
media/libstagefright/binding/mp4_demuxer.cpp
View File

@ -24,11 +24,11 @@ struct StageFrightPrivate
sp<MediaSource> mAudio;
MediaSource::ReadOptions mAudioOptions;
nsAutoPtr<Index> mAudioIndex;
sp<MediaSource> mVideo;
MediaSource::ReadOptions mVideoOptions;
nsAutoPtr<Index> mVideoIndex;
nsTArray<nsAutoPtr<Index>> mIndexes;
};
class DataSourceAdapter : public DataSource
@ -101,14 +101,14 @@ MP4Demuxer::Init()
mPrivate->mAudio = e->getTrack(i);
mPrivate->mAudio->start();
mAudioConfig.Update(metaData, mimeType);
auto index = mPrivate->mAudio->exportIndex();
mPrivate->mAudioIndex = new Index(index, mSource, mAudioConfig.mTrackId);
mPrivate->mIndexes.AppendElement(new Index(
mPrivate->mAudio->exportIndex(), mSource, mAudioConfig.mTrackId));
} else if (!mPrivate->mVideo.get() && !strncmp(mimeType, "video/", 6)) {
mPrivate->mVideo = e->getTrack(i);
mPrivate->mVideo->start();
mVideoConfig.Update(metaData, mimeType);
auto index = mPrivate->mVideo->exportIndex();
mPrivate->mVideoIndex = new Index(index, mSource, mVideoConfig.mTrackId);
mPrivate->mIndexes.AppendElement(new Index(
mPrivate->mVideo->exportIndex(), mSource, mVideoConfig.mTrackId));
}
}
sp<MetaData> metaData = e->getMetaData();
@ -199,33 +199,20 @@ MP4Demuxer::ConvertByteRangesToTime(
const nsTArray<mozilla::MediaByteRange>& aByteRanges,
nsTArray<Interval<Microseconds>>* aIntervals)
{
if (!HasValidVideo() && !HasValidAudio()) {
if (mPrivate->mIndexes.IsEmpty()) {
return;
}
nsTArray<Interval<Microseconds>> video;
if (HasValidVideo()) {
nsTArray<Interval<Microseconds>> ranges;
if (!HasValidAudio()) {
mPrivate->mVideoIndex->ConvertByteRangesToTimeRanges(aByteRanges,
aIntervals);
return;
}
mPrivate->mVideoIndex->ConvertByteRangesToTimeRanges(aByteRanges, &video);
}
mPrivate->mIndexes[0]->ConvertByteRangesToTimeRanges(aByteRanges, aIntervals);
nsTArray<Interval<Microseconds>> audio;
if (HasValidAudio()) {
for (int i = 1; i < mPrivate->mIndexes.Length(); i++) {
nsTArray<Interval<Microseconds>> ranges;
if (!HasValidVideo()) {
mPrivate->mAudioIndex->ConvertByteRangesToTimeRanges(aByteRanges,
aIntervals);
return;
}
mPrivate->mAudioIndex->ConvertByteRangesToTimeRanges(aByteRanges, &audio);
}
mPrivate->mIndexes[i]->ConvertByteRangesToTimeRanges(aByteRanges, &ranges);
Interval<Microseconds>::Intersection(audio, video, aIntervals);
nsTArray<Interval<Microseconds>> intersection;
Interval<Microseconds>::Intersection(*aIntervals, ranges, &intersection);
*aIntervals = intersection;
}
}
} // namespace mp4_demuxer