diff options
| author | He Junyan <junyan.he@intel.com> | 2020-07-08 16:30:17 +0800 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2020-07-29 15:41:40 +0000 |
| commit | b86489eb8c13dece2bd389838e2eeea250fa2ff5 (patch) | |
| tree | bf0401996d29dff7e53d06d0e915b926ca5080fa | |
| parent | ed55dd8df1dd0dbed1f20e0c5dd96f68e0bf2ddf (diff) | |
plugin: util: rename h26x_encoder_get_profiles_from_caps().
Change its name to encoder_get_profiles_from_caps(). Other codecs such
as VP9 also needs to use this function.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/188>
| -rw-r--r-- | gst/vaapi/gstvaapiencode_h264.c | 2 | ||||
| -rw-r--r-- | gst/vaapi/gstvaapiencode_h265.c | 2 | ||||
| -rw-r--r-- | gst/vaapi/gstvaapipluginutil.c | 7 | ||||
| -rw-r--r-- | gst/vaapi/gstvaapipluginutil.h | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/gst/vaapi/gstvaapiencode_h264.c b/gst/vaapi/gstvaapiencode_h264.c index f69c0334..ccadbf23 100644 --- a/gst/vaapi/gstvaapiencode_h264.c +++ b/gst/vaapi/gstvaapiencode_h264.c @@ -103,7 +103,7 @@ static GArray * gst_vaapiencode_h264_get_allowed_profiles (GstVaapiEncode * encode, GstCaps * allowed) { - return gst_vaapi_h26x_encoder_get_profiles_from_caps (allowed, + return gst_vaapi_encoder_get_profiles_from_caps (allowed, gst_vaapi_utils_h264_get_profile_from_string); } diff --git a/gst/vaapi/gstvaapiencode_h265.c b/gst/vaapi/gstvaapiencode_h265.c index e693c908..c94d7460 100644 --- a/gst/vaapi/gstvaapiencode_h265.c +++ b/gst/vaapi/gstvaapiencode_h265.c @@ -74,7 +74,7 @@ static GArray * gst_vaapiencode_h265_get_allowed_profiles (GstVaapiEncode * encode, GstCaps * allowed) { - return gst_vaapi_h26x_encoder_get_profiles_from_caps (allowed, + return gst_vaapi_encoder_get_profiles_from_caps (allowed, gst_vaapi_utils_h265_get_profile_from_string); } diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c index 86de800d..aa485314 100644 --- a/gst/vaapi/gstvaapipluginutil.c +++ b/gst/vaapi/gstvaapipluginutil.c @@ -1018,18 +1018,17 @@ gst_vaapi_codecs_has_codec (GArray * codecs, GstVaapiCodec codec) } /** - * gst_vaapi_h26x_encoder_get_profiles_from_caps: + * gst_vaapi_encoder_get_profiles_from_caps: * @caps: a #GstCaps to detect * @func: a #GstVaapiStrToProfileFunc * * This function will detect all profile strings in @caps and - * return the according GstVaapiProfile in array. This can just - * work for h264 and h265 now. + * return the according GstVaapiProfile in array. * * Return: A #GArray of @GstVaapiProfile if succeed, %NULL if fail. **/ GArray * -gst_vaapi_h26x_encoder_get_profiles_from_caps (GstCaps * caps, +gst_vaapi_encoder_get_profiles_from_caps (GstCaps * caps, GstVaapiStrToProfileFunc func) { guint i, j; diff --git a/gst/vaapi/gstvaapipluginutil.h b/gst/vaapi/gstvaapipluginutil.h index db069cb9..5ae79b89 100644 --- a/gst/vaapi/gstvaapipluginutil.h +++ b/gst/vaapi/gstvaapipluginutil.h @@ -158,7 +158,7 @@ gst_vaapi_codecs_has_codec (GArray * codecs, GstVaapiCodec codec); G_GNUC_INTERNAL GArray * -gst_vaapi_h26x_encoder_get_profiles_from_caps (GstCaps * caps, +gst_vaapi_encoder_get_profiles_from_caps (GstCaps * caps, GstVaapiStrToProfileFunc func); G_GNUC_INTERNAL |