Diff
Modified: trunk/Source/WebCore/ChangeLog (253454 => 253455)
--- trunk/Source/WebCore/ChangeLog 2019-12-13 00:26:20 UTC (rev 253454)
+++ trunk/Source/WebCore/ChangeLog 2019-12-13 00:48:03 UTC (rev 253455)
@@ -1,3 +1,35 @@
+2019-12-12 Jer Noble <jer.no...@apple.com>
+
+ Add logging for MediaCapabilities.decodeInfo()
+ https://bugs.webkit.org/show_bug.cgi?id=205172
+
+ Reviewed by Eric Carlson.
+
+ Add logging for decodingInfo() that can emit string versions of both the input
+ MediaConfiguration and the output MediaCapabilitiesInfo objects.
+
+ * Modules/mediacapabilities/MediaCapabilities.cpp:
+ (WebCore::MediaCapabilities::decodingInfo):
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/mediacapabilities/MediaCapabilitiesLogging.cpp: Added.
+ (WebCore::toJSONObject):
+ (WebCore::toJSONString):
+ (WTF::LogArgument<WebCore::VideoConfiguration>::toString):
+ (WTF::LogArgument<WebCore::AudioConfiguration>::toString):
+ (WTF::LogArgument<WebCore::MediaConfiguration>::toString):
+ (WTF::LogArgument<WebCore::MediaDecodingConfiguration>::toString):
+ (WTF::LogArgument<WebCore::MediaEncodingConfiguration>::toString):
+ (WTF::LogArgument<WebCore::MediaCapabilitiesInfo>::toString):
+ (WTF::LogArgument<WebCore::MediaCapabilitiesDecodingInfo>::toString):
+ (WTF::LogArgument<WebCore::MediaCapabilitiesEncodingInfo>::toString):
+ (WTF::LogArgument<WebCore::ColorGamut>::toString):
+ (WTF::LogArgument<WebCore::HdrMetadataType>::toString):
+ (WTF::LogArgument<WebCore::TransferFunction>::toString):
+ (WTF::LogArgument<WebCore::MediaDecodingType>::toString):
+ (WTF::LogArgument<WebCore::MediaEncodingType>::toString):
+ * platform/mediacapabilities/MediaCapabilitiesLogging.h: Added.
+
2019-12-12 David Kilzer <ddkil...@apple.com>
REGRESSION (r172814): Don't export inline SQLiteDatabase::disableThreadingChecks() method
Modified: trunk/Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp (253454 => 253455)
--- trunk/Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp 2019-12-13 00:26:20 UTC (rev 253454)
+++ trunk/Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp 2019-12-13 00:48:03 UTC (rev 253455)
@@ -31,13 +31,16 @@
#include "JSDOMPromiseDeferred.h"
#include "JSMediaCapabilitiesDecodingInfo.h"
#include "JSMediaCapabilitiesEncodingInfo.h"
+#include "Logging.h"
#include "MediaCapabilitiesDecodingInfo.h"
#include "MediaCapabilitiesEncodingInfo.h"
+#include "MediaCapabilitiesLogging.h"
#include "MediaDecodingConfiguration.h"
#include "MediaEncodingConfiguration.h"
#include "MediaEngineConfigurationFactory.h"
#include "Settings.h"
#include <wtf/HashSet.h>
+#include <wtf/Logger.h>
namespace WebCore {
@@ -167,10 +170,16 @@
// 2.4 Media Capabilities Interface
// https://wicg.github.io/media-capabilities/#media-capabilities-interface
+ auto identifier = WTF::Logger::LogSiteIdentifier("MediaCapabilities", __func__, this);
+ Ref<Logger> logger = document.logger();
+
// 1. If configuration is not a valid MediaConfiguration, return a Promise rejected with a TypeError.
// 2. If configuration.video is present and is not a valid video configuration, return a Promise rejected with a TypeError.
// 3. If configuration.audio is present and is not a valid audio configuration, return a Promise rejected with a TypeError.
if (!isValidMediaConfiguration(configuration)) {
+#if !RELEASE_LOG_DISABLED
+ logger->info(LogMedia, identifier, " - Rejected. configuration: ", configuration);
+#endif
promise->reject(TypeError);
return;
}
@@ -181,10 +190,10 @@
// 4. Let p be a new promise.
// 5. In parallel, run the create a MediaCapabilitiesInfo algorithm with configuration and resolve p with its result.
// 6. Return p.
- m_taskQueue.enqueueTask([configuration = WTFMove(configuration), promise = WTFMove(promise)] () mutable {
+ m_taskQueue.enqueueTask([configuration = WTFMove(configuration), promise = WTFMove(promise), logger = WTFMove(logger), identifier = WTFMove(identifier)] () mutable {
// 2.2.3 If configuration is of type MediaDecodingConfiguration, run the following substeps:
- MediaEngineConfigurationFactory::DecodingConfigurationCallback callback = [promise = WTFMove(promise)] (auto info) mutable {
+ MediaEngineConfigurationFactory::DecodingConfigurationCallback callback = [promise = WTFMove(promise), logger = WTFMove(logger), identifier = WTFMove(identifier)] (auto info) mutable {
// 2.2.3.1. If the user agent is able to decode the media represented by
// configuration, set supported to true. Otherwise set it to false.
// 2.2.3.2. If the user agent is able to decode the media represented by
@@ -196,6 +205,9 @@
// consideration the current power source in order to determine the
// decoding power efficiency unless the device’s power source has side
// effects such as enabling different decoding modules.
+#if !RELEASE_LOG_DISABLED
+ logger->info(LogMedia, identifier, "::callback() - Resolved. info: ", info);
+#endif
promise->resolve<IDLDictionary<MediaCapabilitiesDecodingInfo>>(WTFMove(info));
};
Modified: trunk/Source/WebCore/Sources.txt (253454 => 253455)
--- trunk/Source/WebCore/Sources.txt 2019-12-13 00:26:20 UTC (rev 253454)
+++ trunk/Source/WebCore/Sources.txt 2019-12-13 00:48:03 UTC (rev 253455)
@@ -1958,6 +1958,7 @@
platform/graphics/transforms/TranslateTransformOperation.cpp
platform/mediacapabilities/MediaEngineConfigurationFactory.cpp
+platform/mediacapabilities/MediaCapabilitiesLogging.cpp
platform/mediarecorder/MediaRecorderPrivateMock.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (253454 => 253455)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-12-13 00:26:20 UTC (rev 253454)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-12-13 00:48:03 UTC (rev 253455)
@@ -13718,6 +13718,8 @@
CD2F4A2218D89F700063746D /* AudioHardwareListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioHardwareListener.h; sourceTree = "<group>"; };
CD2F4A2518D8A3490063746D /* AudioHardwareListenerMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioHardwareListenerMac.cpp; sourceTree = "<group>"; };
CD2F4A2618D8A3490063746D /* AudioHardwareListenerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioHardwareListenerMac.h; sourceTree = "<group>"; };
+ CD30B28623A173AA00D7488B /* MediaCapabilitiesLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MediaCapabilitiesLogging.h; path = mediacapabilities/MediaCapabilitiesLogging.h; sourceTree = "<group>"; };
+ CD30B28723A173AA00D7488B /* MediaCapabilitiesLogging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MediaCapabilitiesLogging.cpp; path = mediacapabilities/MediaCapabilitiesLogging.cpp; sourceTree = "<group>"; };
CD318620199F1E2A0030A0F7 /* CDMPrivateMediaSourceAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CDMPrivateMediaSourceAVFObjC.mm; sourceTree = "<group>"; };
CD318621199F1E2A0030A0F7 /* CDMPrivateMediaSourceAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMPrivateMediaSourceAVFObjC.h; sourceTree = "<group>"; };
CD32A189184EB46A0029B1BB /* mediaControlsiOS.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = mediaControlsiOS.js; sourceTree = "<group>"; };
@@ -22642,6 +22644,8 @@
CDCC9BCE22387E9A00FFB51C /* MediaCapabilitiesDecodingInfo.h */,
CDCC9BD022387EAA00FFB51C /* MediaCapabilitiesEncodingInfo.h */,
CD0C8B582141C8CA0062F59D /* MediaCapabilitiesInfo.h */,
+ CD30B28723A173AA00D7488B /* MediaCapabilitiesLogging.cpp */,
+ CD30B28623A173AA00D7488B /* MediaCapabilitiesLogging.h */,
CDBD3D351FE85CBF0012C545 /* MediaConfiguration.h */,
CDBD3D361FE85CC00012C545 /* MediaDecodingConfiguration.h */,
CDBD3D381FE85CC00012C545 /* MediaDecodingType.h */,
Added: trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.cpp (0 => 253455)
--- trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.cpp (rev 0)
+++ trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.cpp 2019-12-13 00:48:03 UTC (rev 253455)
@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2019 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "MediaCapabilitiesLogging.h"
+
+#include "AudioConfiguration.h"
+#include "JSColorGamut.h"
+#include "JSHdrMetadataType.h"
+#include "JSMediaDecodingType.h"
+#include "JSMediaEncodingType.h"
+#include "JSTransferFunction.h"
+#include "MediaCapabilitiesDecodingInfo.h"
+#include "MediaCapabilitiesEncodingInfo.h"
+#include "MediaDecodingConfiguration.h"
+#include "MediaDecodingType.h"
+#include "MediaEncodingConfiguration.h"
+#include "MediaEncodingType.h"
+#include "VideoConfiguration.h"
+#include <wtf/JSONValues.h>
+
+namespace WebCore {
+
+static Ref<JSON::Object> toJSONObject(const VideoConfiguration& configuration)
+{
+ auto object = JSON::Object::create();
+ object->setString("contentType"_s, configuration.contentType);
+ object->setInteger("width"_s, configuration.width);
+ object->setInteger("height"_s, configuration.height);
+ object->setInteger("bitrate"_s, configuration.bitrate);
+ object->setDouble("framerate"_s, configuration.framerate);
+ if (configuration.alphaChannel)
+ object->setBoolean("alphaChannel"_s, configuration.alphaChannel.value());
+ if (configuration.colorGamut)
+ object->setString("colorGamut"_s, convertEnumerationToString(configuration.colorGamut.value()));
+ if (configuration.hdrMetadataType)
+ object->setString("hdrMetadataType"_s, convertEnumerationToString(configuration.hdrMetadataType.value()));
+ if (configuration.transferFunction)
+ object->setString("transferFunction"_s, convertEnumerationToString(configuration.transferFunction.value()));
+ return object;
+}
+
+static Ref<JSON::Object> toJSONObject(const AudioConfiguration& configuration)
+{
+ auto object = JSON::Object::create();
+ object->setString("contentType"_s, configuration.contentType);
+ object->setString("channels"_s, configuration.channels);
+ object->setInteger("bitrate"_s, configuration.bitrate);
+ object->setDouble("samplerate"_s, configuration.samplerate);
+ return object;
+}
+
+static Ref<JSON::Object> toJSONObject(const MediaConfiguration& configuration)
+{
+ auto object = JSON::Object::create();
+ if (configuration.video)
+ object->setValue("video"_s, toJSONObject(configuration.video.value()));
+ if (configuration.audio)
+ object->setValue("audio"_s, toJSONObject(configuration.audio.value()));
+ return object;
+}
+
+static Ref<JSON::Object> toJSONObject(const MediaDecodingConfiguration& configuration)
+{
+ auto object = toJSONObject(static_cast<const MediaConfiguration&>(configuration));
+ object->setString("type"_s, convertEnumerationToString(configuration.type));
+ return object;
+}
+
+static Ref<JSON::Object> toJSONObject(const MediaEncodingConfiguration& configuration)
+{
+ auto object = toJSONObject(static_cast<const MediaConfiguration&>(configuration));
+ object->setString("type"_s, convertEnumerationToString(configuration.type));
+ return object;
+}
+
+static Ref<JSON::Object> toJSONObject(const MediaCapabilitiesInfo& info)
+{
+ auto object = JSON::Object::create();
+ object->setBoolean("supported"_s, info.supported);
+ object->setBoolean("smooth"_s, info.smooth);
+ object->setBoolean("powerEfficient"_s, info.powerEfficient);
+ return object;
+}
+
+static Ref<JSON::Object> toJSONObject(const MediaCapabilitiesDecodingInfo& info)
+{
+ auto object = toJSONObject(static_cast<const MediaCapabilitiesInfo&>(info));
+ object->setValue("supportedConfiguration"_s, toJSONObject(info.supportedConfiguration));
+ return object;
+}
+
+static Ref<JSON::Object> toJSONObject(const MediaCapabilitiesEncodingInfo& info)
+{
+ auto object = toJSONObject(static_cast<const MediaCapabilitiesInfo&>(info));
+ object->setValue("supportedConfiguration"_s, toJSONObject(info.supportedConfiguration));
+ return object;
+}
+
+static String toJSONString(const VideoConfiguration& configuration)
+{
+ return toJSONObject(configuration)->toJSONString();
+}
+
+static String toJSONString(const AudioConfiguration& configuration)
+{
+ return toJSONObject(configuration)->toJSONString();
+}
+
+static String toJSONString(const MediaConfiguration& configuration)
+{
+ return toJSONObject(configuration)->toJSONString();
+}
+
+static String toJSONString(const MediaDecodingConfiguration& configuration)
+{
+ return toJSONObject(configuration)->toJSONString();
+}
+
+static String toJSONString(const MediaEncodingConfiguration& configuration)
+{
+ return toJSONObject(configuration)->toJSONString();
+}
+
+static String toJSONString(const MediaCapabilitiesInfo& info)
+{
+ return toJSONObject(info)->toJSONString();
+}
+
+static String toJSONString(const MediaCapabilitiesDecodingInfo& info)
+{
+ return toJSONObject(info)->toJSONString();
+}
+
+static String toJSONString(const MediaCapabilitiesEncodingInfo& info)
+{
+ return toJSONObject(info)->toJSONString();
+}
+
+}
+
+namespace WTF {
+
+String LogArgument<WebCore::VideoConfiguration>::toString(const WebCore::VideoConfiguration& configuration)
+{
+ return toJSONString(configuration);
+}
+
+String LogArgument<WebCore::AudioConfiguration>::toString(const WebCore::AudioConfiguration& configuration)
+{
+ return toJSONString(configuration);
+}
+
+String LogArgument<WebCore::MediaConfiguration>::toString(const WebCore::MediaConfiguration& configuration)
+{
+ return toJSONString(configuration);
+}
+
+String LogArgument<WebCore::MediaDecodingConfiguration>::toString(const WebCore::MediaDecodingConfiguration& configuration)
+{
+ return toJSONString(configuration);
+}
+
+String LogArgument<WebCore::MediaEncodingConfiguration>::toString(const WebCore::MediaEncodingConfiguration& configuration)
+{
+ return toJSONString(configuration);
+}
+
+String LogArgument<WebCore::MediaCapabilitiesInfo>::toString(const WebCore::MediaCapabilitiesInfo& info)
+{
+ return toJSONString(info);
+}
+
+String LogArgument<WebCore::MediaCapabilitiesDecodingInfo>::toString(const WebCore::MediaCapabilitiesDecodingInfo& info)
+{
+ return toJSONString(info);
+}
+
+String LogArgument<WebCore::MediaCapabilitiesEncodingInfo>::toString(const WebCore::MediaCapabilitiesEncodingInfo& info)
+{
+ return toJSONString(info);
+}
+
+String LogArgument<WebCore::ColorGamut>::toString(const WebCore::ColorGamut& type)
+{
+ return convertEnumerationToString(type);
+}
+
+String LogArgument<WebCore::HdrMetadataType>::toString(const WebCore::HdrMetadataType& type)
+{
+ return convertEnumerationToString(type);
+}
+
+String LogArgument<WebCore::TransferFunction>::toString(const WebCore::TransferFunction& type)
+{
+ return convertEnumerationToString(type);
+}
+
+String LogArgument<WebCore::MediaDecodingType>::toString(const WebCore::MediaDecodingType& type)
+{
+ return convertEnumerationToString(type);
+}
+
+String LogArgument<WebCore::MediaEncodingType>::toString(const WebCore::MediaEncodingType& type)
+{
+ return convertEnumerationToString(type);
+}
+
+}
Added: trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.h (0 => 253455)
--- trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.h (rev 0)
+++ trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.h 2019-12-13 00:48:03 UTC (rev 253455)
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2019 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+struct VideoConfiguration;
+struct AudioConfiguration;
+struct MediaConfiguration;
+struct MediaDecodingConfiguration;
+struct MediaEncodingConfiguration;
+struct MediaCapabilitiesInfo;
+struct MediaCapabilitiesDecodingInfo;
+struct MediaCapabilitiesEncodingInfo;
+
+enum class ColorGamut;
+enum class HdrMetadataType;
+enum class TransferFunction;
+enum class MediaDecodingType;
+enum class MediaEncodingType;
+
+}
+
+namespace WTF {
+
+template<typename>
+struct LogArgument;
+
+template <>
+struct LogArgument<WebCore::VideoConfiguration> {
+ static String toString(const WebCore::VideoConfiguration&);
+};
+
+template <>
+struct LogArgument<WebCore::AudioConfiguration> {
+ static String toString(const WebCore::AudioConfiguration&);
+};
+
+template <>
+struct LogArgument<WebCore::MediaConfiguration> {
+ static String toString(const WebCore::MediaConfiguration&);
+};
+
+template <>
+struct LogArgument<WebCore::MediaDecodingConfiguration> {
+ static String toString(const WebCore::MediaDecodingConfiguration&);
+};
+
+template <>
+struct LogArgument<WebCore::MediaEncodingConfiguration> {
+ static String toString(const WebCore::MediaEncodingConfiguration&);
+};
+
+template <>
+struct LogArgument<WebCore::MediaCapabilitiesInfo> {
+ static String toString(const WebCore::MediaCapabilitiesInfo&);
+};
+
+template <>
+struct LogArgument<WebCore::MediaCapabilitiesDecodingInfo> {
+ static String toString(const WebCore::MediaCapabilitiesDecodingInfo&);
+};
+
+template <>
+struct LogArgument<WebCore::MediaCapabilitiesEncodingInfo> {
+ static String toString(const WebCore::MediaCapabilitiesEncodingInfo&);
+};
+
+template <>
+struct LogArgument<WebCore::ColorGamut> {
+ static String toString(const WebCore::ColorGamut&);
+};
+
+template <>
+struct LogArgument<WebCore::HdrMetadataType> {
+ static String toString(const WebCore::HdrMetadataType&);
+};
+
+template <>
+struct LogArgument<WebCore::TransferFunction> {
+ static String toString(const WebCore::TransferFunction&);
+};
+
+template <>
+struct LogArgument<WebCore::MediaDecodingType> {
+ static String toString(const WebCore::MediaDecodingType&);
+};
+
+template <>
+struct LogArgument<WebCore::MediaEncodingType> {
+ static String toString(const WebCore::MediaEncodingType&);
+};
+
+}
