Skip to content
Snippets Groups Projects
Commit 0bb73ec8 authored by Seungha Yang's avatar Seungha Yang :sheep:
Browse files

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: <!1747>
parent be131dba
No related branches found
No related tags found
2 merge requests!1896Fix for gst-plugins-good issues/818. [Enhancement] dvbsuboverlay: Dynamic...,!1747d3d11decoder: Get rid of framerate field from pad template
......@@ -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);
......
......@@ -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 */
......
......@@ -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);
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment