From 7624871b00346854573e992696607612be397a81 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Wed, 8 Mar 2023 22:54:35 +0900 Subject: [PATCH] va: Update "device-path" property description for Windows DRM does not make sense on Windows Part-of: --- subprojects/gst-plugins-bad/sys/va/gstvabasedec.c | 3 ++- subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c | 2 +- subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c | 2 +- subprojects/gst-plugins-bad/sys/va/gstvacompositor.c | 2 +- subprojects/gst-plugins-bad/sys/va/gstvapluginutils.h | 2 ++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c b/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c index 4f3c7c1150..1d3618f1d9 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c +++ b/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c @@ -748,7 +748,8 @@ gst_va_base_dec_class_init (GstVaBaseDecClass * klass, GstVaCodecs codec, g_object_class_install_property (object_class, GST_VA_DEC_PROP_DEVICE_PATH, g_param_spec_string ("device-path", "Device Path", - "DRM device path", NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + GST_VA_DEVICE_PATH_PROP_DESC, NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } /* XXX: if chroma has not an available format, the first format is diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c b/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c index 06ee8dbbb4..8f85495dc0 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c +++ b/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c @@ -918,7 +918,7 @@ gst_va_base_enc_class_init (GstVaBaseEncClass * klass) * It shows the DRM device path used for the VA operation, if any. */ properties[PROP_DEVICE_PATH] = g_param_spec_string ("device-path", - "Device Path", "DRM device path", NULL, + "Device Path", GST_VA_DEVICE_PATH_PROP_DESC, NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (gobject_class, N_PROPERTIES, properties); diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c b/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c index 4379bf5a1c..ad7388acbc 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c +++ b/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c @@ -648,7 +648,7 @@ gst_va_base_transform_class_init (GstVaBaseTransformClass * klass) * Since: 1.22 */ properties[PROP_DEVICE_PATH] = g_param_spec_string ("device-path", - "Device Path", "DRM device path", NULL, + "Device Path", GST_VA_DEVICE_PATH_PROP_DESC, NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (gobject_class, N_PROPERTIES, properties); diff --git a/subprojects/gst-plugins-bad/sys/va/gstvacompositor.c b/subprojects/gst-plugins-bad/sys/va/gstvacompositor.c index f54267eb08..4cc7ebd1d7 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvacompositor.c +++ b/subprojects/gst-plugins-bad/sys/va/gstvacompositor.c @@ -1407,7 +1407,7 @@ gst_va_compositor_class_init (gpointer g_class, gpointer class_data) * It shows the DRM device path used for the VA operation, if any. */ properties[PROP_DEVICE_PATH] = g_param_spec_string ("device-path", - "Device Path", "DRM device path", NULL, + "Device Path", GST_VA_DEVICE_PATH_PROP_DESC, NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** diff --git a/subprojects/gst-plugins-bad/sys/va/gstvapluginutils.h b/subprojects/gst-plugins-bad/sys/va/gstvapluginutils.h index 5852d77041..58f6ad314c 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvapluginutils.h +++ b/subprojects/gst-plugins-bad/sys/va/gstvapluginutils.h @@ -27,8 +27,10 @@ G_BEGIN_DECLS #ifdef G_OS_WIN32 #define GST_IS_VA_DISPLAY_PLATFORM(dpy) GST_IS_VA_DISPLAY_WIN32(dpy) +#define GST_VA_DEVICE_PATH_PROP_DESC "DXGI Adapter LUID" #else #define GST_IS_VA_DISPLAY_PLATFORM(dpy) GST_IS_VA_DISPLAY_DRM(dpy) +#define GST_VA_DEVICE_PATH_PROP_DESC "DRM device path" #endif GstVaDisplay * gst_va_display_platform_new (const gchar * path);