#pragma message ("You can define GST_USE_UNSTABLE_API to avoid this warning.")
#endif
+typedef enum
+{
+ GST_VA_FEATURE_DISABLED,
+ GST_VA_FEATURE_ENABLED,
+ GST_VA_FEATURE_AUTO,
+} GstVaFeature;
+
#include <gst/va/va-prelude.h>
+#include <gst/va/va-enumtypes.h>
#include <gst/va/gstvadisplay.h>
#include <gst/va/gstvadisplay_drm.h>
#include <gst/va/gstvadisplay_wrapped.h>
GstVaDisplay *display;
+ GstVaFeature feat_use_derived;
gboolean use_derived;
GArray *surface_formats;
GST_VIDEO_INFO_HEIGHT (&va_allocator->info));
/* Try derived first, but different formats can never derive */
- if (va_allocator->surface_format == va_allocator->img_format) {
+ if (va_allocator->feat_use_derived != GST_VA_FEATURE_DISABLED
+ && va_allocator->surface_format == va_allocator->img_format) {
if (va_get_derive_image (va_allocator->display, surface, &image)) {
va_allocator->use_derived = TRUE;
va_allocator->derived_info = va_allocator->info;
image.image_id = VA_INVALID_ID; /* reset it */
}
+ if (va_allocator->feat_use_derived == GST_VA_FEATURE_ENABLED
+ && !va_allocator->use_derived) {
+ GST_WARNING_OBJECT (va_allocator, "Derived images are disabled.");
+ va_allocator->feat_use_derived = GST_VA_FEATURE_DISABLED;
+ }
+
/* Then we try to create a image. */
if (!va_create_image (va_allocator->display, va_allocator->img_format,
GST_VIDEO_INFO_WIDTH (&va_allocator->info),
goto success;
}
- switch (gst_va_display_get_implementation (display)) {
- case GST_VA_IMPLEMENTATION_INTEL_IHD:
- /* On Gen7+ Intel graphics the memory is mappable but not
- * cached, so normal memcpy() access is very slow to read, but
- * it's ok for writing. So let's assume that users won't prefer
- * direct-mapped memory if they request read access. */
- use_derived = va_allocator->use_derived && !(flags & GST_MAP_READ);
- break;
- case GST_VA_IMPLEMENTATION_INTEL_I965:
- /* YUV derived images are tiled, so writing them is also
- * problematic */
- use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ)
- || ((flags & GST_MAP_WRITE)
- && GST_VIDEO_INFO_IS_YUV (&va_allocator->derived_info)));
- break;
- case GST_VA_IMPLEMENTATION_MESA_GALLIUM:
- /* Reading RGB derived images, with non-standard resolutions,
- * looks like tiled too. TODO(victor): fill a bug in Mesa. */
- use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ)
- && GST_VIDEO_INFO_IS_RGB (&va_allocator->derived_info));
- break;
- default:
- use_derived = va_allocator->use_derived;
- break;
+ if (va_allocator->feat_use_derived == GST_VA_FEATURE_ENABLED) {
+ use_derived = TRUE;
+ } else if (va_allocator->feat_use_derived == GST_VA_FEATURE_DISABLED) {
+ use_derived = FALSE;
+ } else {
+ switch (gst_va_display_get_implementation (display)) {
+ case GST_VA_IMPLEMENTATION_INTEL_IHD:
+ /* On Gen7+ Intel graphics the memory is mappable but not
+ * cached, so normal memcpy() access is very slow to read, but
+ * it's ok for writing. So let's assume that users won't prefer
+ * direct-mapped memory if they request read access. */
+ use_derived = va_allocator->use_derived && !(flags & GST_MAP_READ);
+ break;
+ case GST_VA_IMPLEMENTATION_INTEL_I965:
+ /* YUV derived images are tiled, so writing them is also
+ * problematic */
+ use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ)
+ || ((flags & GST_MAP_WRITE)
+ && GST_VIDEO_INFO_IS_YUV (&va_allocator->derived_info)));
+ break;
+ case GST_VA_IMPLEMENTATION_MESA_GALLIUM:
+ /* Reading RGB derived images, with non-standard resolutions,
+ * looks like tiled too. TODO(victor): fill a bug in Mesa. */
+ use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ)
+ && GST_VIDEO_INFO_IS_RGB (&va_allocator->derived_info));
+ break;
+ default:
+ use_derived = va_allocator->use_derived;
+ break;
+ }
}
if (use_derived)
info = &va_allocator->derived_info;
gst_va_memory_pool_init (&self->pool);
+ self->feat_use_derived = GST_VA_FEATURE_AUTO;
+
GST_OBJECT_FLAG_SET (self, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
}
gboolean
gst_va_allocator_set_format (GstAllocator * allocator, GstVideoInfo * info,
- guint usage_hint)
+ guint usage_hint, GstVaFeature use_derived)
{
GstVaAllocator *self;
gboolean ret;
if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_INFO_FORMAT (&self->info)
&& GST_VIDEO_INFO_WIDTH (info) == GST_VIDEO_INFO_WIDTH (&self->info)
&& GST_VIDEO_INFO_HEIGHT (info) == GST_VIDEO_INFO_HEIGHT (&self->info)
- && usage_hint == self->usage_hint) {
+ && usage_hint == self->usage_hint
+ && use_derived == self->feat_use_derived) {
*info = self->info; /* update callee info (offset & stride) */
return TRUE;
}
}
self->usage_hint = usage_hint;
+ self->feat_use_derived = use_derived;
self->info = *info;
g_clear_pointer (&self->copy, gst_va_surface_copy_free);
gboolean
gst_va_allocator_get_format (GstAllocator * allocator, GstVideoInfo * info,
- guint * usage_hint)
+ guint * usage_hint, GstVaFeature * use_derived)
{
GstVaAllocator *self;
*info = self->info;
if (usage_hint)
*usage_hint = self->usage_hint;
+ if (use_derived)
+ *use_derived = self->feat_use_derived;
return TRUE;
}
GST_VA_API
gboolean gst_va_allocator_set_format (GstAllocator * allocator,
GstVideoInfo * info,
- guint usage_hint);
+ guint usage_hint,
+ GstVaFeature use_derived);
GST_VA_API
gboolean gst_va_allocator_get_format (GstAllocator * allocator,
GstVideoInfo * info,
- guint * usage_hint);
+ guint * usage_hint,
+ GstVaFeature * use_derived);
GST_VA_API
VASurfaceID gst_va_memory_get_surface (GstMemory * mem);
static inline gboolean
gst_buffer_pool_config_get_va_allocation_params (GstStructure * config,
- guint32 * usage_hint)
+ guint32 * usage_hint, GstVaFeature * use_derived)
{
- if (!gst_structure_get (config, "usage-hint", G_TYPE_UINT, usage_hint, NULL))
+ if (!gst_structure_get (config, "usage-hint", G_TYPE_UINT, usage_hint, NULL)) {
*usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
+ }
+
+ if (!gst_structure_get (config, "use-derived", GST_TYPE_VA_FEATURE,
+ use_derived, NULL)) {
+ *use_derived = GST_VA_FEATURE_AUTO;
+ }
+
return TRUE;
}
gint width, height;
guint i, min_buffers, max_buffers;
guint32 usage_hint;
+ GstVaFeature use_derived;
gboolean has_alignment;
if (!gst_buffer_pool_config_get_params (config, &caps, NULL, &min_buffers,
|| GST_IS_VA_ALLOCATOR (allocator))))
goto wrong_config;
- if (!gst_buffer_pool_config_get_va_allocation_params (config, &usage_hint))
+ if (!gst_buffer_pool_config_get_va_allocation_params (config, &usage_hint,
+ &use_derived))
goto wrong_config;
width = GST_VIDEO_INFO_WIDTH (&caps_info);
usage_hint))
goto failed_allocator;
} else if (GST_IS_VA_ALLOCATOR (allocator)) {
- if (!gst_va_allocator_set_format (allocator, &alloc_info, usage_hint))
+ if (!gst_va_allocator_set_format (allocator, &alloc_info, usage_hint,
+ use_derived))
goto failed_allocator;
}
void
gst_buffer_pool_config_set_va_allocation_params (GstStructure * config,
- guint usage_hint)
+ guint usage_hint, GstVaFeature use_derived)
{
- gst_structure_set (config, "usage-hint", G_TYPE_UINT, usage_hint, NULL);
+ gst_structure_set (config, "usage-hint", G_TYPE_UINT, usage_hint,
+ "use-derived", GST_TYPE_VA_FEATURE, use_derived, NULL);
}
gboolean
GstBufferPool *
gst_va_pool_new_with_config (GstCaps * caps, guint size, guint min_buffers,
- guint max_buffers, guint usage_hint, GstAllocator * allocator,
- GstAllocationParams * alloc_params)
+ guint max_buffers, guint usage_hint, GstVaFeature use_derived,
+ GstAllocator * allocator, GstAllocationParams * alloc_params)
{
GstBufferPool *pool;
GstStructure *config;
config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_set_params (config, caps, size, min_buffers,
max_buffers);
- gst_buffer_pool_config_set_va_allocation_params (config, usage_hint);
+ gst_buffer_pool_config_set_va_allocation_params (config, usage_hint,
+ use_derived);
gst_buffer_pool_config_set_allocator (config, allocator, alloc_params);
gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
gboolean gst_va_pool_requires_video_meta (GstBufferPool * pool);
GST_VA_API
void gst_buffer_pool_config_set_va_allocation_params (GstStructure * config,
- guint usage_hint);
+ guint usage_hint,
+ GstVaFeature use_derived);
GST_VA_API
GstBufferPool * gst_va_pool_new_with_config (GstCaps * caps,
guint size,
guint min_buffers,
guint max_buffers,
guint usage_hint,
+ GstVaFeature use_derived,
GstAllocator * allocator,
GstAllocationParams * alloc_params);
libdrm_dep = dependency('libdrm', required: false, fallback: ['libdrm', 'ext_libdrm'])
cdata.set10('HAVE_LIBDRM', libdrm_dep.found())
+va_enums = gnome.mkenums_simple('va-enumtypes',
+ sources: ['gstva.h'],
+ decorator: 'GST_VA_API',
+ header_prefix: '#include <gst/va/va-prelude.h>',
+ body_prefix: '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif',
+ install_header: false)
+
gstva = library('gstva-' + api_version,
- va_sources,
+ va_sources, va_enums,
c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_VA', '-DG_LOG_DOMAIN="GStreamer-VA"'],
include_directories : [configinc, libsinc],
version : libversion,
gst_buffer_pool_config_add_option (other_config,
GST_BUFFER_POOL_OPTION_VIDEO_META);
- gst_buffer_pool_config_set_va_allocation_params (other_config, 0);
+ gst_buffer_pool_config_set_va_allocation_params (other_config, 0,
+ GST_VA_FEATURE_AUTO);
if (!gst_buffer_pool_set_config (other_pool, other_config)) {
ret = FALSE;
}
gst_buffer_pool_config_set_va_allocation_params (config,
- VA_SURFACE_ATTRIB_USAGE_HINT_DECODER);
+ VA_SURFACE_ATTRIB_USAGE_HINT_DECODER, GST_VA_FEATURE_AUTO);
if (!gst_buffer_pool_set_config (pool, config)) {
ret = FALSE;
}
gst_buffer_pool_config_set_va_allocation_params (config,
- VA_SURFACE_ATTRIB_USAGE_HINT_DECODER);
+ VA_SURFACE_ATTRIB_USAGE_HINT_DECODER, GST_VA_FEATURE_AUTO);
if (!gst_buffer_pool_set_config (pool, config)) {
ret = FALSE;
}
pool = gst_va_pool_new_with_config (caps, size, 1 + self->extra_min_buffers,
- 0, usage_hint, allocator, ¶ms);
+ 0, usage_hint, GST_VA_FEATURE_AUTO, allocator, ¶ms);
if (!pool) {
gst_object_unref (allocator);
goto config_failed;
gst_buffer_pool_config_set_allocator (config, allocator, ¶ms);
gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
- gst_buffer_pool_config_set_va_allocation_params (config, usage_hint);
+ gst_buffer_pool_config_set_va_allocation_params (config, usage_hint,
+ GST_VA_FEATURE_AUTO);
if (!gst_buffer_pool_set_config (pool, config)) {
gst_object_unref (allocator);
gst_object_unref (pool);
gst_va_dmabuf_allocator_get_format (allocator, &self->priv->srcpad_info,
NULL);
} else if (GST_IS_VA_ALLOCATOR (allocator)) {
- gst_va_allocator_get_format (allocator, &self->priv->srcpad_info, NULL);
+ gst_va_allocator_get_format (allocator, &self->priv->srcpad_info, NULL,
+ NULL);
}
if (update_allocator)
allocator = gst_va_base_transform_allocator_from_caps (self, caps);
self->priv->sinkpad_pool = gst_va_pool_new_with_config (caps, size, 1, 0,
- usage_hint, allocator, ¶ms);
+ usage_hint, GST_VA_FEATURE_AUTO, allocator, ¶ms);
if (!self->priv->sinkpad_pool) {
gst_object_unref (allocator);
return NULL;
gst_va_dmabuf_allocator_get_format (allocator, &self->priv->sinkpad_info,
NULL);
} else if (GST_IS_VA_ALLOCATOR (allocator)) {
- gst_va_allocator_get_format (allocator, &self->priv->sinkpad_info, NULL);
+ gst_va_allocator_get_format (allocator, &self->priv->sinkpad_info, NULL,
+ NULL);
}
gst_object_unref (allocator);
gst_allocation_params_init (¶ms);
pool = gst_va_pool_new_with_config (caps, size, 0, max_buffers, usage_hint,
- allocator, ¶ms);
+ GST_VA_FEATURE_AUTO, allocator, ¶ms);
gst_clear_object (&allocator);
gst_clear_caps (&caps);
allocator = gst_va_allocator_new (self->display, surface_formats);
self->raw_pool = gst_va_pool_new_with_config (caps, size, 1, 0,
- usage_hint, allocator, ¶ms);
+ usage_hint, GST_VA_FEATURE_AUTO, allocator, ¶ms);
if (!self->raw_pool) {
gst_object_unref (allocator);
return NULL;
}
- gst_va_allocator_get_format (allocator, &self->sinkpad_info, NULL);
+ gst_va_allocator_get_format (allocator, &self->sinkpad_info, NULL, NULL);
gst_object_unref (allocator);
if (!(allocator = _allocator_from_caps (self, caps)))
return FALSE;
- pool = gst_va_pool_new_with_config (caps, size, 1, 0, usage_hint, allocator,
- ¶ms);
+ pool = gst_va_pool_new_with_config (caps, size, 1, 0, usage_hint,
+ GST_VA_FEATURE_AUTO, allocator, ¶ms);
if (!pool) {
gst_object_unref (allocator);
goto config_failed;
projects / platform / upstream / gstreamer.git / commitdiff