mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11: Get rid of "extern "C"" wrapping for GST_DEBUG_CATEGORY_EXTERN

Browse source 
Instead, change the file defining debug category to cpp

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2525>
This commit is contained in:
Seungha Yang 2021-09-11 00:43:26 +09:00
parent 48474d3cf7
commit 4f45828641
23 changed files with 31 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/d3d11/gstd3d11av1dec.cpp
View file

@ -49,6 +49,9 @@
#include <d3d9.h> #include <d3d9.h>
#include <dxva.h> #include <dxva.h>
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_av1_dec_debug);
#define GST_CAT_DEFAULT gst_d3d11_av1_dec_debug
/* Might not be defined in dxva.h, copied from DXVA AV1 spec available at /* Might not be defined in dxva.h, copied from DXVA AV1 spec available at
* https://www.microsoft.com/en-us/download/confirmation.aspx?id=101577 * https://www.microsoft.com/en-us/download/confirmation.aspx?id=101577
* and modified with "GST_" prefix * and modified with "GST_" prefix
@ -347,16 +350,6 @@ typedef struct _GST_DXVA_Tile_AV1
#pragma pack(pop) #pragma pack(pop)
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_av1_dec_debug);
#define GST_CAT_DEFAULT gst_d3d11_av1_dec_debug
G_END_DECLS
/* *INDENT-ON* */
enum enum
{ {
PROP_0, PROP_0,

8
sys/d3d11/gstd3d11compositor.cpp
View file

@ -43,15 +43,11 @@
#include <string.h> #include <string.h>
#include <wrl.h> #include <wrl.h>
/* *INDENT-OFF* */
using namespace Microsoft::WRL;
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_compositor_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_compositor_debug);
#define GST_CAT_DEFAULT gst_d3d11_compositor_debug #define GST_CAT_DEFAULT gst_d3d11_compositor_debug
G_END_DECLS /* *INDENT-OFF* */
using namespace Microsoft::WRL;
/* *INDENT-ON* */ /* *INDENT-ON* */
/** /**

6
sys/d3d11/gstd3d11compositorbin.cpp
View file

@ -47,15 +47,9 @@
#include "gstd3d11compositor.h" #include "gstd3d11compositor.h"
#include "gstd3d11pluginutils.h" #include "gstd3d11pluginutils.h"
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_compositor_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_compositor_debug);
#define GST_CAT_DEFAULT gst_d3d11_compositor_debug #define GST_CAT_DEFAULT gst_d3d11_compositor_debug
G_END_DECLS
/* *INDENT-ON* */
/**************************** /****************************
* GstD3D11CompositorBinPad * * GstD3D11CompositorBinPad *
****************************/ ****************************/

8
sys/d3d11/gstd3d11converter.cpp
View file

@ -28,15 +28,11 @@
#include <wrl.h> #include <wrl.h>
#include <string.h> #include <string.h>
/* *INDENT-OFF* */
using namespace Microsoft::WRL;
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_converter_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_converter_debug);
#define GST_CAT_DEFAULT gst_d3d11_converter_debug #define GST_CAT_DEFAULT gst_d3d11_converter_debug
G_END_DECLS /* *INDENT-OFF* */
using namespace Microsoft::WRL;
/* *INDENT-ON* */ /* *INDENT-ON* */
#define CONVERTER_MAX_QUADS 2 #define CONVERTER_MAX_QUADS 2

8
sys/d3d11/gstd3d11deinterlace.cpp
View file

