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

Bug 1617033 - part2 : only update audible state after starting listener successfully. r=chunmin

Browse Source 
It's useless to update the audible state before starting listening to the media control keys event, so we make it consistent with other functions which could only be used after starting the listener.

As the audible change could happen before we start the listener, we have to manually update audible state to the controller after we start the listener.

Differential Revision: https://phabricator.services.mozilla.com/D63943
This commit is contained in:
alwu
2020-03-06 17:46:07 +00:00
parent 2df345def4
commit f862f1f153
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dom/html/HTMLMediaElement.cpp
View File

@@ -394,21 +394,23 @@ class HTMLMediaElement::MediaControlEventListener final
MOZ_ASSERT(aElement);
}
void Start() {
// Return false if the listener can't be started. Otherwise, return true.
bool Start() {
MOZ_ASSERT(NS_IsMainThread());
if (IsStarted()) {
// We have already been started, do not notify start twice.
return;
return true;
}
// Fail to init media agent, we are not able to notify the media controller
// any update and also are not able to receive media control key events.
if (!InitMediaAgent()) {
MEDIACONTROL_LOG("Fail to init content media agent!");
return;
return false;
}
NotifyMediaStateChanged(ControlledMediaState::eStarted);
return true;
}
void Stop() {
@@ -444,10 +446,13 @@ class HTMLMediaElement::MediaControlEventListener final
void UpdateMediaAudibleState(bool aIsOwnerAudible) {
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(IsStarted());
if (mIsOwnerAudible == aIsOwnerAudible) {
return;
}
mIsOwnerAudible = aIsOwnerAudible;
MEDIACONTROL_LOG("Media becomes %s",
mIsOwnerAudible ? "audible" : "inaudible");
// If media hasn't started playing, it doesn't make sense to update media
// audible state. Therefore, in that case we would noitfy the audible state
// when media starts playing.
@@ -7215,7 +7220,7 @@ void HTMLMediaElement::NotifyAudioPlaybackChanged(
if (mAudioChannelWrapper) {
mAudioChannelWrapper->NotifyAudioPlaybackChanged(aReason);
}
if (mMediaControlEventListener) {
if (mMediaControlEventListener && mMediaControlEventListener->IsStarted()) {
mMediaControlEventListener->UpdateMediaAudibleState(IsAudible());
}
// only request wake lock for audible media.
@@ -7687,17 +7692,21 @@ void HTMLMediaElement::StartListeningMediaControlEventIfNeeded() {
mMediaControlEventListener = new MediaControlEventListener(this);
}
if (mMediaControlEventListener->IsStarted()) {
if (mMediaControlEventListener->IsStarted() ||
!mMediaControlEventListener->Start()) {
return;
}
mMediaControlEventListener->Start();
// If `mPaused` was being changed at the time the listener didn't start, then
// this method won't be called. Eg. if the media becomes audible after it has
// been playing for a while. Therefore, we have to manually update playback
// state after starting listener.
NotifyMediaControlPlaybackStateChanged();
// `UpdateMediaAudibleState()` could only be used after we start the listener,
// but the audible state update could happen before that. Therefore, we have
// to manually update media's audible state as well.
mMediaControlEventListener->UpdateMediaAudibleState(IsAudible());
}
void HTMLMediaElement::StopListeningMediaControlEventIfNeeded() {