mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

libav: Fix for APNG encoder property registration

Browse source 
The AVClass name of Animated PNG in FFmpeg 5.x is "(A)PNG"
and it will be converted to "-a-png" through
g_ascii_strdown() and g_strcanon(). But GLib disallow leading '-'
character for a GType name. Strip leading '-' to workaround it.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2733>
This commit is contained in:
Seungha Yang 2022-07-07 22:16:30 +09:00 committed by Tim-Philipp Müller
parent 3e3ee9e6f5
commit 1ae1faeb2d
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
subprojects/gst-libav/ext/libav/gstavcfg.c
View file

@ -91,10 +91,19 @@ register_enum (const AVClass ** obj, const AVOption * top_opt)
gchar *lower_obj_name = g_ascii_strdown ((*obj)->class_name, -1); gchar *lower_obj_name = g_ascii_strdown ((*obj)->class_name, -1);
gchar *enum_name = g_strdup_printf ("%s-%s", lower_obj_name, top_opt->unit); gchar *enum_name = g_strdup_printf ("%s-%s", lower_obj_name, top_opt->unit);
gboolean none_default = TRUE; gboolean none_default = TRUE;
const gchar *enum_name_strip;
g_strcanon (enum_name, G_CSET_a_2_z G_CSET_DIGITS, '-'); g_strcanon (enum_name, G_CSET_a_2_z G_CSET_DIGITS, '-');
if ((res = g_type_from_name (enum_name))) /* strip leading '-'s */
enum_name_strip = enum_name;
while (enum_name_strip[0] == '-')
enum_name_strip++;
if (enum_name_strip[0] == '\0')
goto done;
if ((res = g_type_from_name (enum_name_strip)))
goto done; goto done;
while ((opt = av_opt_next (obj, opt))) { while ((opt = av_opt_next (obj, opt))) {
@ -150,9 +159,8 @@ register_enum (const AVClass ** obj, const AVOption * top_opt)
} }
} }
res = res = g_enum_register_static (enum_name_strip,
g_enum_register_static (enum_name, &g_array_index (values, GEnumValue, &g_array_index (values, GEnumValue, 0));
0));
gst_type_mark_as_plugin_api (res, 0); gst_type_mark_as_plugin_api (res, 0);
} }
@ -177,10 +185,19 @@ register_flags (const AVClass ** obj, const AVOption * top_opt)
GArray *values = g_array_new (TRUE, TRUE, sizeof (GEnumValue)); GArray *values = g_array_new (TRUE, TRUE, sizeof (GEnumValue));
gchar *lower_obj_name = g_ascii_strdown ((*obj)->class_name, -1); gchar *lower_obj_name = g_ascii_strdown ((*obj)->class_name, -1);
gchar *flags_name = g_strdup_printf ("%s-%s", lower_obj_name, top_opt->unit); gchar *flags_name = g_strdup_printf ("%s-%s", lower_obj_name, top_opt->unit);
const gchar *flags_name_strip;
g_strcanon (flags_name, G_CSET_a_2_z G_CSET_DIGITS, '-'); g_strcanon (flags_name, G_CSET_a_2_z G_CSET_DIGITS, '-');
if ((res = g_type_from_name (flags_name))) /* strip leading '-'s */
flags_name_strip = flags_name;
while (flags_name_strip[0] == '-')
flags_name_strip++;
if (flags_name_strip[0] == '\0')
goto done;
if ((res = g_type_from_name (flags_name_strip)))
goto done; goto done;
while ((opt = av_opt_next (obj, opt))) { while ((opt = av_opt_next (obj, opt))) {
@ -211,7 +228,7 @@ register_flags (const AVClass ** obj, const AVOption * top_opt)
g_array_sort (values, (GCompareFunc) cmp_flags_value); g_array_sort (values, (GCompareFunc) cmp_flags_value);
res = res =
g_flags_register_static (flags_name, &g_array_index (values, g_flags_register_static (flags_name_strip, &g_array_index (values,
GFlagsValue, 0)); GFlagsValue, 0));
gst_type_mark_as_plugin_api (res, 0); gst_type_mark_as_plugin_api (res, 0);