libs: enc: h264: set max profile idc with correct profile.

Use the highest rank of available profile as the max profile to
set max idc value.

https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/issues/124
This commit is contained in:
Wangfei 2018-12-15 14:48:03 +08:00
parent e73e69a480
commit 1513cf774d

View file

@ -38,11 +38,11 @@
* If #GstVaapiEncodeH264:dct8x8 is enabled, then High profile is * If #GstVaapiEncodeH264:dct8x8 is enabled, then High profile is
* used. Otherwise, if #GstVaapiEncodeH264:cabac entropy coding is * used. Otherwise, if #GstVaapiEncodeH264:cabac entropy coding is
* enabled or #GstVaapiEncodeH264:max-bframes are allowed, then Main * enabled or #GstVaapiEncodeH264:max-bframes are allowed, then Main
* Profile is in effect, and otherwise Baseline profile applies. The * Profile is in effect. The element will alway go with the maximal
* high profile is imposed by default, which is fine for most software * profile available in the caps negotation and otherwise Baseline
* players and settings, but in some cases (e.g. hardware platforms) a * profile applies. But in some cases (e.g. hardware platforms) a more
* more restricted profile/level may be necessary. The recommended way * restrictedprofile/level may be necessary. The recommended way to
* to set a profile is to set it in the downstream caps. * set a profile is to set it in the downstream caps.
* *
* You can also set parameters to adjust the latency of encoding: * You can also set parameters to adjust the latency of encoding:
* #GstVaapiEncodeH264:quality-level is a number between 1-7, in the * #GstVaapiEncodeH264:quality-level is a number between 1-7, in the
@ -327,17 +327,8 @@ gst_vaapiencode_h264_set_config (GstVaapiEncode * base_encode)
} else { } else {
GstCaps *profile_caps; GstCaps *profile_caps;
const gchar *profile_str;
profile_caps = gst_caps_intersect (allowed_caps, available_caps); profile_caps = gst_caps_intersect (allowed_caps, available_caps);
profile = find_best_profile (profile_caps);
/* let's fixate to adjust to minimal profile */
profile_caps = gst_caps_fixate (profile_caps);
structure = gst_caps_get_structure (profile_caps, 0);
profile_str = gst_structure_get_string (structure, "profile");
if (profile_str)
profile = gst_vaapi_utils_h264_get_profile_from_string (profile_str);
gst_caps_unref (profile_caps); gst_caps_unref (profile_caps);
} }