Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1237836 - Backout 3bae9aee9d8a for test failures. r=backout

Browse Source
This commit is contained in:
Chris Pearce 2016-01-08 15:43:27 +13:00
parent 1ae8baf23c
commit bf16ee017a
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/media/MediaFormatReader.cpp
View File

@ -270,8 +270,6 @@ MediaFormatReader::OnDemuxerInitDone(nsresult)
mDemuxerInitDone = true;
UniquePtr<MetadataTags> tags(MakeUnique<MetadataTags>());
// To decode, we need valid video and a place to put it.
bool videoActive = !!mDemuxer->GetNumberTracks(TrackInfo::kVideoTrack) &&
GetImageContainer();
@ -284,9 +282,6 @@ MediaFormatReader::OnDemuxerInitDone(nsresult)
return;
}
mInfo.mVideo = *mVideo.mTrackDemuxer->GetInfo()->GetAsVideoInfo();
for (const MetadataTag& tag : mVideo.mTrackDemuxer->GetInfo()->mTags) {
tags->Put(tag.mKey, tag.mValue);
}
mVideo.mCallback = new DecoderCallback(this, TrackInfo::kVideoTrack);
mVideo.mTimeRanges = mVideo.mTrackDemuxer->GetBuffered();
mTrackDemuxersMayBlock |= mVideo.mTrackDemuxer->GetSamplesMayBlock();
@ -300,9 +295,6 @@ MediaFormatReader::OnDemuxerInitDone(nsresult)
return;
}
mInfo.mAudio = *mAudio.mTrackDemuxer->GetInfo()->GetAsAudioInfo();
for (const MetadataTag& tag : mAudio.mTrackDemuxer->GetInfo()->mTags) {
tags->Put(tag.mKey, tag.mValue);
}
mAudio.mCallback = new DecoderCallback(this, TrackInfo::kAudioTrack);
mAudio.mTimeRanges = mAudio.mTrackDemuxer->GetBuffered();
mTrackDemuxersMayBlock |= mAudio.mTrackDemuxer->GetSamplesMayBlock();
@ -341,7 +333,7 @@ MediaFormatReader::OnDemuxerInitDone(nsresult)
mInitDone = true;
RefPtr<MetadataHolder> metadata = new MetadataHolder();
metadata->mInfo = mInfo;
metadata->mTags = tags->Count() ? tags.release() : nullptr;
metadata->mTags = nullptr;
mMetadataPromise.Resolve(metadata, __func__);
}

13
dom/media/MediaInfo.h
View File

@ -23,17 +23,6 @@ class AudioInfo;
class VideoInfo;
class TextInfo;
class MetadataTag {
public:
MetadataTag(const nsACString& aKey,
const nsACString& aValue)
: mKey(aKey)
, mValue(aValue)
{}
nsCString mKey;
nsCString mValue;
};
class TrackInfo {
public:
enum TrackType {
@ -91,8 +80,6 @@ public:
int64_t mMediaTime;
CryptoTrack mCrypto;
nsTArray<MetadataTag> mTags;
// True if the track is gonna be (decrypted)/decoded and
// rendered directly by non-gecko components.
bool mIsRenderedExternally;