Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (261898 => 261899)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2020-05-20 00:27:20 UTC (rev 261898)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2020-05-20 01:15:40 UTC (rev 261899)
@@ -819,7 +819,7 @@
Node::InsertedIntoAncestorResult HTMLMediaElement::insertedIntoAncestor(InsertionType insertionType, ContainerNode& parentOfInsertedTree)
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
HTMLElement::insertedIntoAncestor(insertionType, parentOfInsertedTree);
if (insertionType.connectedToDocument)
@@ -832,7 +832,7 @@
{
Ref<HTMLMediaElement> protectedThis(*this); // prepareForLoad may result in a 'beforeload' event, which can make arbitrary DOM mutations.
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
if (m_inActiveDocument && m_networkState == NETWORK_EMPTY && !attributeWithoutSynchronization(srcAttr).isEmpty())
prepareForLoad();
@@ -875,7 +875,7 @@
void HTMLMediaElement::removedFromAncestor(RemovalType removalType, ContainerNode& oldParentOfRemovedTree)
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
setInActiveDocument(false);
if (removalType.disconnectedFromDocument) {
@@ -1026,7 +1026,7 @@
{
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
if (m_isPlayingToWirelessTarget && !m_player->canPlayToWirelessPlaybackTarget()) {
- INFO_LOG(LOGIDENTIFIER, "calling setShouldPlayToPlaybackTarget(false)");
+ ALWAYS_LOG(LOGIDENTIFIER, "calling setShouldPlayToPlaybackTarget(false)");
m_failedToPlayToWirelessTarget = true;
m_player->setShouldPlayToPlaybackTarget(false);
}
@@ -1095,7 +1095,7 @@
break;
}
- INFO_LOG(LOGIDENTIFIER, mimeType, ": ", canPlay);
+ ALWAYS_LOG(LOGIDENTIFIER, mimeType, ": ", canPlay);
return canPlay;
}
@@ -2039,7 +2039,7 @@
void HTMLMediaElement::waitForSourceChange()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
stopPeriodicTimers();
m_loadState = WaitingForSource;
@@ -2059,7 +2059,7 @@
if (m_error)
return;
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
stopPeriodicTimers();
m_loadState = WaitingForSource;
@@ -2185,7 +2185,7 @@
if (m_currentSourceNode)
m_currentSourceNode->scheduleErrorEvent();
else
- INFO_LOG(LOGIDENTIFIER, "error event not sent, <source> was removed");
+ ALWAYS_LOG(LOGIDENTIFIER, "error event not sent, <source> was removed");
// 9.Otherwise.10 - Asynchronously await a stable state. The synchronous section consists of all the remaining steps of this algorithm until the algorithm says the synchronous section has ended.
@@ -2193,10 +2193,10 @@
forgetResourceSpecificTracks();
if (havePotentialSourceChild()) {
- INFO_LOG(LOGIDENTIFIER, "scheduling next <source>");
+ ALWAYS_LOG(LOGIDENTIFIER, "scheduling next <source>");
scheduleNextSourceChild();
} else {
- INFO_LOG(LOGIDENTIFIER, "no more <source> elements, waiting");
+ ALWAYS_LOG(LOGIDENTIFIER, "no more <source> elements, waiting");
waitForSourceChange();
}
@@ -2862,7 +2862,7 @@
void HTMLMediaElement::fastSeek(const MediaTime& time)
{
- INFO_LOG(LOGIDENTIFIER, time);
+ ALWAYS_LOG(LOGIDENTIFIER, time);
// 4.7.10.9 Seeking
// 9. If the approximate-for-speed flag is set, adjust the new playback position to a value that will
// allow for playback to resume promptly. If new playback position before this step is before current
@@ -2878,13 +2878,13 @@
void HTMLMediaElement::seek(const MediaTime& time)
{
- INFO_LOG(LOGIDENTIFIER, time);
+ ALWAYS_LOG(LOGIDENTIFIER, time);
seekWithTolerance(time, MediaTime::zeroTime(), MediaTime::zeroTime(), true);
}
void HTMLMediaElement::seekInternal(const MediaTime& time)
{
- INFO_LOG(LOGIDENTIFIER, time);
+ ALWAYS_LOG(LOGIDENTIFIER, time);
seekWithTolerance(time, MediaTime::zeroTime(), MediaTime::zeroTime(), false);
}
@@ -2974,7 +2974,7 @@
// time scale, we will ask the media engine to "seek" to the current movie time, which may be a noop and
// not generate a timechanged callback. This means m_seeking will never be cleared and we will never
// fire a 'seeked' event.
- if (willLog(WTFLogLevel::Debug)) {
+ if (willLog(WTFLogLevel::Info)) {
MediaTime mediaTime = m_player->mediaTimeForTimeValue(time);
if (time != mediaTime)
INFO_LOG(LOGIDENTIFIER, time, " media timeline equivalent is ", mediaTime);
@@ -3004,7 +3004,7 @@
#endif
if (noSeekRequired) {
- INFO_LOG(LOGIDENTIFIER, "ignored seek to ", time);
+ ALWAYS_LOG(LOGIDENTIFIER, "ignored seek to ", time);
if (time == now) {
scheduleEvent(eventNames().seekingEvent);
scheduleTimeupdateEvent(false);
@@ -3049,7 +3049,7 @@
// 14 - Set the seeking IDL attribute to false.
clearSeeking();
- INFO_LOG(LOGIDENTIFIER, "current time = ", currentMediaTime());
+ ALWAYS_LOG(LOGIDENTIFIER, "current time = ", currentMediaTime());
// 15 - Run the time maches on steps.
// Handled by mediaPlayerTimeChanged().
@@ -3138,7 +3138,7 @@
return MediaTime::zeroTime();
if (m_seeking) {
- INFO_LOG(LOGIDENTIFIER, "seeking, returning", m_lastSeekTime);
+ ALWAYS_LOG(LOGIDENTIFIER, "seeking, returning", m_lastSeekTime);
return m_lastSeekTime;
}
@@ -3389,7 +3389,7 @@
void HTMLMediaElement::setPreload(const String& preload)
{
- INFO_LOG(LOGIDENTIFIER, preload);
+ ALWAYS_LOG(LOGIDENTIFIER, preload);
#if ENABLE(MEDIA_STREAM)
// http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
// "preload" - On getting: none. On setting: ignored.
@@ -3453,7 +3453,7 @@
}
if (!document().hasBrowsingContext()) {
- INFO_LOG(LOGIDENTIFIER, "returning because there is no browsing context");
+ ALWAYS_LOG(LOGIDENTIFIER, "returning because there is no browsing context");
return;
}
@@ -3555,7 +3555,7 @@
}
if (!document().hasBrowsingContext()) {
- INFO_LOG(LOGIDENTIFIER, "returning because there is no browsing context");
+ ALWAYS_LOG(LOGIDENTIFIER, "returning because there is no browsing context");
return;
}
@@ -3612,7 +3612,7 @@
void HTMLMediaElement::setLoop(bool loop)
{
- INFO_LOG(LOGIDENTIFIER, loop);
+ ALWAYS_LOG(LOGIDENTIFIER, loop);
setBooleanAttribute(loopAttr, loop);
}
@@ -3629,7 +3629,7 @@
void HTMLMediaElement::setControls(bool controls)
{
- INFO_LOG(LOGIDENTIFIER, controls);
+ ALWAYS_LOG(LOGIDENTIFIER, controls);
setBooleanAttribute(controlsAttr, controls);
}
@@ -3640,7 +3640,7 @@
ExceptionOr<void> HTMLMediaElement::setVolume(double volume)
{
- INFO_LOG(LOGIDENTIFIER, volume);
+ ALWAYS_LOG(LOGIDENTIFIER, volume);
if (!(volume >= 0 && volume <= 1))
return Exception { IndexSizeError };
@@ -3684,7 +3684,7 @@
void HTMLMediaElement::setMuted(bool muted)
{
- INFO_LOG(LOGIDENTIFIER, muted);
+ ALWAYS_LOG(LOGIDENTIFIER, muted);
bool mutedStateChanged = m_muted != muted;
if (mutedStateChanged || !m_explicitlyMuted) {
@@ -3738,7 +3738,7 @@
if (effectiveMuted() || !volume())
return;
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
userDidInterfereWithAutoplay();
}
#endif
@@ -4194,7 +4194,7 @@
currentlyEnabledTracks.append(textTrack);
int trackScore = captionPreferences ? captionPreferences->textTrackSelectionScore(textTrack.get(), this) : 0;
- INFO_LOG(LOGIDENTIFIER, "'", textTrack->kindKeyword(), "' track with language '", textTrack->language(), "' and BCP 47 language '", textTrack->validBCP47Language(), "' has score ", trackScore);
+ ALWAYS_LOG(LOGIDENTIFIER, "'", textTrack->kindKeyword(), "' track with language '", textTrack->language(), "' and BCP 47 language '", textTrack->validBCP47Language(), "' has score ", trackScore);
if (trackScore) {
@@ -4722,7 +4722,7 @@
void HTMLMediaElement::mediaPlayerTimeChanged()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
#if ENABLE(VIDEO_TRACK)
updateActiveTextTrackCues(currentMediaTime());
@@ -4754,9 +4754,14 @@
m_sentEndEvent = false;
// then seek to the earliest possible position of the media resource and abort these steps when the direction of
// playback is forwards,
- if (now >= dur)
+ if (now >= dur) {
+ ALWAYS_LOG(LOGIDENTIFIER, "current time (", now, ") is greater then duration (", dur, "), looping");
seekInternal(MediaTime::zeroTime());
+ }
} else if ((now <= MediaTime::zeroTime() && playbackRate < 0) || (now >= dur && playbackRate > 0)) {
+
+ ALWAYS_LOG(LOGIDENTIFIER, "current time (", now, ") is greater then duration (", dur, ") or <= 0, pausing");
+
// If the media element does not have a current media controller, and the media element
// has still ended playback and paused is false,
if (!m_mediaController && !m_paused) {
@@ -4850,7 +4855,7 @@
void HTMLMediaElement::mediaPlayerVolumeChanged()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
beginProcessingMediaPlayerCallback();
if (m_player) {
@@ -4866,7 +4871,7 @@
void HTMLMediaElement::mediaPlayerMuteChanged()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
beginProcessingMediaPlayerCallback();
if (m_player)
@@ -4876,8 +4881,6 @@
void HTMLMediaElement::mediaPlayerDurationChanged()
{
- INFO_LOG(LOGIDENTIFIER);
-
beginProcessingMediaPlayerCallback();
scheduleEvent(eventNames().durationchangeEvent);
@@ -4885,6 +4888,7 @@
MediaTime now = currentMediaTime();
MediaTime dur = durationMediaTime();
+ ALWAYS_LOG(LOGIDENTIFIER, "duration = ", dur, ", current time = ", now);
if (now > dur)
seekInternal(dur);
@@ -4899,7 +4903,7 @@
// using (eg. it can't handle the rate we set)
m_reportedPlaybackRate = m_player->rate();
- INFO_LOG(LOGIDENTIFIER, "rate: ", m_reportedPlaybackRate);
+ ALWAYS_LOG(LOGIDENTIFIER, "rate: ", m_reportedPlaybackRate);
if (m_playing)
invalidateCachedTime();
@@ -4911,13 +4915,14 @@
void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
{
- INFO_LOG(LOGIDENTIFIER);
-
if (!m_player || m_pausedInternal)
return;
+ auto playerPaused = m_player->paused();
+ ALWAYS_LOG(LOGIDENTIFIER, playerPaused);
+
beginProcessingMediaPlayerCallback();
- if (m_player->paused())
+ if (playerPaused)
pauseInternal();
else
playInternal();
@@ -4929,7 +4934,7 @@
void HTMLMediaElement::mediaPlayerResourceNotSupported()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
// The MediaPlayer came across content which no installed engine supports.
mediaLoadingFailed(MediaPlayer::NetworkState::FormatError);
@@ -4947,7 +4952,7 @@
void HTMLMediaElement::mediaPlayerSizeChanged()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
if (is<MediaDocument>(document()) && m_player)
downcast<MediaDocument>(document()).mediaElementNaturalSizeChanged(expandedIntSize(m_player->naturalSize()));
@@ -4968,7 +4973,7 @@
void HTMLMediaElement::mediaPlayerRenderingModeChanged()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
// Kick off a fake recalcStyle that will update the compositing tree.
invalidateStyleAndLayerComposition();
@@ -5053,7 +5058,7 @@
void HTMLMediaElement::mediaPlayerEngineUpdated()
{
- INFO_LOG(LOGIDENTIFIER, m_player->engineDescription());
+ ALWAYS_LOG(LOGIDENTIFIER, m_player->engineDescription());
#if ENABLE(MEDIA_SOURCE)
m_droppedVideoFrames = 0;
@@ -5066,7 +5071,7 @@
void HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable()
{
- INFO_LOG(LOGIDENTIFIER, "current display mode = ", (int)displayMode());
+ ALWAYS_LOG(LOGIDENTIFIER, "current display mode = ", (int)displayMode());
beginProcessingMediaPlayerCallback();
if (displayMode() == PosterWaitingForVideo) {
@@ -5078,7 +5083,7 @@
void HTMLMediaElement::mediaPlayerCharacteristicChanged()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
beginProcessingMediaPlayerCallback();
@@ -5316,7 +5321,7 @@
bool shouldBePlaying = potentiallyPlaying();
bool playerPaused = m_player->paused();
- INFO_LOG(LOGIDENTIFIER, "shouldBePlaying = ", shouldBePlaying, ", playerPaused = ", playerPaused);
+ ALWAYS_LOG(LOGIDENTIFIER, "shouldBePlaying = ", shouldBePlaying, ", playerPaused = ", playerPaused);
if (shouldBePlaying && playerPaused && m_mediaSession->requiresFullscreenForVideoPlayback() && (m_waitingToEnterFullscreen || !isFullscreen())) {
if (!m_waitingToEnterFullscreen)
@@ -5625,7 +5630,7 @@
void HTMLMediaElement::stop()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
Ref<HTMLMediaElement> protectedThis(*this);
stopWithoutDestroyingMediaPlayer();
@@ -5642,7 +5647,7 @@
void HTMLMediaElement::suspend(ReasonForSuspension reason)
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
Ref<HTMLMediaElement> protectedThis(*this);
m_resumeTaskQueue.cancelTask();
@@ -5663,7 +5668,7 @@
void HTMLMediaElement::resume()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
setInActiveDocument(true);
@@ -5711,7 +5716,7 @@
return;
m_elementIsHidden = elementIsHidden;
- INFO_LOG(LOGIDENTIFIER, "visible = ", !m_elementIsHidden);
+ ALWAYS_LOG(LOGIDENTIFIER, "visible = ", !m_elementIsHidden);
updateSleepDisabling();
m_mediaSession->visibilityChanged();
@@ -5844,7 +5849,7 @@
m_mediaSession->setHasPlaybackTargetAvailabilityListeners(true);
}
- INFO_LOG(LOGIDENTIFIER, "'webkitplaybacktargetavailabilitychanged'");
+ ALWAYS_LOG(LOGIDENTIFIER, "'webkitplaybacktargetavailabilitychanged'");
enqueuePlaybackTargetAvailabilityChangedEvent(); // Ensure the event listener gets at least one event.
return true;
@@ -5864,7 +5869,7 @@
return false;
bool didRemoveLastAvailabilityChangedListener = !hasEventListeners(eventNames().webkitplaybacktargetavailabilitychangedEvent) && !m_remote->hasAvailabilityCallbacks();
- INFO_LOG(LOGIDENTIFIER, "removed last listener = ", didRemoveLastAvailabilityChangedListener);
+ ALWAYS_LOG(LOGIDENTIFIER, "removed last listener = ", didRemoveLastAvailabilityChangedListener);
if (didRemoveLastAvailabilityChangedListener) {
m_hasPlaybackTargetAvailabilityListeners = false;
m_mediaSession->setHasPlaybackTargetAvailabilityListeners(false);
@@ -5877,7 +5882,7 @@
void HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent()
{
bool hasTargets = m_mediaSession->hasWirelessPlaybackTargets();
- INFO_LOG(LOGIDENTIFIER, "hasTargets = ", hasTargets);
+ ALWAYS_LOG(LOGIDENTIFIER, "hasTargets = ", hasTargets);
auto event = WebKitPlaybackTargetAvailabilityEvent::create(eventNames().webkitplaybacktargetavailabilitychangedEvent, hasTargets);
event->setTarget(this);
m_asyncEventQueue->enqueueEvent(WTFMove(event));
@@ -5896,8 +5901,6 @@
void HTMLMediaElement::setShouldPlayToPlaybackTarget(bool shouldPlay)
{
- ALWAYS_LOG(LOGIDENTIFIER, shouldPlay);
-
if (m_player) {
m_player->setShouldPlayToPlaybackTarget(shouldPlay);
setIsPlayingToWirelessTarget(m_player->isCurrentPlaybackTargetWireless());
@@ -5915,7 +5918,7 @@
if (m_hasPlaybackTargetAvailabilityListeners == hasListeners)
return;
- INFO_LOG(LOGIDENTIFIER, "hasListeners: ", hasListeners);
+ ALWAYS_LOG(LOGIDENTIFIER, "hasListeners: ", hasListeners);
m_hasPlaybackTargetAvailabilityListeners = hasListeners;
m_mediaSession->setHasPlaybackTargetAvailabilityListeners(hasListeners);
scheduleUpdateMediaState();
@@ -5983,7 +5986,7 @@
void HTMLMediaElement::enterFullscreen(VideoFullscreenMode mode)
{
- INFO_LOG(LOGIDENTIFIER, ", m_videoFullscreenMode = ", m_videoFullscreenMode, ", mode = ", mode);
+ ALWAYS_LOG(LOGIDENTIFIER, ", m_videoFullscreenMode = ", m_videoFullscreenMode, ", mode = ", mode);
ASSERT(mode != VideoFullscreenModeNone);
if (m_videoFullscreenMode == mode)
@@ -6007,7 +6010,7 @@
if (is<HTMLVideoElement>(*this)) {
HTMLVideoElement& asVideo = downcast<HTMLVideoElement>(*this);
if (document().page()->chrome().client().supportsVideoFullscreen(mode)) {
- INFO_LOG(LOGIDENTIFIER, "Entering fullscreen mode ", mode, ", m_videoFullscreenStandby = ", m_videoFullscreenStandby);
+ ALWAYS_LOG(LOGIDENTIFIER, "Entering fullscreen mode ", mode, ", m_videoFullscreenStandby = ", m_videoFullscreenStandby);
m_temporarilyAllowingInlinePlaybackAfterFullscreen = false;
m_waitingToEnterFullscreen = true;
@@ -6028,7 +6031,7 @@
void HTMLMediaElement::exitFullscreen()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
m_waitingToEnterFullscreen = false;
@@ -6126,7 +6129,7 @@
void HTMLMediaElement::didBecomeFullscreenElement()
{
- INFO_LOG(LOGIDENTIFIER, ", fullscreen mode = ", fullscreenMode());
+ ALWAYS_LOG(LOGIDENTIFIER, ", fullscreen mode = ", fullscreenMode());
m_waitingToEnterFullscreen = false;
scheduleUpdatePlayState();
}
@@ -6335,7 +6338,7 @@
void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)
{
- INFO_LOG(LOGIDENTIFIER, closedCaptionVisible);
+ ALWAYS_LOG(LOGIDENTIFIER, closedCaptionVisible);
m_closedCaptionsVisible = false;
@@ -6388,7 +6391,7 @@
void HTMLMediaElement::mediaCanStart(Document& document)
{
ASSERT_UNUSED(document, &document == &this->document());
- INFO_LOG(LOGIDENTIFIER, "m_isWaitingUntilMediaCanStart = ", m_isWaitingUntilMediaCanStart, ", m_pausedInternal = ", m_pausedInternal);
+ ALWAYS_LOG(LOGIDENTIFIER, "waiting = ", m_isWaitingUntilMediaCanStart, ", paused = ", m_pausedInternal);
ASSERT(m_isWaitingUntilMediaCanStart || m_pausedInternal);
if (m_isWaitingUntilMediaCanStart) {
@@ -6409,7 +6412,7 @@
if (m_shouldDelayLoadEvent == shouldDelay)
return;
- INFO_LOG(LOGIDENTIFIER, shouldDelay);
+ ALWAYS_LOG(LOGIDENTIFIER, shouldDelay);
m_shouldDelayLoadEvent = shouldDelay;
if (shouldDelay)
@@ -7453,7 +7456,7 @@
void HTMLMediaElement::suspendPlayback()
{
- INFO_LOG(LOGIDENTIFIER, "paused = ", paused());
+ ALWAYS_LOG(LOGIDENTIFIER, "paused = ", paused());
if (!paused())
pause();
}
@@ -7460,7 +7463,7 @@
void HTMLMediaElement::resumeAutoplaying()
{
- INFO_LOG(LOGIDENTIFIER, "paused = ", paused());
+ ALWAYS_LOG(LOGIDENTIFIER, "paused = ", paused());
m_autoplaying = true;
if (canTransitionFromAutoplayToPlay())
@@ -7469,7 +7472,7 @@
void HTMLMediaElement::mayResumePlayback(bool shouldResume)
{
- INFO_LOG(LOGIDENTIFIER, "paused = ", paused());
+ ALWAYS_LOG(LOGIDENTIFIER, "paused = ", paused());
if (paused() && shouldResume)
play();
}
@@ -7508,7 +7511,7 @@
void HTMLMediaElement::didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType command, const PlatformMediaSession::RemoteCommandArgument* argument)
{
- INFO_LOG(LOGIDENTIFIER, command);
+ ALWAYS_LOG(LOGIDENTIFIER, command);
UserGestureIndicator remoteControlUserGesture(ProcessingUserGesture, &document());
switch (command) {
@@ -7756,7 +7759,7 @@
if (policy == m_bufferingPolicy)
return;
- INFO_LOG(LOGIDENTIFIER, policy);
+ ALWAYS_LOG(LOGIDENTIFIER, policy);
m_bufferingPolicy = policy;
if (m_player)
@@ -7765,13 +7768,13 @@
void HTMLMediaElement::purgeBufferedDataIfPossible()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
if (!MemoryPressureHandler::singleton().isUnderMemoryPressure() && m_mediaSession->preferredBufferingPolicy() == BufferingPolicy::Default)
return;
if (isPlayingToExternalTarget()) {
- INFO_LOG(LOGIDENTIFIER, "early return because playing to wireless target");
+ ALWAYS_LOG(LOGIDENTIFIER, "early return because playing to wireless target");
return;
}
Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp (261898 => 261899)
--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2020-05-20 00:27:20 UTC (rev 261898)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2020-05-20 01:15:40 UTC (rev 261899)
@@ -66,6 +66,7 @@
MAKE_STATIC_STRING_IMPL("SuspendedUnderLock"),
MAKE_STATIC_STRING_IMPL("InvisibleAutoplay"),
MAKE_STATIC_STRING_IMPL("ProcessInactive"),
+ MAKE_STATIC_STRING_IMPL("PlaybackSuspended"),
};
static_assert(!static_cast<size_t>(PlatformMediaSession::NoInterruption), "PlatformMediaSession::NoInterruption is not 0 as expected");
static_assert(static_cast<size_t>(PlatformMediaSession::SystemSleep) == 1, "PlatformMediaSession::SystemSleep is not 1 as expected");
@@ -74,6 +75,7 @@
static_assert(static_cast<size_t>(PlatformMediaSession::SuspendedUnderLock) == 4, "PlatformMediaSession::SuspendedUnderLock is not 4 as expected");
static_assert(static_cast<size_t>(PlatformMediaSession::InvisibleAutoplay) == 5, "PlatformMediaSession::InvisibleAutoplay is not 5 as expected");
static_assert(static_cast<size_t>(PlatformMediaSession::ProcessInactive) == 6, "PlatformMediaSession::ProcessInactive is not 6 as expected");
+ static_assert(static_cast<size_t>(PlatformMediaSession::PlaybackSuspended) == 7, "PlatformMediaSession::PlaybackSuspended is not 7 as expected");
ASSERT(static_cast<size_t>(type) < WTF_ARRAY_LENGTH(values));
return values[static_cast<size_t>(type)];
}
@@ -139,7 +141,7 @@
if (state == m_state)
return;
- INFO_LOG(LOGIDENTIFIER, state);
+ ALWAYS_LOG(LOGIDENTIFIER, state);
m_state = state;
if (m_state == State::Playing)
m_hasPlayedSinceLastInterruption = true;
@@ -148,7 +150,7 @@
void PlatformMediaSession::beginInterruption(InterruptionType type)
{
- INFO_LOG(LOGIDENTIFIER, "state = ", m_state, ", interruption type = ", type, ", interruption count = ", m_interruptionCount);
+ ALWAYS_LOG(LOGIDENTIFIER, "state = ", m_state, ", interruption type = ", type, ", interruption count = ", m_interruptionCount);
// When interruptions are overridden, m_interruptionType doesn't get set.
// Give nested interruptions a chance when the previous interruptions were overridden.
@@ -156,7 +158,7 @@
return;
if (client().shouldOverrideBackgroundPlaybackRestriction(type)) {
- INFO_LOG(LOGIDENTIFIER, "returning early because client says to override interruption");
+ ALWAYS_LOG(LOGIDENTIFIER, "returning early because client says to override interruption");
return;
}
@@ -170,10 +172,10 @@
void PlatformMediaSession::endInterruption(EndInterruptionFlags flags)
{
- INFO_LOG(LOGIDENTIFIER, "flags = ", (int)flags, ", stateToRestore = ", m_stateToRestore, ", interruption count = ", m_interruptionCount);
+ ALWAYS_LOG(LOGIDENTIFIER, "flags = ", (int)flags, ", stateToRestore = ", m_stateToRestore, ", interruption count = ", m_interruptionCount);
if (!m_interruptionCount) {
- INFO_LOG(LOGIDENTIFIER, "!! ignoring spurious interruption end !!");
+ ALWAYS_LOG(LOGIDENTIFIER, "!! ignoring spurious interruption end !!");
return;
}
@@ -200,10 +202,10 @@
if (m_notifyingClient)
return;
- INFO_LOG(LOGIDENTIFIER, "state = ", m_state);
+ ALWAYS_LOG(LOGIDENTIFIER, "state = ", m_state);
if (state() == Interrupted) {
m_stateToRestore = Autoplaying;
- INFO_LOG(LOGIDENTIFIER, " setting stateToRestore to \"Autoplaying\"");
+ ALWAYS_LOG(LOGIDENTIFIER, " setting stateToRestore to \"Autoplaying\"");
return;
}
@@ -215,7 +217,7 @@
if (m_notifyingClient)
return true;
- INFO_LOG(LOGIDENTIFIER, "state = ", m_state);
+ ALWAYS_LOG(LOGIDENTIFIER, "state = ", m_state);
if (!m_manager->sessionWillBeginPlayback(*this)) {
if (state() == Interrupted)
@@ -232,10 +234,10 @@
if (m_notifyingClient)
return true;
- INFO_LOG(LOGIDENTIFIER, "state = ", m_state);
+ ALWAYS_LOG(LOGIDENTIFIER, "state = ", m_state);
if (state() == Interrupted) {
m_stateToRestore = Paused;
- INFO_LOG(LOGIDENTIFIER, " setting stateToRestore to \"Paused\"");
+ ALWAYS_LOG(LOGIDENTIFIER, " setting stateToRestore to \"Paused\"");
return false;
}
@@ -246,23 +248,25 @@
bool PlatformMediaSession::clientWillPausePlayback()
{
+ ALWAYS_LOG(LOGIDENTIFIER);
return processClientWillPausePlayback(DelayCallingUpdateNowPlaying::No);
}
void PlatformMediaSession::clientWillBeDOMSuspended()
{
+ ALWAYS_LOG(LOGIDENTIFIER);
processClientWillPausePlayback(DelayCallingUpdateNowPlaying::Yes);
}
void PlatformMediaSession::pauseSession()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
m_client.suspendPlayback();
}
void PlatformMediaSession::stopSession()
{
- INFO_LOG(LOGIDENTIFIER);
+ ALWAYS_LOG(LOGIDENTIFIER);
m_client.suspendPlayback();
m_manager->removeSession(*this);
}
@@ -284,7 +288,7 @@
void PlatformMediaSession::didReceiveRemoteControlCommand(RemoteControlCommandType command, const PlatformMediaSession::RemoteCommandArgument* argument)
{
- INFO_LOG(LOGIDENTIFIER, command);
+ ALWAYS_LOG(LOGIDENTIFIER, command);
m_client.didReceiveRemoteControlCommand(command, argument);
}
