From b86489eb8c13dece2bd389838e2eeea250fa2ff5 Mon Sep 17 00:00:00 2001 From: He Junyan Date: Wed, 8 Jul 2020 16:30:17 +0800 Subject: [PATCH] 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: --- gst/vaapi/gstvaapiencode_h264.c | 2 +- gst/vaapi/gstvaapiencode_h265.c | 2 +- gst/vaapi/gstvaapipluginutil.c | 7 +++---- 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 f69c033477..ccadbf23ae 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 e693c908a2..c94d746068 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 86de800d36..aa48531499 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 db069cb9c5..5ae79b8927 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