d3d11decoder: Get rid of framerate field from pad template

Framerate is optional value and we don't have any framerate
related restriction for those elements. This commit is to fix
negotiation failure when upstream doesn't set framerate on caps.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1747>

diff --git a/sys/d3d11/gstd3d11h264dec.c b/sys/d3d11/gstd3d11h264dec.c
index dffc2e4..42fbbb3 100644 (file)
--- a/sys/d3d11/gstd3d11h264dec.c
+++ b/sys/d3d11/gstd3d11h264dec.c
@@ -1199,13 +1199,10 @@ gst_d3d11_h264_dec_register (GstPlugin * plugin, GstD3D11Device * device,
   sink_caps = gst_caps_from_string ("video/x-h264, "
       "stream-format= (string) { avc, avc3, byte-stream }, "
       "alignment= (string) au, "
-      "profile = (string) { high, main, constrained-baseline, baseline }, "
-      "framerate = " GST_VIDEO_FPS_RANGE);
+      "profile = (string) { high, main, constrained-baseline, baseline }");
   src_caps = gst_caps_from_string ("video/x-raw("
-      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "), format = (string) NV12, "
-      "framerate = " GST_VIDEO_FPS_RANGE ";"
-      "video/x-raw, format = (string) NV12, "
-      "framerate = " GST_VIDEO_FPS_RANGE);
+      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "), format = (string) NV12; "
+      "video/x-raw, format = (string) NV12");
 
   /* To cover both landscape and portrait, select max value */
   resolution = MAX (max_width, max_height);

diff --git a/sys/d3d11/gstd3d11h265dec.c b/sys/d3d11/gstd3d11h265dec.c
index 7aabf3a..11b31ce 100644 (file)
--- a/sys/d3d11/gstd3d11h265dec.c
+++ b/sys/d3d11/gstd3d11h265dec.c
@@ -1443,11 +1443,9 @@ gst_d3d11_h265_dec_register (GstPlugin * plugin, GstD3D11Device * device,
 
   sink_caps = gst_caps_from_string ("video/x-h265, "
       "stream-format=(string) { hev1, hvc1, byte-stream }, "
-      "alignment= (string) au, " "framerate = " GST_VIDEO_FPS_RANGE);
+      "alignment= (string) au");
   src_caps = gst_caps_from_string ("video/x-raw("
-      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "), "
-      "framerate = " GST_VIDEO_FPS_RANGE ";"
-      "video/x-raw, " "framerate = " GST_VIDEO_FPS_RANGE);
+      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "); video/x-raw");
 
   if (have_main10) {
     /* main10 profile covers main and main10 */

diff --git a/sys/d3d11/gstd3d11vp8dec.c b/sys/d3d11/gstd3d11vp8dec.c
index f1e0aab..bed32a3 100644 (file)
--- a/sys/d3d11/gstd3d11vp8dec.c
+++ b/sys/d3d11/gstd3d11vp8dec.c
@@ -882,12 +882,9 @@ gst_d3d11_vp8_dec_register (GstPlugin * plugin, GstD3D11Device * device,
     return;
   }
 
-  sink_caps = gst_caps_from_string ("video/x-vp8, "
-      "framerate = " GST_VIDEO_FPS_RANGE);
+  sink_caps = gst_caps_from_string ("video/x-vp8");
   src_caps = gst_caps_from_string ("video/x-raw("
-      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "), "
-      "framerate = " GST_VIDEO_FPS_RANGE ";"
-      "video/x-raw, " "framerate = " GST_VIDEO_FPS_RANGE);
+      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "); video/x-raw");
 
   gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", NULL);
 

diff --git a/sys/d3d11/gstd3d11vp9dec.c b/sys/d3d11/gstd3d11vp9dec.c
index 07e04fd..ced92cc 100644 (file)
--- a/sys/d3d11/gstd3d11vp9dec.c
+++ b/sys/d3d11/gstd3d11vp9dec.c
@@ -1160,12 +1160,9 @@ gst_d3d11_vp9_dec_register (GstPlugin * plugin, GstD3D11Device * device,
     return;
   }
 
-  sink_caps = gst_caps_from_string ("video/x-vp9, "
-      "alignment = (string) frame, framerate = " GST_VIDEO_FPS_RANGE);
+  sink_caps = gst_caps_from_string ("video/x-vp9, alignment = (string) frame");
   src_caps = gst_caps_from_string ("video/x-raw("
-      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "), "
-      "framerate = " GST_VIDEO_FPS_RANGE ";"
-      "video/x-raw, " "framerate = " GST_VIDEO_FPS_RANGE);
+      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "); video/x-raw");
 
   g_value_init (&vp9_profiles, GST_TYPE_LIST);