Changeset 241945 in webkit


Ignore:
Timestamp:
Feb 22, 2019 5:52:18 AM (5 years ago)
Author:
eric.carlson@apple.com
Message:

Update some media logging
​https://bugs.webkit.org/show_bug.cgi?id=194915

Reviewed by Jer Noble.

No new tests, no functional change.

  • Modules/mediasource/SourceBuffer.cpp:

(WebCore::SourceBuffer::evictCodedFrames):
(WebCore::SourceBuffer::provideMediaData):
(WebCore::SourceBuffer::trySignalAllSamplesInTrackEnqueued):

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::checkPlaybackTargetCompatablity):
(WebCore::HTMLMediaElement::loadResource):
(WebCore::HTMLMediaElement::updateActiveTextTrackCues):
(WebCore::HTMLMediaElement::canTransitionFromAutoplayToPlay const):
(WebCore::HTMLMediaElement::seekTask):
(WebCore::HTMLMediaElement::playInternal):
(WebCore::HTMLMediaElement::pauseInternal):
(WebCore::HTMLMediaElement::setLoop):
(WebCore::HTMLMediaElement::setControls):
(WebCore::HTMLMediaElement::sourceWasRemoved):

  • html/MediaElementSession.cpp:

(WebCore::convertEnumerationToString):

  • html/MediaElementSession.h:

(WTF::LogArgument<WebCore::MediaPlaybackDenialReason>::toString):

  • platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:

