mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-25 01:54:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

ogg: do not use 32 bit modifiers to print serial numbers

Browse source 
If ints are 64 bits, 32 bits should get promoted in varargs anyway,
and we don't care about 16 bit ints.
This makes the code a lot more readable, and still gets us nice
hexadecimal 32 bit serialnos.

https://bugzilla.gnome.org/show_bug.cgi?id=656775
This commit is contained in:
Vincent Penquerc'h 2011-08-18 16:20:57 +01:00 committed by Tim-Philipp Müller
parent 2ee31ccac9
commit b7bb1e5633
2 changed files with 24 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
ext/ogg/gstoggdemux.c
View file

@ -427,7 +427,7 @@ gst_ogg_demux_queue_data (GstOggPad * pad, ogg_packet * packet)
GstOggDemux *ogg = pad->ogg; GstOggDemux *ogg = pad->ogg;
#endif #endif
GST_DEBUG_OBJECT (ogg, "%p queueing data serial %08" G_GINT32_MODIFIER "x", GST_DEBUG_OBJECT (ogg, "%p queueing data serial %08x",
pad, pad->map.serialno); pad, pad->map.serialno);
pad->map.queued = g_list_append (pad->map.queued, _ogg_packet_copy (packet)); pad->map.queued = g_list_append (pad->map.queued, _ogg_packet_copy (packet));
@ -455,8 +455,7 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet,
cret = GST_FLOW_OK; cret = GST_FLOW_OK;
GST_DEBUG_OBJECT (ogg, GST_DEBUG_OBJECT (ogg,
"%p streaming to peer serial %08" G_GINT32_MODIFIER "x", pad, "%p streaming to peer serial %08x", pad, pad->map.serialno);
pad->map.serialno);
if (pad->map.is_ogm) { if (pad->map.is_ogm) {
const guint8 *data; const guint8 *data;
@ -706,7 +705,7 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet)
GstOggDemux *ogg = pad->ogg; GstOggDemux *ogg = pad->ogg;
GST_DEBUG_OBJECT (ogg, "%p submit packet serial %08" G_GINT32_MODIFIER "x", GST_DEBUG_OBJECT (ogg, "%p submit packet serial %08x",
pad, pad->map.serialno); pad, pad->map.serialno);
if (!pad->have_type) { if (!pad->have_type) {
@ -980,8 +979,8 @@ gst_ogg_pad_stream_out (GstOggPad * pad, gint npackets)
could_not_submit: could_not_submit:
{ {
GST_WARNING_OBJECT (ogg, GST_WARNING_OBJECT (ogg,
"could not submit packet for stream %08" G_GINT32_MODIFIER "could not submit packet for stream %08x, "
"x, error: %d", pad->map.serialno, result); "error: %d", pad->map.serialno, result);
gst_ogg_pad_reset (pad); gst_ogg_pad_reset (pad);
return result; return result;
} }
@ -1073,8 +1072,8 @@ done:
choked: choked:
{ {
GST_WARNING_OBJECT (ogg, GST_WARNING_OBJECT (ogg,
"ogg stream choked on page (serial %08" G_GINT32_MODIFIER "ogg stream choked on page (serial %08x), "
"x), resetting stream", pad->map.serialno); "resetting stream", pad->map.serialno);
gst_ogg_pad_reset (pad); gst_ogg_pad_reset (pad);
/* we continue to recover */ /* we continue to recover */
return GST_FLOW_OK; return GST_FLOW_OK;
@ -1154,8 +1153,7 @@ gst_ogg_chain_new_stream (GstOggChain * chain, guint32 serialno)
gchar *name; gchar *name;
GST_DEBUG_OBJECT (chain->ogg, GST_DEBUG_OBJECT (chain->ogg,
"creating new stream %08" G_GINT32_MODIFIER "x in chain %p", serialno, "creating new stream %08x in chain %p", serialno, chain);
chain);
ret = g_object_new (GST_TYPE_OGG_PAD, NULL); ret = g_object_new (GST_TYPE_OGG_PAD, NULL);
/* we own this one */ /* we own this one */
@ -1172,7 +1170,7 @@ gst_ogg_chain_new_stream (GstOggChain * chain, guint32 serialno)
if (ogg_stream_init (&ret->map.stream, serialno) != 0) if (ogg_stream_init (&ret->map.stream, serialno) != 0)
goto init_failed; goto init_failed;
name = g_strdup_printf ("serial_%08" G_GINT32_MODIFIER "x", serialno); name = g_strdup_printf ("serial_%08x", serialno);
gst_object_set_name (GST_OBJECT (ret), name); gst_object_set_name (GST_OBJECT (ret), name);
g_free (name); g_free (name);
@ -1183,8 +1181,7 @@ gst_ogg_chain_new_stream (GstOggChain * chain, guint32 serialno)
gst_tag_list_free (list); gst_tag_list_free (list);
GST_DEBUG_OBJECT (chain->ogg, GST_DEBUG_OBJECT (chain->ogg,
"created new ogg src %p for stream with serial %08" G_GINT32_MODIFIER "x", "created new ogg src %p for stream with serial %08x", ret, serialno);
ret, serialno);
g_array_append_val (chain->streams, ret); g_array_append_val (chain->streams, ret);
@ -1193,8 +1190,8 @@ gst_ogg_chain_new_stream (GstOggChain * chain, guint32 serialno)
/* ERRORS */ /* ERRORS */
init_failed: init_failed:
{ {
GST_ERROR ("Could not initialize ogg_stream struct for serial %08" GST_ERROR ("Could not initialize ogg_stream struct for serial %08x",
G_GINT32_MODIFIER "x.", serialno); serialno);
gst_object_unref (ret); gst_object_unref (ret);
return NULL; return NULL;
} }
@ -2169,7 +2166,7 @@ gst_ogg_demux_do_seek (GstOggDemux * ogg, GstSegment * segment,
keyframe_time = keyframe_time =
gst_ogg_stream_granule_to_time (&pad->map, pad->keyframe_granule); gst_ogg_stream_granule_to_time (&pad->map, pad->keyframe_granule);
GST_LOG_OBJECT (ogg, GST_LOG_OBJECT (ogg,
"stream %08" G_GINT32_MODIFIER "x granule time %" GST_TIME_FORMAT, "stream %08x granule time %" GST_TIME_FORMAT,
pad->map.serialno, GST_TIME_ARGS (keyframe_time)); pad->map.serialno, GST_TIME_ARGS (keyframe_time));
/* collect smallest value */ /* collect smallest value */
@ -2683,8 +2680,7 @@ gst_ogg_demux_read_chain (GstOggDemux * ogg, GstOggChain ** res_chain)
serial = ogg_page_serialno (&op); serial = ogg_page_serialno (&op);
if (gst_ogg_chain_get_stream (chain, serial) != NULL) { if (gst_ogg_chain_get_stream (chain, serial) != NULL) {
GST_WARNING_OBJECT (ogg, GST_WARNING_OBJECT (ogg,
"found serial %08" G_GINT32_MODIFIER "x BOS page twice, ignoring", "found serial %08x BOS page twice, ignoring", serial);
serial);
continue; continue;
} }
@ -2734,7 +2730,7 @@ gst_ogg_demux_read_chain (GstOggDemux * ogg, GstOggChain ** res_chain)
GstOggPad *pad = g_array_index (chain->streams, GstOggPad *, i); GstOggPad *pad = g_array_index (chain->streams, GstOggPad *, i);
GST_LOG_OBJECT (ogg, GST_LOG_OBJECT (ogg,
"serial %08" G_GINT32_MODIFIER "x time %" GST_TIME_FORMAT, "serial %08x time %" GST_TIME_FORMAT,
pad->map.serialno, GST_TIME_ARGS (pad->start_time)); pad->map.serialno, GST_TIME_ARGS (pad->start_time));
if (pad->map.serialno == serial) { if (pad->map.serialno == serial) {
@ -2758,15 +2754,14 @@ gst_ogg_demux_read_chain (GstOggDemux * ogg, GstOggChain ** res_chain)
if (!pad->map.is_sparse) if (!pad->map.is_sparse)
done &= (pad->start_time != GST_CLOCK_TIME_NONE); done &= (pad->start_time != GST_CLOCK_TIME_NONE);
GST_LOG_OBJECT (ogg, "done %08" G_GINT32_MODIFIER "x now %d", GST_LOG_OBJECT (ogg, "done %08x now %d", pad->map.serialno, done);
pad->map.serialno, done);
} }
/* we read a page not belonging to the current chain: seek back to the /* we read a page not belonging to the current chain: seek back to the
* beginning of the chain * beginning of the chain
*/ */
if (!known_serial) { if (!known_serial) {
GST_LOG_OBJECT (ogg, "unknown serial %08" G_GINT32_MODIFIER "x", serial); GST_LOG_OBJECT (ogg, "unknown serial %08x", serial);
gst_ogg_demux_seek (ogg, offset); gst_ogg_demux_seek (ogg, offset);
break; break;
} }
@ -3060,8 +3055,8 @@ gst_ogg_demux_handle_page (GstOggDemux * ogg, ogg_page * page)
granule = ogg_page_granulepos (page); granule = ogg_page_granulepos (page);
GST_LOG_OBJECT (ogg, GST_LOG_OBJECT (ogg,
"processing ogg page (serial %08" G_GINT32_MODIFIER "processing ogg page (serial %08x, "
"x, pageno %ld, granulepos %" G_GINT64_FORMAT ", bos %d)", serialno, "pageno %ld, granulepos %" G_GINT64_FORMAT ", bos %d)", serialno,
ogg_page_pageno (page), granule, ogg_page_bos (page)); ogg_page_pageno (page), granule, ogg_page_bos (page));
if (ogg_page_bos (page)) { if (ogg_page_bos (page)) {
@ -3129,9 +3124,7 @@ gst_ogg_demux_handle_page (GstOggDemux * ogg, ogg_page * page)
/* no pad. This means an ogg page without bos has been seen for this /* no pad. This means an ogg page without bos has been seen for this
* serialno. we just ignore it but post a warning... */ * serialno. we just ignore it but post a warning... */
GST_ELEMENT_WARNING (ogg, STREAM, DECODE, GST_ELEMENT_WARNING (ogg, STREAM, DECODE,
(NULL), (NULL), ("unknown ogg pad for serial %08x detected", serialno));
("unknown ogg pad for serial %08" G_GINT32_MODIFIER "x detected",
serialno));
return GST_FLOW_OK; return GST_FLOW_OK;
} }
return result; return result;
@ -3140,9 +3133,7 @@ gst_ogg_demux_handle_page (GstOggDemux * ogg, ogg_page * page)
unknown_chain: unknown_chain:
{ {
GST_ELEMENT_ERROR (ogg, STREAM, DECODE, GST_ELEMENT_ERROR (ogg, STREAM, DECODE,
(NULL), (NULL), ("unknown ogg chain for serial %08x detected", serialno));
("unknown ogg chain for serial %08" G_GINT32_MODIFIER "x detected",
serialno));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
} }
@ -3685,8 +3676,7 @@ gst_ogg_print (GstOggDemux * ogg)
for (j = 0; j < chain->streams->len; j++) { for (j = 0; j < chain->streams->len; j++) {
GstOggPad *stream = g_array_index (chain->streams, GstOggPad *, j); GstOggPad *stream = g_array_index (chain->streams, GstOggPad *, j);
GST_INFO_OBJECT (ogg, " stream %08" G_GINT32_MODIFIER "x:", GST_INFO_OBJECT (ogg, " stream %08x:", stream->map.serialno);
stream->map.serialno);
GST_INFO_OBJECT (ogg, " start time: %" GST_TIME_FORMAT, GST_INFO_OBJECT (ogg, " start time: %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->start_time)); GST_TIME_ARGS (stream->start_time));
} }

4
ext/ogg/gstoggparse.c
View file

@ -466,7 +466,7 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
GstOggStream *stream = gst_ogg_parse_find_stream (ogg, serialno); GstOggStream *stream = gst_ogg_parse_find_stream (ogg, serialno);
if (stream != NULL) { if (stream != NULL) {
GST_LOG_OBJECT (ogg, "Incorrect stream; repeats serial number %u " GST_LOG_OBJECT (ogg, "Incorrect stream; repeats serial number %08x "
"at offset %" G_GINT64_FORMAT, serialno, ogg->offset); "at offset %" G_GINT64_FORMAT, serialno, ogg->offset);
} }
@ -560,7 +560,7 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
GstOggStream *stream = (GstOggStream *) l->data; GstOggStream *stream = (GstOggStream *) l->data;
if (g_list_length (stream->headers) == 0) { if (g_list_length (stream->headers) == 0) {
GST_LOG_OBJECT (ogg, "No primary header found for stream %08lx", GST_LOG_OBJECT (ogg, "No primary header found for stream %08x",
stream->serialno); stream->serialno);
goto failure; goto failure;
} }