From 4b5a2655714dcc17381d1a2b48601dbaf986e252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 2 Apr 2024 16:53:26 +0300 Subject: [PATCH] pbutils: descriptions: Don't warn on MPEG-1 audio caps without layer field While this is not ideal and won't give too accurate codec descriptions, it is what tsdemux produces. Part-of: --- .../gst-libs/gst/pbutils/descriptions.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c index a82f6c9e4e..33253d3db0 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c @@ -742,16 +742,17 @@ format_info_get_desc (const FormatInfo * info, const GstCaps * caps) switch (ver) { case 1: - gst_structure_get_int (s, "layer", &layer); - switch (layer) { - case 1: - case 2: - case 3: - return g_strdup_printf ("MPEG-1 Layer %d (MP%d)", layer, layer); - default: - break; + if (gst_structure_get_int (s, "layer", &layer)) { + switch (layer) { + case 1: + case 2: + case 3: + return g_strdup_printf ("MPEG-1 Layer %d (MP%d)", layer, layer); + default: + break; + } + GST_WARNING ("Unexpected MPEG-1 layer in %" GST_PTR_FORMAT, caps); } - GST_WARNING ("Unexpected MPEG-1 layer in %" GST_PTR_FORMAT, caps); return g_strdup ("MPEG-1 Audio"); case 2: return g_strdup ("MPEG-2 AAC");