(WebCore::SourceBufferPrivateAVFObjC::enqueueSample):

Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r241942 r241945  
     12019-02-22  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Update some media logging
     4        https://bugs.webkit.org/show_bug.cgi?id=194915
     5
     6        Reviewed by Jer Noble.
     7
     8        No new tests, no functional change.
     9
     10        * Modules/mediasource/SourceBuffer.cpp:
     11        (WebCore::SourceBuffer::evictCodedFrames):
     12        (WebCore::SourceBuffer::provideMediaData):
     13        (WebCore::SourceBuffer::trySignalAllSamplesInTrackEnqueued):
     14
     15        * html/HTMLMediaElement.cpp:
     16        (WebCore::HTMLMediaElement::checkPlaybackTargetCompatablity):
     17        (WebCore::HTMLMediaElement::loadResource):
     18        (WebCore::HTMLMediaElement::updateActiveTextTrackCues):
     19        (WebCore::HTMLMediaElement::canTransitionFromAutoplayToPlay const):
     20        (WebCore::HTMLMediaElement::seekTask):
     21        (WebCore::HTMLMediaElement::playInternal):
     22        (WebCore::HTMLMediaElement::pauseInternal):
     23        (WebCore::HTMLMediaElement::setLoop):
     24        (WebCore::HTMLMediaElement::setControls):
     25        (WebCore::HTMLMediaElement::sourceWasRemoved):
     26
     27        * html/MediaElementSession.cpp:
     28        (WebCore::convertEnumerationToString):
     29
     30        * html/MediaElementSession.h:
     31        (WTF::LogArgument<WebCore::MediaPlaybackDenialReason>::toString):
     32
     33        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
     34        (WebCore::SourceBufferPrivateAVFObjC::enqueueSample):
     35
    1362019-02-22  Rob Buis  <rbuis@igalia.com>
    237

  • trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp

    r241472 r241945  
    991991    if (currentTimeRange == notFound || currentTimeRange == buffered.length() - 1) {
    992992#if !RELEASE_LOG_DISABLED
    993         ERROR_LOG(LOGIDENTIFIER, "evicted ", initialBufferedSize - extraMemoryCost(), " bytes but FAILED to free enough");
     993        ERROR_LOG(LOGIDENTIFIER, "FAILED to free enough after evicting ", initialBufferedSize - extraMemoryCost());
    994994#endif
    995995        return;
    … …  
    10261026#if !RELEASE_LOG_DISABLED
    10271027    if (m_bufferFull)
    1028         ERROR_LOG(LOGIDENTIFIER, "evicted ", initialBufferedSize - extraMemoryCost(), " but FAILED to free enough");
     1028        ERROR_LOG(LOGIDENTIFIER, "FAILED to free enough after evicting ", initialBufferedSize - extraMemoryCost());
    10291029    else
    10301030        DEBUG_LOG(LOGIDENTIFIER, "evicted ", initialBufferedSize - extraMemoryCost());
    … …  
    20442044
    20452045#if !RELEASE_LOG_DISABLED
    2046     DEBUG_LOG(LOGIDENTIFIER, "Enqueued ", enqueuedSamples, " samples, ", static_cast<size_t>(trackBuffer.decodeQueue.size()), " remaining");
     2046    DEBUG_LOG(LOGIDENTIFIER, "enqueued ", enqueuedSamples, " samples, ", static_cast<size_t>(trackBuffer.decodeQueue.size()), " remaining");
    20472047#endif
    20482048
    … …  
    20532053{
    20542054    if (m_source->isEnded() && m_trackBufferMap.get(trackID).decodeQueue.empty()) {
    2055         DEBUG_LOG(LOGIDENTIFIER, "All samples in track ", trackID, " enqueued");
     2055        DEBUG_LOG(LOGIDENTIFIER, "enqueued all samples from track ", trackID);
    20562056        m_private->allSamplesInTrackEnqueued(trackID);
    20572057    }

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r241487 r241945  
    11/*
    2  * Copyright (C) 2007-2018 Apple Inc. All rights reserved.
     2 * Copyright (C) 2007-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    11061106{
    11071107#if ENABLE(WIRELESS_PLAYBACK_TARGET)
     1108    auto logSiteIdentifier = LOGIDENTIFIER;
     1109    ALWAYS_LOG(logSiteIdentifier, "task scheduled");
    11081110    if (m_isPlayingToWirelessTarget && !m_player->canPlayToWirelessPlaybackTarget()) {
    1109         INFO_LOG(LOGIDENTIFIER, "calling setShouldPlayToPlaybackTarget(false)");
     1111        UNUSED_PARAM(logSiteIdentifier);
     1112        INFO_LOG(logSiteIdentifier, "calling setShouldPlayToPlaybackTarget(false)");
    11101113        m_failedToPlayToWirelessTarget = true;
    11111114        m_player->setShouldPlayToPlaybackTarget(false);
    … …  
    15141517    ASSERT(initialURL.isEmpty() || isSafeToLoadURL(initialURL, Complain));
    15151518
    1516     INFO_LOG(LOGIDENTIFIER, initialURL, contentType.raw(), keySystem);
     1519    INFO_LOG(LOGIDENTIFIER, initialURL, contentType, keySystem);
    15171520
    15181521    RefPtr<Frame> frame = document().frame();
    … …  
    15681571    if (resource) {
    15691572        url = ApplicationCacheHost::createFileURL(resource->path());
    1570         INFO_LOG(LOGIDENTIFIER, "will load ", url, " from app cache");
     1573        INFO_LOG(LOGIDENTIFIER, "will load from app cache ", url);
    15711574    }
    15721575
    … …  
    17841787
    17851788            auto currentMediaTime = weakThis->currentMediaTime();
    1786             INFO_LOG(LOGIDENTIFIER, " lambda, currentMediaTime:", currentMediaTime);
     1789            INFO_LOG(LOGIDENTIFIER, " lambda, currentMediaTime: ", currentMediaTime);
    17871790            weakThis->updateActiveTextTrackCues(currentMediaTime);
    17881791        }, nextInterestingTime);
    … …  
    24062409SuccessOr<MediaPlaybackDenialReason> HTMLMediaElement::canTransitionFromAutoplayToPlay() const
    24072410{
    2408     if (isAutoplaying()
    2409         && mediaSession().autoplayPermitted()
    2410         && paused()
    2411         && autoplay()
    2412         && !pausedForUserInteraction()
    2413         && !document().isSandboxed(SandboxAutomaticFeatures)
    2414         && m_readyState == HAVE_ENOUGH_DATA)
    2415         return mediaSession().playbackPermitted();
    2416 
    2417     ALWAYS_LOG(LOGIDENTIFIER, "page consent required");
    2418     return MediaPlaybackDenialReason::PageConsentRequired;
     2411    if (m_readyState != HAVE_ENOUGH_DATA) {
     2412        ALWAYS_LOG(LOGIDENTIFIER, "m_readyState != HAVE_ENOUGH_DATA");
     2413        return MediaPlaybackDenialReason::PageConsentRequired;
     2414    }
     2415    if (!isAutoplaying()) {
     2416        ALWAYS_LOG(LOGIDENTIFIER, "!isAutoplaying");
     2417        return MediaPlaybackDenialReason::PageConsentRequired;
     2418    }
     2419    if (!mediaSession().autoplayPermitted()) {
     2420        ALWAYS_LOG(LOGIDENTIFIER, "!mediaSession().autoplayPermitted");
     2421        return MediaPlaybackDenialReason::PageConsentRequired;
     2422    }
     2423    if (!paused()) {
     2424        ALWAYS_LOG(LOGIDENTIFIER, "!paused");
     2425        return MediaPlaybackDenialReason::PageConsentRequired;
     2426    }
     2427    if (!autoplay()) {
     2428        ALWAYS_LOG(LOGIDENTIFIER, "!autoplay");
     2429        return MediaPlaybackDenialReason::PageConsentRequired;
     2430    }
     2431    if (pausedForUserInteraction()) {
     2432        ALWAYS_LOG(LOGIDENTIFIER, "pausedForUserInteraction");
     2433        return MediaPlaybackDenialReason::PageConsentRequired;
     2434    }
     2435    if (document().isSandboxed(SandboxAutomaticFeatures)) {
     2436        ALWAYS_LOG(LOGIDENTIFIER, "isSandboxed");
     2437        return MediaPlaybackDenialReason::PageConsentRequired;
     2438    }
     2439
     2440    auto permitted = mediaSession().playbackPermitted();
     2441#if !RELEASE_LOG_DISABLED
     2442    if (!permitted)
     2443        ALWAYS_LOG(LOGIDENTIFIER, permitted.value());
     2444    else
     2445        ALWAYS_LOG(LOGIDENTIFIER, "can transition!");
     2446#endif
     2447   
     2448    return permitted;
    24192449}
    24202450
    … …  
    30963126
    30973127    if (noSeekRequired) {
    3098         INFO_LOG(LOGIDENTIFIER, "seek to ", time, " ignored");
     3128        INFO_LOG(LOGIDENTIFIER, "ignored seek to ", time);
    30993129        if (time == now) {
    31003130            scheduleEvent(eventNames().seekingEvent);
    … …  
    35313561
    35323562    if (isSuspended()) {
    3533         ALWAYS_LOG(LOGIDENTIFIER, "  returning because context is suspended");
     3563        ALWAYS_LOG(LOGIDENTIFIER, "returning because context is suspended");
    35343564        return;
    35353565    }
    35363566
    35373567    if (!document().hasBrowsingContext()) {
    3538         INFO_LOG(LOGIDENTIFIER, "  returning because there is no browsing context");
     3568        INFO_LOG(LOGIDENTIFIER, "returning because there is no browsing context");
    35393569        return;
    35403570    }
    35413571
    35423572    if (!m_mediaSession->clientWillBeginPlayback()) {
    3543         ALWAYS_LOG(LOGIDENTIFIER, "  returning because of interruption");
     3573        ALWAYS_LOG(LOGIDENTIFIER, "returning because of interruption");
    35443574        return;
    35453575    }
    … …  
    36283658
    36293659    if (isSuspended()) {
    3630         ALWAYS_LOG(LOGIDENTIFIER, "  returning because context is suspended");
     3660        ALWAYS_LOG(LOGIDENTIFIER, "returning because context is suspended");
    36313661        return;
    36323662    }
    36333663
    36343664    if (!document().hasBrowsingContext()) {
    3635         INFO_LOG(LOGIDENTIFIER, "  returning because there is no browsing context");
     3665        INFO_LOG(LOGIDENTIFIER, "returning because there is no browsing context");
    36363666        return;
    36373667    }
    36383668
    36393669    if (!m_mediaSession->clientWillPausePlayback()) {
    3640         ALWAYS_LOG(LOGIDENTIFIER, "  returning because of interruption");
     3670        ALWAYS_LOG(LOGIDENTIFIER, "returning because of interruption");
    36413671        return;
    36423672    }
    … …  
    36883718}
    36893719
    3690 void HTMLMediaElement::setLoop(bool b)
    3691 {
    3692     INFO_LOG(LOGIDENTIFIER, b);
    3693     setBooleanAttribute(loopAttr, b);
     3720void HTMLMediaElement::setLoop(bool loop)
     3721{
     3722    INFO_LOG(LOGIDENTIFIER, loop);
     3723    setBooleanAttribute(loopAttr, loop);
    36943724}
    36953725
    … …  
    37053735}
    37063736
    3707 void HTMLMediaElement::setControls(bool b)
    3708 {
    3709     INFO_LOG(LOGIDENTIFIER, b);
    3710     setBooleanAttribute(controlsAttr, b);
     3737void HTMLMediaElement::setControls(bool controls)
     3738{
     3739    INFO_LOG(LOGIDENTIFIER, controls);
     3740    setBooleanAttribute(controlsAttr, controls);
    37113741}
    37123742
    … …  
    48044834        // inserted in a video or audio element will have no effect.
    48054835        m_currentSourceNode = nullptr;
    4806         INFO_LOG(LOGIDENTIFIER, "m_currentSourceNode set to 0");
     4836        INFO_LOG(LOGIDENTIFIER, "m_currentSourceNode cleared");
    48074837    }
    48084838}

  • trunk/Source/WebCore/html/MediaElementSession.cpp

    r241548 r241945  
    978978}
    979979
     980String convertEnumerationToString(const MediaPlaybackDenialReason enumerationValue)
     981{
     982    static const NeverDestroyed<String> values[] = {
     983        MAKE_STATIC_STRING_IMPL("UserGestureRequired"),
     984        MAKE_STATIC_STRING_IMPL("FullscreenRequired"),
     985        MAKE_STATIC_STRING_IMPL("PageConsentRequired"),
     986        MAKE_STATIC_STRING_IMPL("InvalidState"),
     987    };
     988    static_assert(static_cast<size_t>(MediaPlaybackDenialReason::UserGestureRequired) == 0, "MediaPlaybackDenialReason::UserGestureRequired is not 0 as expected");
     989    static_assert(static_cast<size_t>(MediaPlaybackDenialReason::FullscreenRequired) == 1, "MediaPlaybackDenialReason::FullscreenRequired is not 1 as expected");
     990    static_assert(static_cast<size_t>(MediaPlaybackDenialReason::PageConsentRequired) == 2, "MediaPlaybackDenialReason::PageConsentRequired is not 2 as expected");
     991    static_assert(static_cast<size_t>(MediaPlaybackDenialReason::InvalidState) == 3, "MediaPlaybackDenialReason::InvalidState is not 3 as expected");
     992    ASSERT(static_cast<size_t>(enumerationValue) < WTF_ARRAY_LENGTH(values));
     993    return values[static_cast<size_t>(enumerationValue)];
     994}
     995   
    980996}
    981997

  • trunk/Source/WebCore/html/MediaElementSession.h

    r241548 r241945  
    207207};
    208208
     209String convertEnumerationToString(const MediaPlaybackDenialReason);
     210
    209211} // namespace WebCore
     212
     213namespace WTF {
     214   
     215template<typename Type>
     216struct LogArgument;
     217
     218template <>
     219struct LogArgument<WebCore::MediaPlaybackDenialReason> {
     220    static String toString(const WebCore::MediaPlaybackDenialReason reason)
     221    {
     222        return convertEnumerationToString(reason);
     223    }
     224};
     225   
     226}; // namespace WTF
     227
    210228
    211229SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::MediaElementSession)

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm

    r241479 r241945  
    11181118        return;
    11191119
    1120     DEBUG_LOG(LOGIDENTIFIER, "track ID = ", trackID, "sample = ", sample.get());
     1120    DEBUG_LOG(LOGIDENTIFIER, "track ID = ", trackID, ", sample = ", sample.get());
    11211121
    11221122    if (trackID == m_enabledVideoTrackID) {
Note: See TracChangeset for help on using the changeset viewer.