From bbd3d6f4f671432920cec2a3e4ea424bb3cee1b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 26 Sep 2024 09:15:34 +0300 Subject: [PATCH] qtdemux: Check fourcc of a second CEA608 atom instead of assuming it's cdt2 Part-of: --- subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c index 5e5c217580..84f56974f1 100644 --- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c +++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c @@ -6217,7 +6217,7 @@ extract_cc_from_data (QtDemuxStream * stream, const guint8 * data, gsize size, else GST_WARNING_OBJECT (stream->pad, "Got multiple [cdat] atoms in a c608 sample. This is unsupported for now. Please file a bug"); - } else { + } else if (fourcc == FOURCC_cdt2) { if (cdt2 == NULL) cdt2 = convert_to_s334_1a (data + atom_length + 8, @@ -6225,6 +6225,10 @@ extract_cc_from_data (QtDemuxStream * stream, const guint8 * data, gsize size, else GST_WARNING_OBJECT (stream->pad, "Got multiple [cdt2] atoms in a c608 sample. This is unsupported for now. Please file a bug"); + } else { + GST_WARNING_OBJECT (stream->pad, + "Unknown second data atom (%" GST_FOURCC_FORMAT ") for CEA608", + GST_FOURCC_ARGS (fourcc)); } } }