d3d11colorconvert: Remove device type dependent behavior

If d3d11colorconvert element is configured, do color space conversion
regardless of the device type whether it's S/W emulation or real H/W.
Since d3d11colorconvert is no more a child of d3d11videosinkbin,
we don't need this behavior. Note that previous code was added to
avoid color space conversion from d3d11videosink if no hardware
device is available (S/W emulation of d3d11 is too slow).

diff --git a/sys/d3d11/gstd3d11colorconvert.c b/sys/d3d11/gstd3d11colorconvert.c
index 92c4ba5..821d66d 100644 (file)
--- a/sys/d3d11/gstd3d11colorconvert.c
+++ b/sys/d3d11/gstd3d11colorconvert.c
@@ -90,7 +90,6 @@ gst_d3d11_color_convert_propose_allocation (GstBaseTransform * trans,
 static gboolean
 gst_d3d11_color_convert_decide_allocation (GstBaseTransform * trans,
     GstQuery * query);
-static gboolean gst_d3d11_color_convert_start (GstBaseTransform * trans);
 
 static GstFlowReturn gst_d3d11_color_convert_transform (GstBaseTransform *
     trans, GstBuffer * inbuf, GstBuffer * outbuf);
@@ -171,7 +170,6 @@ gst_d3d11_color_convert_class_init (GstD3D11ColorConvertClass * klass)
       GST_DEBUG_FUNCPTR (gst_d3d11_color_convert_decide_allocation);
   trans_class->transform =
       GST_DEBUG_FUNCPTR (gst_d3d11_color_convert_transform);
-  trans_class->start = GST_DEBUG_FUNCPTR (gst_d3d11_color_convert_start);
   trans_class->query = GST_DEBUG_FUNCPTR (gst_d3d11_color_convert_query);
 
   bfilter_class->set_info =
@@ -237,15 +235,11 @@ static GstCaps *
 gst_d3d11_color_convert_transform_caps (GstBaseTransform *
     trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter)
 {
-  GstD3D11ColorConvert *self = GST_D3D11_COLOR_CONVERT (trans);
   GstCaps *tmp, *tmp2;
   GstCaps *result;
 
   /* Get all possible caps that we can transform to */
-  if (self->can_convert)
-    tmp = gst_d3d11_color_convert_caps_remove_format_info (caps);
-  else
-    tmp = gst_caps_copy (caps);
+  tmp = gst_d3d11_color_convert_caps_remove_format_info (caps);
 
   if (filter) {
     tmp2 = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
@@ -461,28 +455,6 @@ gst_d3d11_color_convert_decide_allocation (GstBaseTransform * trans,
 }
 
 static gboolean
-gst_d3d11_color_convert_start (GstBaseTransform * trans)
-{
-  GstD3D11BaseFilter *filter = GST_D3D11_BASE_FILTER (trans);
-  GstD3D11ColorConvert *self = GST_D3D11_COLOR_CONVERT (trans);
-  gboolean is_hardware;
-
-  if (!GST_BASE_TRANSFORM_CLASS (parent_class)->start (trans))
-    return FALSE;
-
-  g_object_get (filter->device, "hardware", &is_hardware, NULL);
-
-  if (!is_hardware) {
-    GST_WARNING_OBJECT (trans, "D3D11 device is running on software emulation");
-    self->can_convert = FALSE;
-  } else {
-    self->can_convert = TRUE;
-  }
-
-  return TRUE;
-}
-
-static gboolean
 gst_d3d11_color_convert_query (GstBaseTransform * trans,
     GstPadDirection direction, GstQuery * query)
 {
@@ -714,6 +686,9 @@ gst_d3d11_color_convert_set_info (GstD3D11BaseFilter * filter,
   GstD3D11ColorConvert *self = GST_D3D11_COLOR_CONVERT (filter);
   const GstVideoInfo *unknown_info;
 
+  if (gst_base_transform_is_passthrough (GST_BASE_TRANSFORM (filter)))
+    return TRUE;
+
   gst_d3d11_color_convert_clear_shader_resource (self);
 
   GST_DEBUG_OBJECT (self, "Setup convert with format %s -> %s",
@@ -733,10 +708,6 @@ gst_d3d11_color_convert_set_info (GstD3D11BaseFilter * filter,
   if (in_info->interlace_mode != out_info->interlace_mode)
     goto format_mismatch;
 
-  /* do not need to setup converter */
-  if (!self->can_convert)
-    return TRUE;
-
   /* don't need to create converter */
   if (GST_VIDEO_INFO_FORMAT (in_info) == GST_VIDEO_INFO_FORMAT (out_info))
     return TRUE;

diff --git a/sys/d3d11/gstd3d11colorconvert.h b/sys/d3d11/gstd3d11colorconvert.h
index 9a1db7f..4bb89fe 100644 (file)
--- a/sys/d3d11/gstd3d11colorconvert.h
+++ b/sys/d3d11/gstd3d11colorconvert.h
@@ -50,8 +50,6 @@ struct _GstD3D11ColorConvert
   guint num_output_view;
 
   GstD3D11ColorConverter *converter;
-
-  gboolean can_convert;
 };
 
 struct _GstD3D11ColorConvertClass