vaapidecode: build allowed srcpad caps from va context

Instead of generating allowed srcpad caps with generic information,
now it takes the size an formats limits from the decoder's context.

This is possible since srcpad caps are generated after the internal
decoder is created.

The patch replaces gst_vaapi_decoder_get_surface_formats() with
gst_vaapi_decoder_get_suface_attributes().

From these attributes, formats are only used for VASurface memory
caps feature. For system memory caps feature, the old
gst_vaapi_plugin_get_allowed_srcpad_caps() is still used, since
i965 jpeg decoder cannot deliver mappable format for gstreamer.
And for the other caps features (dmabuf and texture upload) the
same static list are used.

This patch also adds DMABuf caps feature only if the context
supports that memory type. Nonetheless, we keep the pre-defined
formats since they are the subset of common derive formats formats
supported either by amd/gallium and both intel drivers, since,
when exporting the fd through vaAcquireBufferHandle()/
vaReleaseBufferHandle(), the formats of the derivable image cannot
be retriebable from the driver. Later we'll use the attribute
formats for the DMABuf feature too, when the code be ported to
vaExportSurfaceHandle().

Finally, the allowed srcpad caps are removed if the internal decoder
is destroyed, since context attribues will change.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/366>
This commit is contained in:
Víctor Manuel Jáquez Leal 2020-01-22 17:41:28 +01:00
parent f04dd7f331
commit 634fefab5d
3 changed files with 135 additions and 45 deletions

View file

@ -1124,24 +1124,6 @@ gst_vaapi_decoder_decode_codec_data (GstVaapiDecoder * decoder)
return status;
}
/**
* gst_vaapi_decoder_get_surface_formats:
* @decoder: a #GstVaapiDecoder
*
* Retrieves an array of #GstVideoFormat which the output surfaces of
* the @decoder can handle.
*
* Return value: (transfer full): a #GArray of #GstVideoFormat or
* %NULL
*/
GArray *
gst_vaapi_decoder_get_surface_formats (GstVaapiDecoder * decoder)
{
if (decoder && decoder->context)
return gst_vaapi_context_get_surface_formats (decoder->context);
return NULL;
}
/**
* gst_vaapi_decoder_update_caps:
* @decoder: a #GstVaapiDecoder
@ -1189,3 +1171,50 @@ gst_vaapi_decoder_update_caps (GstVaapiDecoder * decoder, GstCaps * caps)
return FALSE;
}
/**
* gst_vaapi_decoder_get_surface_attributres:
* @decoder: a #GstVaapiDecoder instances
* @min_width (out): the minimal surface width
* @min_height (out): the minimal surface height
* @max_width (out): the maximal surface width
* @max_height (out): the maximal surface height
*
* Fetches the valid surface's attributes for the current context.
*
* Returns: a #GArray of valid formats we get or %NULL if failed.
**/
GArray *
gst_vaapi_decoder_get_surface_attributes (GstVaapiDecoder * decoder,
gint * min_width, gint * min_height, gint * max_width, gint * max_height,
guint * mem_types)
{
gboolean ret;
GstVaapiConfigSurfaceAttributes attribs = { 0, };
g_return_val_if_fail (decoder != NULL, FALSE);
if (!decoder->context)
return NULL;
ret = gst_vaapi_context_get_surface_attributes (decoder->context, &attribs);
if (ret)
attribs.formats = gst_vaapi_context_get_surface_formats (decoder->context);
if (attribs.formats->len == 0) {
g_array_unref (attribs.formats);
return NULL;
}
if (min_width)
*min_width = attribs.min_width;
if (min_height)
*min_height = attribs.min_height;
if (max_width)
*max_width = attribs.max_width;
if (max_height)
*max_height = attribs.max_height;
if (mem_types)
*mem_types = attribs.mem_types;
return attribs.formats;
}

View file

@ -103,9 +103,6 @@ gst_vaapi_decoder_set_codec_state_changed_func (GstVaapiDecoder * decoder,
GstCaps *
gst_vaapi_decoder_get_caps (GstVaapiDecoder * decoder);
GArray *
gst_vaapi_decoder_get_surface_formats (GstVaapiDecoder * decoder);
gboolean
gst_vaapi_decoder_put_buffer (GstVaapiDecoder * decoder, GstBuffer * buf);
@ -139,6 +136,11 @@ gst_vaapi_decoder_reset (GstVaapiDecoder * decoder);
gboolean
gst_vaapi_decoder_update_caps (GstVaapiDecoder * decoder, GstCaps * caps);
GArray *
gst_vaapi_decoder_get_surface_attributes (GstVaapiDecoder * decoder,
gint * min_width, gint * min_height, gint * max_width, gint * max_height,
guint * mem_types);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoder, gst_object_unref)
G_END_DECLS

View file

