From 96a5760751cc7e0187380ebd1029ab08c5a3e1f3 Mon Sep 17 00:00:00 2001
From: Seungha Yang <seungha@centricular.com>
Date: Fri, 19 Jun 2020 23:02:45 +0900
Subject: [PATCH] dxgiscreencapsrc: Reorganize debug category usage

Use the same debug category in all dxgiscreencap related source code

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1355>
---
 sys/winscreencap/dxgicapture.c         | 3 +++
 sys/winscreencap/gstdxgiscreencapsrc.c | 6 ++----
 sys/winscreencap/gstwinscreencap.c     | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/winscreencap/dxgicapture.c b/sys/winscreencap/dxgicapture.c
index 05e4e94..eb4060a 100644
--- a/sys/winscreencap/dxgicapture.c
+++ b/sys/winscreencap/dxgicapture.c
@@ -25,6 +25,9 @@
 
 #include <d3dcompiler.h>
 
+GST_DEBUG_CATEGORY_EXTERN (gst_dxgi_screen_cap_src_debug);
+#define GST_CAT_DEFAULT gst_dxgi_screen_cap_src_debug
+
 #define PTR_RELEASE(p) {if(NULL!=(p)){IUnknown_Release((IUnknown *)(p)); (p) = NULL;}}
 #define BYTE_PER_PIXEL (4)
 
diff --git a/sys/winscreencap/gstdxgiscreencapsrc.c b/sys/winscreencap/gstdxgiscreencapsrc.c
index e6e4870..b416c9a 100644
--- a/sys/winscreencap/gstdxgiscreencapsrc.c
+++ b/sys/winscreencap/gstdxgiscreencapsrc.c
@@ -47,7 +47,8 @@
 #include "gstdxgiscreencapsrc.h"
 #include "dxgicapture.h"
 
-GST_DEBUG_CATEGORY_STATIC (dxgiscreencapsrc_debug);
+GST_DEBUG_CATEGORY_EXTERN (gst_dxgi_screen_cap_src_debug);
+#define GST_CAT_DEFAULT gst_dxgi_screen_cap_src_debug
 
 struct _GstDXGIScreenCapSrc
 {
@@ -190,9 +191,6 @@ gst_dxgi_screen_cap_src_class_init (GstDXGIScreenCapSrcClass * klass)
   gst_element_class_set_static_metadata (e_class,
       "DirectX DXGI screen capture source",
       "Source/Video", "Captures screen", "OKADA Jun-ichi <okada@abt.jp>");
-
-  GST_DEBUG_CATEGORY_INIT (dxgiscreencapsrc_debug, "dxgiscreencapsrc", 0,
-      "DirectX DXGI screen capture source");
 }
 
 static void
diff --git a/sys/winscreencap/gstwinscreencap.c b/sys/winscreencap/gstwinscreencap.c
index 5d49b6d..f249396 100644
--- a/sys/winscreencap/gstwinscreencap.c
+++ b/sys/winscreencap/gstwinscreencap.c
@@ -27,6 +27,8 @@
 #ifdef HAVE_DXGI_CAP
 #include <versionhelpers.h>
 #include "gstdxgiscreencapsrc.h"
+
+GST_DEBUG_CATEGORY (gst_dxgi_screen_cap_src_debug);
 #endif
 
 static BOOL CALLBACK
@@ -72,6 +74,9 @@ plugin_init (GstPlugin * plugin)
   }
 #ifdef HAVE_DXGI_CAP
   if (IsWindows8OrGreater ()) {
+    GST_DEBUG_CATEGORY_INIT (gst_dxgi_screen_cap_src_debug,
+        "dxgiscreencapsrc", 0, "DirectX DXGI screen capture source");
+
     /* dxgiscreencapsrc is needs Windows8 or later. */
     if (!gst_element_register (plugin, "dxgiscreencapsrc",
             GST_RANK_NONE, GST_TYPE_DXGI_SCREEN_CAP_SRC)) {
-- 
2.7.4