diff options
Diffstat (limited to 'user/gst-plugins-bad/mpegts.patch')
-rw-r--r-- | user/gst-plugins-bad/mpegts.patch | 120 |
1 files changed, 0 insertions, 120 deletions
diff --git a/user/gst-plugins-bad/mpegts.patch b/user/gst-plugins-bad/mpegts.patch deleted file mode 100644 index 1579c4e32..000000000 --- a/user/gst-plugins-bad/mpegts.patch +++ /dev/null @@ -1,120 +0,0 @@ -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1314 - ---- gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c.old 2022-05-02 17:29:29.000000000 -0500 -+++ gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c 2022-07-02 23:19:51.027302943 -0500 -@@ -296,7 +296,7 @@ - dvb_text_from_utf8 (const gchar * text, gsize * out_size) - { - GError *error = NULL; -- gchar *out_text; -+ gchar *out_text = NULL; - guint8 *out_buffer; - guint encoding; - GIConv giconv = (GIConv) - 1; -@@ -304,7 +304,8 @@ - /* We test character maps one-by-one. Start with the default */ - encoding = _ICONV_ISO6937; - giconv = _get_iconv (_ICONV_UTF8, encoding); -- out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error); -+ if (giconv != (GIConv) - 1) -+ out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error); - - if (out_text) { - GST_DEBUG ("Using default ISO6937 encoding"); ---- gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c.old 2022-05-02 17:29:29.000000000 -0500 -+++ gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c 2022-07-02 23:41:27.379013955 -0500 -@@ -71,6 +71,14 @@ - 0xc0, 0x00, 0xc4, 0x86, 0x56, 0xa5 - }; - -+static gboolean -+_has_iso6937_iconv (void) -+{ -+ GIConv test = (GIConv) - 1; -+ test = g_iconv_open("iso6937", "utf-8"); -+ return (test != (GIConv) - 1); -+} -+ - GST_START_TEST (test_scte_sit) - { - GstMpegtsSCTESIT *sit; -@@ -397,11 +405,12 @@ - - fail_if (data == NULL); - -- for (i = 0; i < data_size; i++) { -- if (data[i] != nit_data_check[i]) -- fail ("0x%X != 0x%X in byte %d of NIT section", data[i], -- nit_data_check[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < data_size; i++) { -+ if (data[i] != nit_data_check[i]) -+ fail ("0x%X != 0x%X in byte %d of NIT section", data[i], -+ nit_data_check[i], i); -+ } - - /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */ - nit_section->data[nit_section->section_length - 1]++; -@@ -486,11 +495,12 @@ - - fail_if (data == NULL); - -- for (i = 0; i < data_size; i++) { -- if (data[i] != sdt_data_check[i]) -- fail ("0x%X != 0x%X in byte %d of SDT section", data[i], -- sdt_data_check[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < data_size; i++) { -+ if (data[i] != sdt_data_check[i]) -+ fail ("0x%X != 0x%X in byte %d of SDT section", data[i], -+ sdt_data_check[i], i); -+ } - - /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */ - sdt_section->data[sdt_section->section_length - 1]++; -@@ -594,14 +604,15 @@ - /* Check creation of descriptor */ - desc = gst_mpegts_descriptor_from_dvb_network_name ("Name"); - fail_if (desc == NULL); -- fail_unless (desc->length == 4); -+ if (_has_iso6937_iconv()) fail_unless (desc->length == 4); - fail_unless (desc->tag == 0x40); - -- for (i = 0; i < 6; i++) { -- if (desc->data[i] != network_name_descriptor[i]) -- fail ("0x%X != 0x%X in byte %d of network name descriptor", -- desc->data[i], network_name_descriptor[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < 6; i++) { -+ if (desc->data[i] != network_name_descriptor[i]) -+ fail ("0x%X != 0x%X in byte %d of network name descriptor", -+ desc->data[i], network_name_descriptor[i], i); -+ } - - /* Check parsing of descriptor */ - ret = gst_mpegts_descriptor_parse_dvb_network_name (desc, &string); -@@ -623,14 +634,15 @@ - desc = gst_mpegts_descriptor_from_dvb_service - (GST_DVB_SERVICE_DIGITAL_TELEVISION, "Name", "Provider"); - fail_if (desc == NULL); -- fail_unless (desc->length == 15); -+ if (_has_iso6937_iconv()) fail_unless (desc->length == 15); - fail_unless (desc->tag == 0x48); - -- for (i = 0; i < 17; i++) { -- if (desc->data[i] != service_descriptor[i]) -- fail ("0x%X != 0x%X in byte %d of service descriptor", -- desc->data[i], service_descriptor[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < 17; i++) { -+ if (desc->data[i] != service_descriptor[i]) -+ fail ("0x%X != 0x%X in byte %d of service descriptor", -+ desc->data[i], service_descriptor[i], i); -+ } - - /* Check parsing of descriptor with data */ - ret = gst_mpegts_descriptor_parse_dvb_service |