@ -197,10 +197,33 @@ gst_vaapidecode_update_sink_caps (GstVaapiDecode * decode, GstCaps * caps)
return TRUE;
}
static inline void
caps_set_width_and_height_range (GstCaps * caps, gint min_width,
gint min_height, gint max_width, gint max_height)
{
guint size, i;
GstStructure *structure;
/* Set the width/height info to caps */
size = gst_caps_get_size (caps);
for (i = 0; i < size; i++) {
structure = gst_caps_get_structure (caps, i);
if (!structure)
continue;
gst_structure_set (structure, "width", GST_TYPE_INT_RANGE, min_width,
max_width, "height", GST_TYPE_INT_RANGE, min_height, max_height,
"framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
}
}
static gboolean
gst_vaapidecode_ensure_allowed_srcpad_caps (GstVaapiDecode * decode)
{
GstCaps *out_caps, *raw_caps;
GstCaps *out_caps, *raw_caps, *va_caps, *dma_caps, *gltexup_caps, *base_caps;
GArray *formats;
gint min_width, min_height, max_width, max_height;
guint mem_types;
gboolean ret = FALSE;
if (decode->allowed_srcpad_caps)
return TRUE;
@ -208,40 +231,74 @@ gst_vaapidecode_ensure_allowed_srcpad_caps (GstVaapiDecode * decode)
if (!GST_VAAPI_PLUGIN_BASE_DISPLAY (decode))
return FALSE;
/* Create VA caps */
out_caps = gst_caps_from_string (GST_VAAPI_MAKE_SURFACE_CAPS);
if (!out_caps) {
GST_WARNING_OBJECT (decode, "failed to create VA/GL source caps");
if (!decode->decoder)
return FALSE;
}
#if (USE_GLX || USE_EGL)
if (!GST_VAAPI_PLUGIN_BASE_SRC_PAD_CAN_DMABUF (decode) &&
gst_vaapi_display_has_opengl (GST_VAAPI_PLUGIN_BASE_DISPLAY (decode))) {
out_caps = gst_caps_make_writable (out_caps);
gst_caps_append (out_caps,
gst_caps_from_string (GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS));
}
#endif
out_caps = gst_caps_make_writable (out_caps);
gst_caps_append (out_caps, gst_caps_from_string (GST_VAAPI_MAKE_DMABUF_CAPS));
out_caps = base_caps = raw_caps = va_caps = dma_caps = gltexup_caps = NULL;
formats = gst_vaapi_decoder_get_surface_attributes (decode->decoder,
&min_width, &min_height, &max_width, &max_height, &mem_types);
if (!formats)
return FALSE;
base_caps = gst_vaapi_video_format_new_template_caps_from_list (formats);
if (!base_caps)
goto bail;
caps_set_width_and_height_range (base_caps, min_width, min_height, max_width,
max_height);
raw_caps = gst_vaapi_plugin_base_get_allowed_srcpad_raw_caps
(GST_VAAPI_PLUGIN_BASE (decode),
GST_VIDEO_INFO_FORMAT (&decode->decoded_info));
if (!raw_caps) {
gst_caps_unref (out_caps);
GST_WARNING_OBJECT (decode, "failed to create raw sink caps");
return FALSE;
}
if (!raw_caps)
goto bail;
raw_caps = gst_caps_copy (raw_caps);
caps_set_width_and_height_range (raw_caps, min_width, min_height,
max_width, max_height);
va_caps = gst_caps_copy (base_caps);
gst_caps_set_features_simple (va_caps,
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE));
if (GST_VAAPI_PLUGIN_BASE_SRC_PAD_CAN_DMABUF (decode)
&& gst_vaapi_mem_type_supports (mem_types,
GST_VAAPI_BUFFER_MEMORY_TYPE_DMA_BUF)) {
dma_caps = gst_caps_from_string (GST_VAAPI_MAKE_DMABUF_CAPS);
caps_set_width_and_height_range (dma_caps, min_width, min_height, max_width,
max_height);
}
#if (USE_GLX || USE_EGL)
if (!GST_VAAPI_PLUGIN_BASE_SRC_PAD_CAN_DMABUF (decode)
&& gst_vaapi_display_has_opengl (GST_VAAPI_PLUGIN_BASE_DISPLAY (decode))) {
gltexup_caps = gst_caps_from_string (GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS);
if (gltexup_caps) {
caps_set_width_and_height_range (base_caps, min_width, min_height,
max_width, max_height);
}
}
#endif
out_caps = va_caps;
if (dma_caps)
gst_caps_append (out_caps, dma_caps);
if (gltexup_caps)
gst_caps_append (out_caps, gltexup_caps);
if (raw_caps)
gst_caps_append (out_caps, raw_caps);
out_caps = gst_caps_make_writable (out_caps);
gst_caps_append (out_caps, gst_caps_copy (raw_caps));
decode->allowed_srcpad_caps = out_caps;
GST_INFO_OBJECT (decode, "allowed srcpad caps: %" GST_PTR_FORMAT,
decode->allowed_srcpad_caps);
return TRUE;
ret = TRUE;
bail:
if (formats)
g_array_unref (formats);
if (base_caps)
gst_caps_unref (base_caps);
return ret;
}
static GstCaps *
@ -963,6 +1020,8 @@ gst_vaapidecode_destroy (GstVaapiDecode * decode)
gst_vaapidecode_purge (decode);
gst_vaapi_decoder_replace (&decode->decoder, NULL);
/* srcpad caps are decoder's context dependant */
gst_caps_replace (&decode->allowed_srcpad_caps, NULL);
}
static gboolean