diff --git a/ext/kate/Makefile.am b/ext/kate/Makefile.am index b3c395f963..f4ec50cb03 100644 --- a/ext/kate/Makefile.am +++ b/ext/kate/Makefile.am @@ -4,9 +4,9 @@ plugin_LTLIBRARIES = libgstkate.la # sources used to compile this plug-in libgstkate_la_SOURCES = gstkate.c gstkatedec.c gstkateenc.c gstkateparse.c gstkatetag.c gstkateutil.c gstkatespu.c -if USE_TIGER -libgstkate_la_SOURCES += gstkatetiger.c -endif +#if USE_TIGER +#libgstkate_la_SOURCES += gstkatetiger.c +#endif # flags used to compile this plugin libgstkate_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS) diff --git a/ext/kate/gstkate.c b/ext/kate/gstkate.c index 014dd5b705..930d6f5ef2 100644 --- a/ext/kate/gstkate.c +++ b/ext/kate/gstkate.c @@ -56,6 +56,8 @@ #include "gstkateenc.h" #include "gstkateparse.h" #include "gstkatetag.h" + +#undef HAVE_TIGER #ifdef HAVE_TIGER #include "gstkatetiger.h" #endif diff --git a/ext/kate/gstkateenc.c b/ext/kate/gstkateenc.c index 89500bdec6..ffeedaa8bf 100644 --- a/ext/kate/gstkateenc.c +++ b/ext/kate/gstkateenc.c @@ -836,9 +836,8 @@ gst_kate_enc_chain_spu (GstKateEnc * ke, GstBuffer * buf) } } #endif - GST_DEBUG_OBJECT (ke, "Encoding %ux%u SPU: (%u bytes) from %f to %f", - (guint) kbitmap->width, (guint) kbitmap->height, - gst_buffer_get_size (buf), t0, t1); + GST_DEBUG_OBJECT (ke, "Encoding %zux%zu SPU: (%zu bytes) from %f to %f", + kbitmap->width, kbitmap->height, gst_buffer_get_size (buf), t0, t1); ret = kate_encode_set_region (&ke->k, kregion); if (G_UNLIKELY (ret < 0)) { @@ -967,7 +966,7 @@ gst_kate_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) GstCaps *caps; const gchar *mime_type = NULL; - GST_DEBUG_OBJECT (ke, "got packet, %u bytes", gst_buffer_get_size (buf)); + GST_DEBUG_OBJECT (ke, "got packet, %zu bytes", gst_buffer_get_size (buf)); /* get the type of the data we're being sent */ caps = gst_pad_get_current_caps (pad); diff --git a/ext/kate/gstkateparse.c b/ext/kate/gstkateparse.c index 02e5895bf9..52bae27baf 100644 --- a/ext/kate/gstkateparse.c +++ b/ext/kate/gstkateparse.c @@ -361,7 +361,7 @@ gst_kate_parse_parse_packet (GstKateParse * parse, GstBuffer * buf) size = gst_buffer_extract (buf, 0, header, 1); - GST_LOG_OBJECT (parse, "Got packet %02x, %u bytes", + GST_LOG_OBJECT (parse, "Got packet %02x, %zu bytes", size ? header[0] : -1, gst_buffer_get_size (buf)); if (size > 0 && header[0] & 0x80) { diff --git a/ext/kate/gstkatespu.c b/ext/kate/gstkatespu.c index a3336a4219..951ef0f02a 100644 --- a/ext/kate/gstkatespu.c +++ b/ext/kate/gstkatespu.c @@ -280,7 +280,7 @@ gst_kate_spu_decode_command_sequence (GstKateEnc * ke, GstBuffer * buf, guint16 sz; if (!gst_buffer_map (buf, &info, GST_MAP_READ)) { - GST_ERROR_OBJECT (ke, (NULL), ("Failed to map buffer")); + GST_ERROR_OBJECT (ke, "Failed to map buffer"); return GST_FLOW_ERROR; } @@ -380,7 +380,7 @@ out_of_range: { gst_buffer_unmap (buf, &info); GST_ELEMENT_ERROR (ke, STREAM, DECODE, (NULL), - ("Command sequence offset %u is out of range %u", + ("Command sequence offset %u is out of range %zu", command_sequence_offset, info.size)); return GST_FLOW_ERROR; } @@ -481,7 +481,7 @@ gst_kate_spu_decode_spu (GstKateEnc * ke, GstBuffer * buf, kate_region * kr, guint16 code; if (!gst_buffer_map (buf, &info, GST_MAP_READ)) { - GST_ERROR_OBJECT (ke, (NULL), ("Failed to map buffer")); + GST_ERROR_OBJECT (ke, "Failed to map buffer"); } ptr = info.data; @@ -499,7 +499,7 @@ gst_kate_spu_decode_spu (GstKateEnc * ke, GstBuffer * buf, kate_region * kr, CHECK (2); packet_size = GST_KATE_UINT16_BE (ptr); ADVANCE (2); - GST_DEBUG_OBJECT (ke, "packet size %u (GstBuffer size %u)", packet_size, + GST_DEBUG_OBJECT (ke, "packet size %d (GstBuffer size %zu)", packet_size, info.size); CHECK (2); diff --git a/ext/kate/gstkatetag.c b/ext/kate/gstkatetag.c index c6df6d67ee..4aa3a4fa3f 100644 --- a/ext/kate/gstkatetag.c +++ b/ext/kate/gstkatetag.c @@ -271,7 +271,7 @@ gst_kate_tag_parse_packet (GstKateParse * parse, GstBuffer * buffer) kt = GST_KATE_TAG (parse); if (!gst_buffer_map (buffer, &info, GST_MAP_READ)) { - GST_ERROR_OBJECT (buffer, (NULL), ("Failed to map buffer")); + GST_ERROR_OBJECT (parse, "Failed to map buffer"); return GST_FLOW_ERROR; } @@ -284,8 +284,7 @@ gst_kate_tag_parse_packet (GstKateParse * parse, GstBuffer * buffer) buffer = new_buffer; if (!gst_buffer_map (buffer, &info, GST_MAP_READWRITE)) { - GST_ERROR_OBJECT (buffer, (NULL), - ("Failed to map copied buffer READWRITE")); + GST_ERROR_OBJECT (parse, "Failed to map copied buffer READWRITE"); return GST_FLOW_ERROR; } /* language is at offset 32, 16 bytes, zero terminated */ diff --git a/ext/kate/gstkateutil.c b/ext/kate/gstkateutil.c index 8ebbe91d59..1d373269e7 100644 --- a/ext/kate/gstkateutil.c +++ b/ext/kate/gstkateutil.c @@ -257,7 +257,7 @@ gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder, header_size = gst_buffer_extract (buf, 0, header, 1); - GST_DEBUG_OBJECT (element, "got kate packet, %u bytes, type %02x", + GST_DEBUG_OBJECT (element, "got kate packet, %zu bytes, type %02x", gst_buffer_get_size (buf), header_size == 0 ? -1 : header[0]); is_header = header_size > 0 && (header[0] & 0x80);