vaapidecode: reorder src caps template
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>
Fri, 7 Feb 2020 15:50:52 +0000 (16:50 +0100)
committerVíctor Manuel Jáquez Leal <vjaquez@igalia.com>
Mon, 27 Jul 2020 17:01:54 +0000 (19:01 +0200)
Since negotiation depends on caps order, first is VA, then DMABuf,
later GLUploadTexture (deprecated) and finally raw.

Also, for decoders, the possible available color formats for DMABuf
is extended to all the possible VA color formats.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/366>

gst/vaapi/gstvaapidecode.c

index 0f631e7..c1be7ba 100644 (file)
@@ -78,12 +78,12 @@ static const char gst_vaapidecode_sink_caps_str[] =
     ;
 
 static const char gst_vaapidecode_src_caps_str[] =
-    GST_VAAPI_MAKE_SURFACE_CAPS ";"
+    GST_VAAPI_MAKE_SURFACE_CAPS "; "
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) " ;"
 #if (USE_GLX || USE_EGL)
-    GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS ";"
+    GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS "; "
 #endif
-    GST_VIDEO_CAPS_MAKE(GST_VAAPI_FORMATS_ALL) ";"
-    GST_VAAPI_MAKE_DMABUF_CAPS;
+    GST_VIDEO_CAPS_MAKE(GST_VAAPI_FORMATS_ALL);
 
 static GstStaticPadTemplate gst_vaapidecode_src_factory =
     GST_STATIC_PAD_TEMPLATE(