mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-05 09:00:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

pbutils: descriptions: fix gst_pb_utils_get_caps_description_flags()

Browse source 
And add a little unit test.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3098>
This commit is contained in:
Tim-Philipp Müller 2022-09-30 00:07:07 +01:00
parent a08c972414
commit 6b316052dc
2 changed files with 58 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
View file

@ -1332,19 +1332,19 @@ gst_pb_utils_get_caps_description_flags (const GstCaps * caps)
/* A separate flags type is used because internally more flags are needed
* for filtering purposes, e.g. the SYSTEMSTREAM flag */
if (info) {
if ((info->flags | FLAG_CONTAINER))
if ((info->flags & FLAG_CONTAINER))
flags |= GST_PBUTILS_CAPS_DESCRIPTION_FLAG_CONTAINER;
if ((info->flags | FLAG_AUDIO))
if ((info->flags & FLAG_AUDIO))
flags |= GST_PBUTILS_CAPS_DESCRIPTION_FLAG_AUDIO;
if ((info->flags | FLAG_VIDEO))
if ((info->flags & FLAG_VIDEO))
flags |= GST_PBUTILS_CAPS_DESCRIPTION_FLAG_VIDEO;
if ((info->flags | FLAG_IMAGE))
if ((info->flags & FLAG_IMAGE))
flags |= GST_PBUTILS_CAPS_DESCRIPTION_FLAG_IMAGE;
if ((info->flags | FLAG_SUB))
if ((info->flags & FLAG_SUB))
flags |= GST_PBUTILS_CAPS_DESCRIPTION_FLAG_SUBTITLE;
if ((info->flags | FLAG_TAG))
if ((info->flags & FLAG_TAG))
flags |= GST_PBUTILS_CAPS_DESCRIPTION_FLAG_TAG;
if ((info->flags | FLAG_GENERIC))
if ((info->flags & FLAG_GENERIC))
flags |= GST_PBUTILS_CAPS_DESCRIPTION_FLAG_GENERIC;
}

51
subprojects/gst-plugins-base/tests/check/libs/pbutils.c
View file

@ -245,6 +245,56 @@ GST_START_TEST (test_pb_utils_init)
GST_END_TEST;
#define F_AUDIO GST_PBUTILS_CAPS_DESCRIPTION_FLAG_AUDIO
#define F_VIDEO GST_PBUTILS_CAPS_DESCRIPTION_FLAG_VIDEO
#define F_SUB GST_PBUTILS_CAPS_DESCRIPTION_FLAG_SUBTITLE
#define F_IMAGE GST_PBUTILS_CAPS_DESCRIPTION_FLAG_IMAGE
#define F_AV (F_AUDIO | F_VIDEO)
#define F_AVS (F_AUDIO | F_VIDEO | F_SUB)
#define F_AVSI (F_AUDIO | F_VIDEO | F_SUB | F_IMAGE)
#define F_CONTAINER GST_PBUTILS_CAPS_DESCRIPTION_FLAG_CONTAINER
#define F_AV_CONTAINER (F_CONTAINER | F_AV)
#define F_AVS_CONTAINER (F_CONTAINER | F_AVS)
#define F_AVSI_CONTAINER (F_CONTAINER | F_AVSI)
#define F_TAG GST_PBUTILS_CAPS_DESCRIPTION_FLAG_TAG
/* *INDENT-OFF* */
static const struct FlagDescEntry
{
const gchar *caps_string;
GstPbUtilsCapsDescriptionFlags flags;
} flag_descs[] = {
{"application/x-binary", 0},
{"audio/x-wav", F_AUDIO | F_CONTAINER},
{"video/quicktime", F_AVSI_CONTAINER},
{"video/x-flv", F_AV_CONTAINER},
{"video/x-h264", F_VIDEO},
{"audio/mpeg,mpegversion=4", F_AUDIO},
{"image/jpeg", F_IMAGE | F_VIDEO},
{"random/x-nonsense, sense=false", 0},
};
/* *INDENT-ON* */
GST_START_TEST (test_pb_utils_get_caps_description_flags)
{
int i;
for (i = 0; i < G_N_ELEMENTS (flag_descs); ++i) {
GstPbUtilsCapsDescriptionFlags flags;
const struct FlagDescEntry *e;
GstCaps *caps;
e = &flag_descs[i];
caps = gst_caps_from_string (e->caps_string);
flags = gst_pb_utils_get_caps_description_flags (caps);
gst_caps_unref (caps);
GST_DEBUG ("%s: expecting 0x%x, got 0x%x", e->caps_string, e->flags, flags);
fail_unless_equals_int (flags, e->flags);
}
}
GST_END_TEST;
static const gchar *caps_strings[] = {
/* formats with static descriptions */
"application/ogg", "application/vnd.rn-realmedia", "video/x-fli",
@ -1496,6 +1546,7 @@ libgstpbutils_suite (void)
tcase_add_test (tc_chain, test_pb_utils_init);
tcase_add_test (tc_chain, test_pb_utils_post_missing_messages);
tcase_add_test (tc_chain, test_pb_utils_taglist_add_codec_info);
tcase_add_test (tc_chain, test_pb_utils_get_caps_description_flags);
tcase_add_test (tc_chain, test_pb_utils_get_codec_description);
tcase_add_test (tc_chain, test_pb_utils_install_plugins);
tcase_add_test (tc_chain, test_pb_utils_installer_details);