mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: basedec: Select output format with the used chroma in decoder.

Browse source 
Currently, video format is decided with downstream caps intersection,
but that's not correct since chroma is not considered. The video
decoders have to decide the output format given the used chroma, not
by the downstream caps negotiation.

This patch changes that. Still, caps feature is selected by caps
negotiation, then, with the preferred caps feature, the output format
is search within that caps feature.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2569>
This commit is contained in:
Víctor Manuel Jáquez Leal 2022-06-07 16:30:36 +02:00 committed by GStreamer Marge Bot
parent e72434ba20
commit bb84a533bf
1 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
subprojects/gst-plugins-bad/sys/va/gstvabasedec.c
View file

@ -789,7 +789,6 @@ gst_va_base_dec_get_preferred_format_and_caps_features (GstVaBaseDec * base,
GstCaps *peer_caps, *preferred_caps = NULL; GstCaps *peer_caps, *preferred_caps = NULL;
GstCapsFeatures *features; GstCapsFeatures *features;
GstStructure *structure; GstStructure *structure;
const GValue *v_format;
guint num_structures, i; guint num_structures, i;
gboolean is_any; gboolean is_any;
@ -840,39 +839,28 @@ gst_va_base_dec_get_preferred_format_and_caps_features (GstVaBaseDec * base,
/* Use the first structure/feature is caps because is the /* Use the first structure/feature is caps because is the
* "preferred" one */ * "preferred" one */
if (capsfeatures) {
features = gst_caps_get_features (preferred_caps, 0); features = gst_caps_get_features (preferred_caps, 0);
if (features) { if (!features) {
*capsfeatures = gst_caps_features_copy (features); features = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
} else if (is_any
if (is_any
&& !gst_caps_features_is_equal (features, && !gst_caps_features_is_equal (features,
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY) GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)
&& !_downstream_has_video_meta (base, preferred_caps)) { && !_downstream_has_video_meta (base, preferred_caps)) {
GST_INFO_OBJECT (base, "Downstream reports ANY caps but without" GST_INFO_OBJECT (base, "Downstream reports ANY caps but without"
" VideoMeta support; fallback to system memory."); " VideoMeta support; fallback to system memory.");
gst_caps_features_free (*capsfeatures); features = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
*capsfeatures = NULL;
}
} else {
*capsfeatures = NULL;
} }
if (!*capsfeatures && format) {
*format = _default_video_format_from_chroma (base,
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY, base->rt_format);
goto bail; if (capsfeatures)
*capsfeatures = gst_caps_features_copy (features);
/* Use the format from chroma and available format for selected
* capsfeature */
if (format) {
*format = _default_video_format_from_chroma (base, features,
base->rt_format);
} }
}
if (!format)
goto bail;
structure = gst_caps_get_structure (preferred_caps, 0);
v_format = gst_structure_get_value (structure, "format");
*format = _find_video_format_from_chroma (v_format, base->rt_format);
bail: bail:
gst_clear_caps (&preferred_caps); gst_clear_caps (&preferred_caps);