wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset cdf7d7507577 (bug 1110608) for non-unified build failure on CLOSED TREE

Browse Source
This commit is contained in:
Nigel Babu 2014-12-15 12:43:40 +05:30
parent 8c66e627c6
commit fc75345911
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,8 +126,6 @@ MP4Sample* SampleIterator::GetNext()
sample->crypto.plain_sizes.AppendElement(reader.ReadU16());
sample->crypto.encrypted_sizes.AppendElement(reader.ReadU32());
}
reader.ReadArray(sample->crypto.iv, 16);
sample->crypto.iv_size = 16;
}
}

18
media/libstagefright/binding/MoofParser.cpp
View File

@ -247,16 +247,18 @@ Moof::ParseTraf(Box& aBox, Trex& aTrex, Mdhd& aMdhd, Edts& aEdts)
for (Box box = aBox.FirstChild(); box.IsAvailable(); box = box.Next()) {
if (box.IsType("tfhd")) {
tfhd = Tfhd(box, aTrex);
} else if (!aTrex.mTrackId || tfhd.mTrackId == aTrex.mTrackId) {
if (box.IsType("tfdt")) {
} else if (box.IsType("tfdt")) {
if (!aTrex.mTrackId || tfhd.mTrackId == aTrex.mTrackId) {
tfdt = Tfdt(box);
} else if (box.IsType("trun")) {
ParseTrun(box, tfhd, tfdt, aMdhd, aEdts);
} else if (box.IsType("saiz")) {
mSaizs.AppendElement(Saiz(box));
} else if (box.IsType("saio")) {
mSaios.AppendElement(Saio(box));
}
} else if (box.IsType("trun")) {
if (!aTrex.mTrackId || tfhd.mTrackId == aTrex.mTrackId) {
ParseTrun(box, tfhd, tfdt, aMdhd, aEdts);
}
} else if (box.IsType("saiz")) {
mSaizs.AppendElement(Saiz(box));
} else if (box.IsType("saio")) {
mSaios.AppendElement(Saio(box));
}
}
}

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

@ -111,7 +111,7 @@ MP4Demuxer::Init()
nsRefPtr<Index> index = new Index(mPrivate->mAudio->exportIndex(),
mSource, mAudioConfig.mTrackId);
mPrivate->mIndexes.AppendElement(index);
if (index->IsFragmented()) {
if (index->IsFragmented() && !mAudioConfig.crypto.valid) {
mPrivate->mAudioIterator = new SampleIterator(index);
}
} else if (!mPrivate->mVideo.get() && !strncmp(mimeType, "video/", 6)) {
@ -124,7 +124,7 @@ MP4Demuxer::Init()
nsRefPtr<Index> index = new Index(mPrivate->mVideo->exportIndex(),
mSource, mVideoConfig.mTrackId);
mPrivate->mIndexes.AppendElement(index);
if (index->IsFragmented()) {
if (index->IsFragmented() && !mVideoConfig.crypto.valid) {
mPrivate->mVideoIterator = new SampleIterator(index);
}
}
@ -219,6 +219,7 @@ MP4Demuxer::DemuxVideoSample()
sample->prefix_data = mVideoConfig.annex_b;
if (sample->crypto.valid) {
sample->crypto.mode = mVideoConfig.crypto.mode;
sample->crypto.iv_size = mVideoConfig.crypto.iv_size;
sample->crypto.key.AppendElements(mVideoConfig.crypto.key);
}
}