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

qsv: Move debug init into each source file

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2206>
This commit is contained in:
Seungha Yang 2022-04-17 00:00:55 +09:00
parent a9a49c235d
commit 3c3274a8da
8 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
subprojects/gst-plugins-bad/sys/qsv/gstqsvdecoder.cpp
View file

@ -37,7 +37,7 @@ using namespace Microsoft::WRL;
#include "gstqsvallocator_va.h" #include "gstqsvallocator_va.h"
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
GST_DEBUG_CATEGORY_EXTERN (gst_qsv_decoder_debug); GST_DEBUG_CATEGORY_STATIC (gst_qsv_decoder_debug);
#define GST_CAT_DEFAULT gst_qsv_decoder_debug #define GST_CAT_DEFAULT gst_qsv_decoder_debug
#define GST_QSV_DECODER_FLOW_NEW_SEQUENCE GST_FLOW_CUSTOM_SUCCESS_1 #define GST_QSV_DECODER_FLOW_NEW_SEQUENCE GST_FLOW_CUSTOM_SUCCESS_1
@ -101,8 +101,10 @@ struct _GstQsvDecoderPrivate
}; };
#define gst_qsv_decoder_parent_class parent_class #define gst_qsv_decoder_parent_class parent_class
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GstQsvDecoder, gst_qsv_decoder, G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstQsvDecoder, gst_qsv_decoder,
GST_TYPE_VIDEO_DECODER); GST_TYPE_VIDEO_DECODER, G_ADD_PRIVATE (GstQsvDecoder);
GST_DEBUG_CATEGORY_INIT (gst_qsv_decoder_debug,
"qsvdecoder", 0, "qsvdecoder"));
static void gst_qsv_decoder_get_property (GObject * object, guint prop_id, static void gst_qsv_decoder_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);

8
subprojects/gst-plugins-bad/sys/qsv/gstqsvencoder.cpp
View file

@ -38,7 +38,7 @@ using namespace Microsoft::WRL;
#include "gstqsvallocator_va.h" #include "gstqsvallocator_va.h"
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
GST_DEBUG_CATEGORY_EXTERN (gst_qsv_encoder_debug); GST_DEBUG_CATEGORY_STATIC (gst_qsv_encoder_debug);
#define GST_CAT_DEFAULT gst_qsv_encoder_debug #define GST_CAT_DEFAULT gst_qsv_encoder_debug
GType GType
@ -129,8 +129,10 @@ struct _GstQsvEncoderPrivate
}; };
#define gst_qsv_encoder_parent_class parent_class #define gst_qsv_encoder_parent_class parent_class
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GstQsvEncoder, gst_qsv_encoder, G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstQsvEncoder, gst_qsv_encoder,
GST_TYPE_VIDEO_ENCODER); GST_TYPE_VIDEO_ENCODER, G_ADD_PRIVATE (GstQsvEncoder);
GST_DEBUG_CATEGORY_INIT (gst_qsv_encoder_debug,
"qsvencoder", 0, "qsvencoder"));
static void gst_qsv_encoder_dispose (GObject * object); static void gst_qsv_encoder_dispose (GObject * object);
static void gst_qsv_encoder_finalize (GObject * object); static void gst_qsv_encoder_finalize (GObject * object);

5
subprojects/gst-plugins-bad/sys/qsv/gstqsvh264dec.cpp
View file

@ -31,7 +31,7 @@
#include <gst/va/gstvadisplay_drm.h> #include <gst/va/gstvadisplay_drm.h>
#endif #endif
GST_DEBUG_CATEGORY_EXTERN (gst_qsv_h264_dec_debug); GST_DEBUG_CATEGORY_STATIC (gst_qsv_h264_dec_debug);
#define GST_CAT_DEFAULT gst_qsv_h264_dec_debug #define GST_CAT_DEFAULT gst_qsv_h264_dec_debug
typedef struct _GstQsvH264Dec typedef struct _GstQsvH264Dec
@ -97,6 +97,9 @@ gst_qsv_h264_dec_register (GstPlugin * plugin, guint rank, guint impl_index,
}; };
Resolution max_resolution; Resolution max_resolution;
GST_DEBUG_CATEGORY_INIT (gst_qsv_h264_dec_debug,
"qsvh264dec", 0, "qsvh264dec");
memset (&param, 0, sizeof (mfxVideoParam)); memset (&param, 0, sizeof (mfxVideoParam));
memset (&max_resolution, 0, sizeof (Resolution)); memset (&max_resolution, 0, sizeof (Resolution));

