mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapih264enc: intersect the new proposed caps

Browse source 
Instead of just leave to keep the proposed caps, with the best profile
in the allowed caps, is its intersected again.
This commit is contained in:
Víctor Manuel Jáquez Leal 2020-01-17 13:07:04 +01:00
parent 8b4d18da0a
commit 38d7297bb6
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/vaapi/gstvaapiencode_h264.c
View file

@ -274,6 +274,8 @@ gst_vaapiencode_h264_set_config (GstVaapiEncode * base_encode)
goto fail; goto fail;
if (!gst_caps_can_intersect (allowed_caps, available_caps)) { if (!gst_caps_can_intersect (allowed_caps, available_caps)) {
GstCaps *tmp_caps;
GST_INFO_OBJECT (encode, "downstream may have requested an unsupported " GST_INFO_OBJECT (encode, "downstream may have requested an unsupported "
"profile. Encoder will try to output a compatible one"); "profile. Encoder will try to output a compatible one");
@ -283,9 +285,15 @@ gst_vaapiencode_h264_set_config (GstVaapiEncode * base_encode)
if (profile == GST_VAAPI_PROFILE_UNKNOWN) if (profile == GST_VAAPI_PROFILE_UNKNOWN)
goto fail; goto fail;
profile_caps = gst_caps_from_string (GST_CODEC_CAPS); tmp_caps = gst_caps_from_string (GST_CODEC_CAPS);
gst_caps_set_simple (profile_caps, "profile", G_TYPE_STRING, gst_caps_set_simple (tmp_caps, "profile", G_TYPE_STRING,
gst_vaapi_profile_get_name (profile), NULL); gst_vaapi_profile_get_name (profile), NULL);
profile_caps = gst_caps_intersect (available_caps, tmp_caps);
gst_caps_unref (tmp_caps);
if (gst_caps_is_empty (profile_caps)) {
gst_caps_unref (profile_caps);
goto fail;
}
} else { } else {
profile_caps = gst_caps_intersect (allowed_caps, available_caps); profile_caps = gst_caps_intersect (allowed_caps, available_caps);
profile = find_best_profile (profile_caps); profile = find_best_profile (profile_caps);