corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1153049: Part4. Remove redundant mHasAudio/mHasVideo member. r=cpearce

Browse Source
This commit is contained in:
Jean-Yves Avenard
2015-04-14 15:17:51 +10:00
parent 07e5cf0e6f
commit fa102c035f
18 changed files with 30 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dom/html/HTMLMediaElement.cpp
View File

@@ -3509,15 +3509,13 @@ void HTMLMediaElement::UpdateReadyStateForData(MediaDecoderOwner::NextFrameStatu
bool hasVideo = !VideoTracks()->IsEmpty();
if ((!hasAudio && !hasVideo) ||
(IsVideo() && hasVideo && mMediaInfo.mVideo.mDisplay == nsIntSize(0, 0))) {
(IsVideo() && hasVideo && !HasVideo())) {
return;
}
// We are playing a stream that has video and a video frame is now set.
// This means we have all metadata needed to change ready state.
MediaInfo mediaInfo = mMediaInfo;
mediaInfo.mAudio.mHasAudio = hasAudio;
mediaInfo.mVideo.mHasVideo = hasVideo;
MetadataLoaded(&mediaInfo, nsAutoPtr<const MetadataTags>(nullptr));
}