@ -42,15 +42,11 @@
#include <wrl.h> #include <wrl.h>
#include <string.h> #include <string.h>
/* *INDENT-OFF* */
using namespace Microsoft::WRL;
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_deinterlace_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_deinterlace_debug);
#define GST_CAT_DEFAULT gst_d3d11_deinterlace_debug #define GST_CAT_DEFAULT gst_d3d11_deinterlace_debug
G_END_DECLS /* *INDENT-OFF* */
using namespace Microsoft::WRL;
/* *INDENT-ON* */ /* *INDENT-ON* */
/* Deinterlacing Methods: /* Deinterlacing Methods:

8
sys/d3d11/gstd3d11desktopdup.cpp
View file

@ -53,15 +53,11 @@
#include <wrl.h> #include <wrl.h>
/* *INDENT-OFF* */
using namespace Microsoft::WRL;
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_desktop_dup_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_desktop_dup_debug);
#define GST_CAT_DEFAULT gst_d3d11_desktop_dup_debug #define GST_CAT_DEFAULT gst_d3d11_desktop_dup_debug
G_END_DECLS /* *INDENT-OFF* */
using namespace Microsoft::WRL;
/* List of GstD3D11DesktopDup weakref */ /* List of GstD3D11DesktopDup weakref */
G_LOCK_DEFINE_STATIC (dupl_list_lock); G_LOCK_DEFINE_STATIC (dupl_list_lock);

6
sys/d3d11/gstd3d11desktopdupsrc.cpp
View file

