1 files changed, 12 insertions, 62 deletions

diff --git a/sys/d3d11/gstd3d11av1dec.cpp b/sys/d3d11/gstd3d11av1dec.cpp
index c47959899..e148dbb6c 100644
--- a/sys/d3d11/gstd3d11av1dec.cpp
+++ b/sys/d3d11/gstd3d11av1dec.cpp
@@ -350,14 +350,6 @@ typedef struct _GST_DXVA_Tile_AV1
 
 #pragma pack(pop)
 
-enum
-{
-  PROP_0,
-  PROP_ADAPTER,
-  PROP_DEVICE_ID,
-  PROP_VENDOR_ID,
-};
-
 /* reference list 8 + 4 margin */
 #define NUM_OUTPUT_VIEW 12
 
@@ -386,9 +378,7 @@ typedef struct _GstD3D11AV1Dec
 typedef struct _GstD3D11AV1DecClass
 {
   GstAV1DecoderClass parent_class;
-  guint adapter;
-  guint device_id;
-  guint vendor_id;
+  GstD3D11DecoderSubClassData class_data;
 } GstD3D11AV1DecClass;
 
 static GstElementClass *parent_class = NULL;
@@ -438,48 +428,17 @@ gst_d3d11_av1_dec_class_init (GstD3D11AV1DecClass * klass, gpointer data)
   GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
   GstAV1DecoderClass *av1decoder_class = GST_AV1_DECODER_CLASS (klass);
   GstD3D11DecoderClassData *cdata = (GstD3D11DecoderClassData *) data;
-  gchar *long_name;
 
   gobject_class->get_property = gst_d3d11_av1_dec_get_property;
   gobject_class->dispose = gst_d3d11_av1_dec_dispose;
 
-  g_object_class_install_property (gobject_class, PROP_ADAPTER,
-      g_param_spec_uint ("adapter", "Adapter",
-          "DXGI Adapter index for creating device",
-          0, G_MAXUINT32, cdata->adapter,
-          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
-  g_object_class_install_property (gobject_class, PROP_DEVICE_ID,
-      g_param_spec_uint ("device-id", "Device Id",
-          "DXGI Device ID", 0, G_MAXUINT32, 0,
-          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
-  g_object_class_install_property (gobject_class, PROP_VENDOR_ID,
-      g_param_spec_uint ("vendor-id", "Vendor Id",
-          "DXGI Vendor ID", 0, G_MAXUINT32, 0,
-          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
-
-  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
-
-  klass->adapter = cdata->adapter;
-  klass->device_id = cdata->device_id;
-  klass->vendor_id = cdata->vendor_id;
-
   element_class->set_context =
       GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_set_context);
 
-  long_name =
-      g_strdup_printf ("Direct3D11/DXVA AV1 %s Decoder", cdata->description);
-  gst_element_class_set_metadata (element_class, long_name,
-      "Codec/Decoder/Video/Hardware", "A Direct3D11/DXVA AV1 video decoder",
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+  gst_d3d11_decoder_class_data_fill_subclass_data (cdata, &klass->class_data);
+  gst_d3d11_decoder_proxy_class_init (element_class, cdata,
       "Seungha Yang <seungha@centricular.com>");
-  g_free (long_name);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
-          cdata->sink_caps));
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
-          cdata->src_caps));
-  gst_d3d11_decoder_class_data_free (cdata);
 
   decoder_class->open = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_open);
   decoder_class->close = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_close);
@@ -516,21 +475,9 @@ gst_d3d11_av1_dec_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec)
 {
   GstD3D11AV1DecClass *klass = GST_D3D11_AV1_DEC_GET_CLASS (object);
+  GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  switch (prop_id) {
-    case PROP_ADAPTER:
-      g_value_set_uint (value, klass->adapter);
-      break;
-    case PROP_DEVICE_ID:
-      g_value_set_uint (value, klass->device_id);
-      break;
-    case PROP_VENDOR_ID:
-      g_value_set_uint (value, klass->vendor_id);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
+  gst_d3d11_decoder_proxy_get_property (object, prop_id, value, pspec, cdata);
 }
 
 static void
@@ -548,8 +495,9 @@ gst_d3d11_av1_dec_set_context (GstElement * element, GstContext * context)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (element);
   GstD3D11AV1DecClass *klass = GST_D3D11_AV1_DEC_GET_CLASS (self);
+  GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  gst_d3d11_handle_set_context (element, context, klass->adapter,
+  gst_d3d11_handle_set_context (element, context, cdata->adapter,
       &self->device);
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
@@ -560,8 +508,9 @@ gst_d3d11_av1_dec_open (GstVideoDecoder * decoder)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
   GstD3D11AV1DecClass *klass = GST_D3D11_AV1_DEC_GET_CLASS (self);
+  GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  if (!gst_d3d11_ensure_element_data (GST_ELEMENT_CAST (self), klass->adapter,
+  if (!gst_d3d11_ensure_element_data (GST_ELEMENT_CAST (self), cdata->adapter,
           &self->device)) {
     GST_ERROR_OBJECT (self, "Cannot create d3d11device");
     return FALSE;
@@ -1470,7 +1419,8 @@ gst_d3d11_av1_dec_register (GstPlugin * plugin, GstD3D11Device * device,
       "height", GST_TYPE_INT_RANGE, 1, resolution, NULL);
 
   type_info.class_data =
-      gst_d3d11_decoder_class_data_new (device, sink_caps, src_caps);
+      gst_d3d11_decoder_class_data_new (device, GST_D3D11_CODEC_AV1,
+      sink_caps, src_caps);
 
   type_name = g_strdup ("GstD3D11AV1Dec");
   feature_name = g_strdup ("d3d11av1dec");