5
subprojects/gst-plugins-bad/sys/qsv/gstqsvh264enc.cpp
View file

@ -35,7 +35,7 @@
#include <gst/va/gstva.h> #include <gst/va/gstva.h>
#endif #endif
GST_DEBUG_CATEGORY_EXTERN (gst_qsv_h264_enc_debug); GST_DEBUG_CATEGORY_STATIC (gst_qsv_h264_enc_debug);
#define GST_CAT_DEFAULT gst_qsv_h264_enc_debug #define GST_CAT_DEFAULT gst_qsv_h264_enc_debug
typedef enum typedef enum
@ -1715,6 +1715,9 @@ gst_qsv_h264_enc_register (GstPlugin * plugin, guint rank, guint impl_index,
Resolution max_resolution; Resolution max_resolution;
bool supports_interlaced = false; bool supports_interlaced = false;
GST_DEBUG_CATEGORY_INIT (gst_qsv_h264_enc_debug,
"qsvh264enc", 0, "qsvh264enc");
memset (&param, 0, sizeof (mfxVideoParam)); memset (&param, 0, sizeof (mfxVideoParam));
memset (&max_resolution, 0, sizeof (Resolution)); memset (&max_resolution, 0, sizeof (Resolution));

5
subprojects/gst-plugins-bad/sys/qsv/gstqsvh265enc.cpp
View file

@ -34,7 +34,7 @@
#include <gst/va/gstva.h> #include <gst/va/gstva.h>
#endif #endif
GST_DEBUG_CATEGORY_EXTERN (gst_qsv_h265_enc_debug); GST_DEBUG_CATEGORY_STATIC (gst_qsv_h265_enc_debug);
#define GST_CAT_DEFAULT gst_qsv_h265_enc_debug #define GST_CAT_DEFAULT gst_qsv_h265_enc_debug
typedef enum typedef enum
@ -1355,6 +1355,9 @@ gst_qsv_h265_enc_register (GstPlugin * plugin, guint rank, guint impl_index,
mfxExtBuffer *ext_buffers[2]; mfxExtBuffer *ext_buffers[2];
gboolean hdr10_aware = FALSE; gboolean hdr10_aware = FALSE;
GST_DEBUG_CATEGORY_INIT (gst_qsv_h265_enc_debug,
"qsvh265enc", 0, "qsvh265enc");
memset (&param, 0, sizeof (mfxVideoParam)); memset (&param, 0, sizeof (mfxVideoParam));
memset (&max_resolution, 0, sizeof (Resolution)); memset (&max_resolution, 0, sizeof (Resolution));
memset (&cll, 0, sizeof (mfxExtContentLightLevelInfo)); memset (&cll, 0, sizeof (mfxExtContentLightLevelInfo));

5
subprojects/gst-plugins-bad/sys/qsv/gstqsvjpegenc.cpp
View file

@ -33,7 +33,7 @@
#include <gst/va/gstva.h> #include <gst/va/gstva.h>
#endif #endif
GST_DEBUG_CATEGORY_EXTERN (gst_qsv_jpeg_enc_debug); GST_DEBUG_CATEGORY_STATIC (gst_qsv_jpeg_enc_debug);
#define GST_CAT_DEFAULT gst_qsv_jpeg_enc_debug #define GST_CAT_DEFAULT gst_qsv_jpeg_enc_debug
enum enum
@ -356,6 +356,9 @@ gst_qsv_jpeg_enc_register (GstPlugin * plugin, guint rank, guint impl_index,
mfxStatus status; mfxStatus status;
gboolean interlaved = TRUE; gboolean interlaved = TRUE;
GST_DEBUG_CATEGORY_INIT (gst_qsv_jpeg_enc_debug,
"qsvjpegenc", 0, "qsvjpegenc");
memset (&param, 0, sizeof (mfxVideoParam)); memset (&param, 0, sizeof (mfxVideoParam));
memset (&max_resolution, 0, sizeof (Resolution)); memset (&max_resolution, 0, sizeof (Resolution));

4
subprojects/gst-plugins-bad/sys/qsv/gstqsvvp9enc.cpp
View file

@ -33,7 +33,7 @@
#include <gst/va/gstva.h> #include <gst/va/gstva.h>
#endif #endif
GST_DEBUG_CATEGORY_EXTERN (gst_qsv_vp9_enc_debug); GST_DEBUG_CATEGORY_STATIC (gst_qsv_vp9_enc_debug);
#define GST_CAT_DEFAULT gst_qsv_vp9_enc_debug #define GST_CAT_DEFAULT gst_qsv_vp9_enc_debug
#define GST_TYPE_QSV_VP9_ENC_RATE_CONTROL (gst_qsv_vp9_enc_rate_control_get_type ()) #define GST_TYPE_QSV_VP9_ENC_RATE_CONTROL (gst_qsv_vp9_enc_rate_control_get_type ())
@ -800,6 +800,8 @@ gst_qsv_vp9_enc_register (GstPlugin * plugin, guint rank, guint impl_index,
mfxExtVP9Param vp9_param; mfxExtVP9Param vp9_param;
mfxExtBuffer *ext_bufs[1]; mfxExtBuffer *ext_bufs[1];
GST_DEBUG_CATEGORY_INIT (gst_qsv_vp9_enc_debug, "qsvvp9enc", 0, "qsvvp9enc");
memset (&param, 0, sizeof (mfxVideoParam)); memset (&param, 0, sizeof (mfxVideoParam));
memset (&max_resolution, 0, sizeof (Resolution)); memset (&max_resolution, 0, sizeof (Resolution));

25
subprojects/gst-plugins-bad/sys/qsv/plugin.cpp
View file

@ -43,13 +43,6 @@
GST_DEBUG_CATEGORY (gst_qsv_debug); GST_DEBUG_CATEGORY (gst_qsv_debug);
GST_DEBUG_CATEGORY (gst_qsv_allocator_debug); GST_DEBUG_CATEGORY (gst_qsv_allocator_debug);
GST_DEBUG_CATEGORY (gst_qsv_decoder_debug);
GST_DEBUG_CATEGORY (gst_qsv_encoder_debug);
GST_DEBUG_CATEGORY (gst_qsv_h264_dec_debug);
GST_DEBUG_CATEGORY (gst_qsv_h264_enc_debug);
GST_DEBUG_CATEGORY (gst_qsv_h265_enc_debug);
GST_DEBUG_CATEGORY (gst_qsv_jpeg_enc_debug);
GST_DEBUG_CATEGORY (gst_qsv_vp9_enc_debug);
#define GST_CAT_DEFAULT gst_qsv_debug #define GST_CAT_DEFAULT gst_qsv_debug
@ -205,6 +198,8 @@ plugin_init (GstPlugin * plugin)
#endif #endif
GST_DEBUG_CATEGORY_INIT (gst_qsv_debug, "qsv", 0, "Intel Quick Sync Video"); GST_DEBUG_CATEGORY_INIT (gst_qsv_debug, "qsv", 0, "Intel Quick Sync Video");
GST_DEBUG_CATEGORY_INIT (gst_qsv_allocator_debug,
"qsvallocator", 0, "qsvallocator");
loader = gst_qsv_get_loader (); loader = gst_qsv_get_loader ();
if (!loader) if (!loader)
@ -218,22 +213,6 @@ plugin_init (GstPlugin * plugin)
GST_INFO ("Found %d platform devices", g_list_length (platform_devices)); GST_INFO ("Found %d platform devices", g_list_length (platform_devices));
GST_DEBUG_CATEGORY_INIT (gst_qsv_allocator_debug,
"qsvallocator", 0, "qsvallocator");
GST_DEBUG_CATEGORY_INIT (gst_qsv_decoder_debug,
"qsvdecoder", 0, "qsvdecoder");
GST_DEBUG_CATEGORY_INIT (gst_qsv_encoder_debug,
"qsvencoder", 0, "qsvencoder");
GST_DEBUG_CATEGORY_INIT (gst_qsv_h264_dec_debug,
"qsvh264dec", 0, "qsvh264dec");
GST_DEBUG_CATEGORY_INIT (gst_qsv_h264_enc_debug,
"qsvh264enc", 0, "qsvh264enc");
GST_DEBUG_CATEGORY_INIT (gst_qsv_h265_enc_debug,
"qsvh265enc", 0, "qsvh265enc");
GST_DEBUG_CATEGORY_INIT (gst_qsv_jpeg_enc_debug,
"qsvjpegenc", 0, "qsvjpegenc");
GST_DEBUG_CATEGORY_INIT (gst_qsv_vp9_enc_debug, "qsvvp9enc", 0, "qsvvp9enc");
do { do {
mfxStatus status = MFX_ERR_NONE; mfxStatus status = MFX_ERR_NONE;
mfxSession session = nullptr; mfxSession session = nullptr;