@ -42,15 +42,9 @@
#include <string.h> #include <string.h>
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_desktop_dup_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_desktop_dup_debug);
#define GST_CAT_DEFAULT gst_d3d11_desktop_dup_debug #define GST_CAT_DEFAULT gst_d3d11_desktop_dup_debug
G_END_DECLS
/* *INDENT-ON* */
enum enum
{ {
PROP_0, PROP_0,

6
sys/d3d11/gstd3d11h264dec.cpp
View file

@ -79,15 +79,9 @@
#include <d3d9.h> #include <d3d9.h>
#include <dxva.h> #include <dxva.h>
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_h264_dec_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_h264_dec_debug);
#define GST_CAT_DEFAULT gst_d3d11_h264_dec_debug #define GST_CAT_DEFAULT gst_d3d11_h264_dec_debug
G_END_DECLS
/* *INDENT-ON* */
enum enum
{ {
PROP_0, PROP_0,

6
sys/d3d11/gstd3d11h265dec.cpp
View file

@ -49,15 +49,9 @@
#include <d3d9.h> #include <d3d9.h>
#include <dxva.h> #include <dxva.h>
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_h265_dec_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_h265_dec_debug);
#define GST_CAT_DEFAULT gst_d3d11_h265_dec_debug #define GST_CAT_DEFAULT gst_d3d11_h265_dec_debug
G_END_DECLS
/* *INDENT-ON* */
enum enum
{ {
PROP_0, PROP_0,

6
sys/d3d11/gstd3d11mpeg2dec.cpp
View file

@ -49,15 +49,9 @@
#include <d3d9.h> #include <d3d9.h>
#include <dxva.h> #include <dxva.h>
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_mpeg2_dec_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_mpeg2_dec_debug);
#define GST_CAT_DEFAULT gst_d3d11_mpeg2_dec_debug #define GST_CAT_DEFAULT gst_d3d11_mpeg2_dec_debug
G_END_DECLS
/* *INDENT-ON* */
enum enum
{ {
PROP_0, PROP_0,

9
sys/d3d11/gstd3d11overlaycompositor.cpp
View file

@ -26,15 +26,12 @@
#include "gstd3d11pluginutils.h" #include "gstd3d11pluginutils.h"
#include <wrl.h> #include <wrl.h>
/* *INDENT-OFF* */
using namespace Microsoft::WRL;
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_overlay_compositor_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_overlay_compositor_debug);
#define GST_CAT_DEFAULT gst_d3d11_overlay_compositor_debug #define GST_CAT_DEFAULT gst_d3d11_overlay_compositor_debug
G_END_DECLS /* *INDENT-OFF* */
using namespace Microsoft::WRL;
typedef struct typedef struct
{ {
struct { struct {

6
sys/d3d11/gstd3d11pluginutils.cpp
View file

@ -27,15 +27,9 @@
#include <windows.h> #include <windows.h>
#include <versionhelpers.h> #include <versionhelpers.h>
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_plugin_utils_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_plugin_utils_debug);
#define GST_CAT_DEFAULT gst_d3d11_plugin_utils_debug #define GST_CAT_DEFAULT gst_d3d11_plugin_utils_debug
G_END_DECLS
/* *INDENT-ON* */
/* Max Texture Dimension for feature level 11_0 ~ 12_1 */ /* Max Texture Dimension for feature level 11_0 ~ 12_1 */
static guint _gst_d3d11_texture_max_dimension = 16384; static guint _gst_d3d11_texture_max_dimension = 16384;

6
sys/d3d11/gstd3d11shader.cpp
View file

@ -28,15 +28,11 @@
/* *INDENT-OFF* */ /* *INDENT-OFF* */
using namespace Microsoft::WRL; using namespace Microsoft::WRL;
/* *INDENT-ON* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_shader_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_shader_debug);
#define GST_CAT_DEFAULT gst_d3d11_shader_debug #define GST_CAT_DEFAULT gst_d3d11_shader_debug
G_END_DECLS
/* *INDENT-ON* */
/* too many const buffers doesn't make sense */ /* too many const buffers doesn't make sense */
#define MAX_CONST_BUFFERS 16 #define MAX_CONST_BUFFERS 16

6
sys/d3d11/gstd3d11videoprocessor.cpp
View file

@ -26,15 +26,9 @@
#include <string.h> #include <string.h>
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_video_processor_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_video_processor_debug);
#define GST_CAT_DEFAULT gst_d3d11_video_processor_debug #define GST_CAT_DEFAULT gst_d3d11_video_processor_debug
G_END_DECLS
/* *INDENT-ON* */
#if (GST_D3D11_HEADER_VERSION >= 1 && GST_D3D11_DXGI_HEADER_VERSION >= 4) #if (GST_D3D11_HEADER_VERSION >= 1 && GST_D3D11_DXGI_HEADER_VERSION >= 4)
#define HAVE_VIDEO_CONTEXT_ONE #define HAVE_VIDEO_CONTEXT_ONE
#endif #endif

6
sys/d3d11/gstd3d11vp8dec.cpp
View file

@ -49,15 +49,9 @@
#include <d3d9.h> #include <d3d9.h>
#include <dxva.h> #include <dxva.h>
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_vp8_dec_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_vp8_dec_debug);
#define GST_CAT_DEFAULT gst_d3d11_vp8_dec_debug #define GST_CAT_DEFAULT gst_d3d11_vp8_dec_debug
G_END_DECLS
/* *INDENT-ON* */
enum enum
{ {
PROP_0, PROP_0,

6
sys/d3d11/gstd3d11vp9dec.cpp
View file

@ -79,15 +79,9 @@
#include <d3d9.h> #include <d3d9.h>
#include <dxva.h> #include <dxva.h>
/* *INDENT-OFF* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_vp9_dec_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_vp9_dec_debug);
#define GST_CAT_DEFAULT gst_d3d11_vp9_dec_debug #define GST_CAT_DEFAULT gst_d3d11_vp9_dec_debug
G_END_DECLS
/* *INDENT-ON* */
enum enum
{ {
PROP_0, PROP_0,

6
sys/d3d11/gstd3d11window.cpp
View file

@ -35,16 +35,14 @@
#endif #endif
#include <wrl.h> #include <wrl.h>
/* *INDENT-OFF* */ /* *INDENT-OFF* */
using namespace Microsoft::WRL; using namespace Microsoft::WRL;
/* *INDENT-ON* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug);
#define GST_CAT_DEFAULT gst_d3d11_window_debug #define GST_CAT_DEFAULT gst_d3d11_window_debug
G_END_DECLS
/* *INDENT-ON* */
enum enum
{ {

3
sys/d3d11/gstd3d11window_corewindow.cpp
View file

@ -47,12 +47,9 @@ typedef ABI::Windows::Foundation::
__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t
IWindowSizeChangedEventHandler; IWindowSizeChangedEventHandler;
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug);
#define GST_CAT_DEFAULT gst_d3d11_window_debug #define GST_CAT_DEFAULT gst_d3d11_window_debug
G_END_DECLS
/* timeout to wait busy UI thread */ /* timeout to wait busy UI thread */
#define DEFAULT_ASYNC_TIMEOUT (10 * 1000) #define DEFAULT_ASYNC_TIMEOUT (10 * 1000)

6
sys/d3d11/gstd3d11window_dummy.cpp
View file

@ -28,15 +28,11 @@
/* *INDENT-OFF* */ /* *INDENT-OFF* */
using namespace Microsoft::WRL; using namespace Microsoft::WRL;
/* *INDENT-ON* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug);
#define GST_CAT_DEFAULT gst_d3d11_window_debug #define GST_CAT_DEFAULT gst_d3d11_window_debug
G_END_DECLS
/* *INDENT-ON* */
struct _GstD3D11WindowDummy struct _GstD3D11WindowDummy
{ {
GstD3D11Window parent; GstD3D11Window parent;

4
sys/d3d11/gstd3d11window_swapchainpanel.cpp
View file

@ -41,13 +41,9 @@ using namespace Microsoft::WRL::Wrappers;
using namespace ABI::Windows::UI; using namespace ABI::Windows::UI;
using namespace ABI::Windows::Foundation; using namespace ABI::Windows::Foundation;
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug);
#define GST_CAT_DEFAULT gst_d3d11_window_debug #define GST_CAT_DEFAULT gst_d3d11_window_debug
G_END_DECLS
/* timeout to wait busy UI thread */ /* timeout to wait busy UI thread */
#define DEFAULT_ASYNC_TIMEOUT (10 * 1000) #define DEFAULT_ASYNC_TIMEOUT (10 * 1000)

6
sys/d3d11/gstd3d11window_win32.cpp
View file

@ -29,15 +29,11 @@
/* *INDENT-OFF* */ /* *INDENT-OFF* */
using namespace Microsoft::WRL; using namespace Microsoft::WRL;
/* *INDENT-ON* */
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_window_debug);
#define GST_CAT_DEFAULT gst_d3d11_window_debug #define GST_CAT_DEFAULT gst_d3d11_window_debug
G_END_DECLS
/* *INDENT-ON* */
G_LOCK_DEFINE_STATIC (create_lock); G_LOCK_DEFINE_STATIC (create_lock);
#define EXTERNAL_PROC_PROP_NAME "d3d11_window_external_proc" #define EXTERNAL_PROC_PROP_NAME "d3d11_window_external_proc"

23
sys/d3d11/meson.build
View file

@ -13,7 +13,7 @@ d3d11_sources = [
'gstd3d11videosink.cpp', 'gstd3d11videosink.cpp',
'gstd3d11window.cpp', 'gstd3d11window.cpp',
'gstd3d11window_dummy.cpp', 'gstd3d11window_dummy.cpp',
'plugin.c', 'plugin.cpp',
] ]
d3d11_dec_sources = [ d3d11_dec_sources = [
@ -26,8 +26,8 @@ d3d11_dec_sources = [
'gstd3d11vp8dec.cpp', 'gstd3d11vp8dec.cpp',
] ]
extra_c_args = ['-DCOBJMACROS', '-DGST_USE_UNSTABLE_API'] extra_c_args = ['-DCOBJMACROS']
extra_cpp_args = ['-DGST_USE_UNSTABLE_API'] extra_args = ['-DGST_USE_UNSTABLE_API']
extra_dep = [] extra_dep = []
d3d11_option = get_option('d3d11') d3d11_option = get_option('d3d11')
@ -58,7 +58,7 @@ endif
# d3d11 video api uses dxva structure for decoding, and dxva.h needs d3d9 types # d3d11 video api uses dxva structure for decoding, and dxva.h needs d3d9 types
if cc.has_header('dxva.h') and cc.has_header('d3d9.h') if cc.has_header('dxva.h') and cc.has_header('d3d9.h')
d3d11_sources += d3d11_dec_sources d3d11_sources += d3d11_dec_sources
extra_c_args += ['-DHAVE_DXVA_H'] extra_args += ['-DHAVE_DXVA_H']
extra_dep += [gstcodecs_dep] extra_dep += [gstcodecs_dep]
has_decoder = true has_decoder = true
endif endif
@ -83,13 +83,13 @@ if d3d11_winapi_desktop
if d3d11_conf.get('GST_D3D11_DXGI_HEADER_VERSION') >= 6 if d3d11_conf.get('GST_D3D11_DXGI_HEADER_VERSION') >= 6
# Desktop Duplication API is unavailable for UWP # Desktop Duplication API is unavailable for UWP
# and MinGW is not supported due to some missing headers # and MinGW is not supported due to some missing headers
extra_c_args += ['-DHAVE_DXGI_DESKTOP_DUP'] extra_args += ['-DHAVE_DXGI_DESKTOP_DUP']
d3d11_sources += ['gstd3d11desktopdup.cpp', 'gstd3d11desktopdupsrc.cpp'] d3d11_sources += ['gstd3d11desktopdup.cpp', 'gstd3d11desktopdupsrc.cpp']
message('Enable D3D11 Desktop Duplication API') message('Enable D3D11 Desktop Duplication API')
endif endif
# multimedia clock is desktop only API # multimedia clock is desktop only API
if has_decoder and winmm_lib.found() and cc.has_header('timeapi.h') if has_decoder and winmm_lib.found() and cc.has_header('timeapi.h')
extra_cpp_args += ['-DHAVE_WINMM'] extra_args += ['-DHAVE_WINMM']
extra_dep += [winmm_lib] extra_dep += [winmm_lib]
endif endif
endif endif
@ -97,24 +97,23 @@ endif
# need dxgi1_5.h for HDR10 processing and d3d11_4.h for ID3D11VideoContext2 interface # need dxgi1_5.h for HDR10 processing and d3d11_4.h for ID3D11VideoContext2 interface
if d3d11_conf.get('GST_D3D11_DXGI_HEADER_VERSION') >= 5 and d3d11_conf.get('GST_D3D11_HEADER_VERSION') >= 4 if d3d11_conf.get('GST_D3D11_DXGI_HEADER_VERSION') >= 5 and d3d11_conf.get('GST_D3D11_HEADER_VERSION') >= 4
d3d11_sources += ['gstd3d11deinterlace.cpp'] d3d11_sources += ['gstd3d11deinterlace.cpp']
extra_c_args += ['-DHAVE_D3D11_VIDEO_PROC'] extra_args += ['-DHAVE_D3D11_VIDEO_PROC']
endif endif
# MinGW 32bits compiler seems to be complaining about redundant-decls # MinGW 32bits compiler seems to be complaining about redundant-decls
# when ComPtr is in use. Let's just disable the warning # when ComPtr is in use. Let's just disable the warning
if cc.get_id() != 'msvc' if cc.get_id() != 'msvc'
extra_args = cc.get_supported_arguments([ extra_mingw_args = cc.get_supported_arguments([
'-Wno-redundant-decls', '-Wno-redundant-decls',
]) ])
extra_c_args += extra_args extra_args += extra_mingw_args
extra_cpp_args += extra_args
endif endif
gstd3d11 = library('gstd3d11', gstd3d11 = library('gstd3d11',
d3d11_sources, d3d11_sources,
c_args : gst_plugins_bad_args + extra_c_args, c_args : gst_plugins_bad_args + extra_c_args + extra_args,
cpp_args: gst_plugins_bad_args + extra_cpp_args, cpp_args: gst_plugins_bad_args + extra_args,
include_directories : [configinc], include_directories : [configinc],
dependencies : [gstbase_dep, gstvideo_dep, gmodule_dep, gstcontroller_dep, gstd3d11_dep] + extra_dep, dependencies : [gstbase_dep, gstvideo_dep, gmodule_dep, gstcontroller_dep, gstd3d11_dep] + extra_dep,
install : true, install : true,

2
sys/d3d11/plugin.c → sys/d3d11/plugin.cpp
View file

@ -138,7 +138,7 @@ plugin_init (GstPlugin * plugin)
break; break;
device_handle = gst_d3d11_device_get_device_handle (device); device_handle = gst_d3d11_device_get_device_handle (device);
feature_level = ID3D11Device_GetFeatureLevel (device_handle); feature_level = device_handle->GetFeatureLevel ();
if (feature_level > max_feature_level) if (feature_level > max_feature_level)
max_feature_level = feature_level; max_feature_level = feature_level;