Changeset 269031 in webkit

Timestamp:

Oct 27, 2020, 4:40:56 AM (6 years ago)

Author:

calvaris@igalia.com

Message:

[EME][GStreamer] Fix logging in utilities
​https://bugs.webkit.org/show_bug.cgi?id=218174

Reviewed by Philippe Normand.

There is some logging in GStreamerEMEUtilities.h that was not
using debugging categories properly. It does now.

• platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h:

(WebCore::InitData::InitData):

• platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h (modified) (2 diffs)
• platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-27  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [EME][GStreamer] Fix logging in utilities
+        https://bugs.webkit.org/show_bug.cgi?id=218174
+
+        Reviewed by Philippe Normand.
+
+        There is some logging in GStreamerEMEUtilities.h that was not
+        using debugging categories properly. It does now.
+
+        * platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h:
+        (WebCore::InitData::InitData):
+        * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
+
 2020-10-27  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h

@@ -34 +34 @@
 #endif
 
+GST_DEBUG_CATEGORY_EXTERN(webkit_media_common_encryption_decrypt_debug_category);
+
 namespace WebCore {
 class InitData {
@@ -46 +48 @@
         auto mappedInitData = GstMappedOwnedBuffer::create(initData);
         if (!mappedInitData) {
-            GST_ERROR("cannot map %s protection data", systemId.utf8().data());
+            GST_CAT_LEVEL_LOG(webkit_media_common_encryption_decrypt_debug_category, GST_LEVEL_ERROR, nullptr, "cannot map %s protection data", systemId.utf8().data());
             ASSERT_NOT_REACHED();
         }

trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp

@@ -54 +54 @@
 static void setContext(GstElement*, GstContext*);
 
-GST_DEBUG_CATEGORY_STATIC(webkit_media_common_encryption_decrypt_debug_category);
+GST_DEBUG_CATEGORY(webkit_media_common_encryption_decrypt_debug_category);
 #define GST_CAT_DEFAULT webkit_media_common_encryption_decrypt_debug_category