diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2020-08-14 10:42:51 +0200 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-08-14 11:08:54 +0000 |
| commit | ae6d4f3969d27848a45494eb3038119941117ec7 (patch) | |
| tree | 01db45940eaa0f24ebb4d2b2f07fbc3ed5a07da7 | |
| parent | 7a3b25884c0837cfbd8cd9bd72108fc77a5e6773 (diff) | |
vaapiencode: h264: ignore level without breaking negotiation
Since commit 9f627ef2 if the user sets level in the encoder src caps
the caps negotiation is rejected.
But since the same commit the same encoder set the autoconfigured
level in caps. Some change in the base class might fixed the operation
order so now the caps are set and later negotiated.
This patch removes the level check.
Fixes: #273
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/382>
| -rw-r--r-- | gst/vaapi/gstvaapiencode_h264.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gst/vaapi/gstvaapiencode_h264.c b/gst/vaapi/gstvaapiencode_h264.c index ccadbf23..d58faafa 100644 --- a/gst/vaapi/gstvaapiencode_h264.c +++ b/gst/vaapi/gstvaapiencode_h264.c @@ -296,12 +296,7 @@ gst_vaapiencode_h264_set_config (GstVaapiEncode * base_encode) stream_format = gst_structure_get_string (structure, "stream-format"); encode->is_avc = (g_strcmp0 (stream_format, "avc") == 0); - if (gst_structure_has_field (structure, "level")) { - /* @TODO(victor): add a mechansim for user set a specific - * level */ - GST_WARNING_OBJECT (encode, "cannot set level configuration"); - ret = FALSE; - } else if (profile != GST_VAAPI_PROFILE_UNKNOWN) { + if (profile != GST_VAAPI_PROFILE_UNKNOWN) { GST_INFO ("using %s profile as target decoder constraints", gst_vaapi_utils_h264_get_profile_string (profile)); ret = gst_vaapi_encoder_h264_set_max_profile (encoder, profile); |