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

kate: fix printf format strings and disable tiger element

Browse source
This commit is contained in:
Tim-Philipp Müller 2013-04-14 21:28:51 +01:00
parent b261bd516f
commit b8d4b6f3bd
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/kate/Makefile.am
View file

@ -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)

2
ext/kate/gstkate.c
View file

@ -56,6 +56,8 @@
#include "gstkateenc.h"
#include "gstkateparse.h"
#include "gstkatetag.h"
#undef HAVE_TIGER
#ifdef HAVE_TIGER
#include "gstkatetiger.h"
#endif

7
ext/kate/gstkateenc.c
View file

@ -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);

2
ext/kate/gstkateparse.c
View file

@ -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) {

8
ext/kate/gstkatespu.c
View file

@ -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);

5
ext/kate/gstkatetag.c
View file

@ -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 */

2
ext/kate/gstkateutil.c
View file

@ -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);