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

Bug 1192818 - part4 : only mute media element if there is alive track. r=jwwang

Browse Source 
If we don't have any alive track in MediaTrackList, we don't need to mute
MediaElement.

MozReview-Commit-ID: 9vY692O7N0e
This commit is contained in:
Alastor Wu
2017-02-23 14:16:44 +08:00
parent ea15b79fc6
commit f0cc040c78
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dom/html/HTMLMediaElement.cpp
View File

@@ -2039,6 +2039,8 @@ void HTMLMediaElement::NotifyMediaTrackDisabled(MediaTrack* aTrack)
(!aTrack->AsVideoTrack() || !aTrack->AsVideoTrack()->Selected())); (!aTrack->AsVideoTrack() || !aTrack->AsVideoTrack()->Selected()));
if (aTrack->AsAudioTrack()) { if (aTrack->AsAudioTrack()) {
// If we don't have any alive track , we don't need to mute MediaElement.
if (AudioTracks()->Length() > 0) {
bool shouldMute = true; bool shouldMute = true;
for (uint32_t i = 0; i < AudioTracks()->Length(); ++i) { for (uint32_t i = 0; i < AudioTracks()->Length(); ++i) {
if ((*AudioTracks())[i]->Enabled()) { if ((*AudioTracks())[i]->Enabled()) {
@@ -2046,9 +2048,11 @@ void HTMLMediaElement::NotifyMediaTrackDisabled(MediaTrack* aTrack)
break; break;
} }
} }
if (shouldMute) { if (shouldMute) {
SetMutedInternal(mMuted | MUTED_BY_AUDIO_TRACK); SetMutedInternal(mMuted | MUTED_BY_AUDIO_TRACK);
} }
}
} else if (aTrack->AsVideoTrack()) { } else if (aTrack->AsVideoTrack()) {
if (mSrcStream) { if (mSrcStream) {
MOZ_ASSERT(mSelectedVideoStreamTrack); MOZ_ASSERT(mSelectedVideoStreamTrack);