mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

ogg: fixes warnings on macosx snow leopard

Browse source
This commit is contained in:
Josep Torra 2009-10-09 16:56:29 +02:00
parent 8579028dc0
commit 26fcc7843a
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/ogg/gstoggmux.c
View file

@ -62,6 +62,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_ogg_mux_debug);
: GST_BUFFER_TIMESTAMP (buf)) : GST_BUFFER_TIMESTAMP (buf))
#define GST_GP_FORMAT "[gp %8" G_GINT64_FORMAT "]" #define GST_GP_FORMAT "[gp %8" G_GINT64_FORMAT "]"
#define GST_GP_CAST(_gp) ((gint64) _gp)
typedef enum typedef enum
{ {
@ -475,7 +476,8 @@ gst_ogg_mux_buffer_from_page (GstOggMux * mux, ogg_page * page, gboolean delta)
GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT); GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT);
GST_LOG_OBJECT (mux, GST_GP_FORMAT GST_LOG_OBJECT (mux, GST_GP_FORMAT
" created buffer %p from ogg page", ogg_page_granulepos (page), buffer); " created buffer %p from ogg page",
GST_GP_CAST (ogg_page_granulepos (page)), buffer);
return buffer; return buffer;
} }
@ -645,7 +647,7 @@ gst_ogg_mux_pad_queue_page (GstOggMux * mux, GstOggPad * pad, ogg_page * page,
GST_LOG_OBJECT (pad->collect.pad, GST_GP_FORMAT GST_LOG_OBJECT (pad->collect.pad, GST_GP_FORMAT
" queued buffer page %p (gp time %" " queued buffer page %p (gp time %"
GST_TIME_FORMAT ", timestamp %" GST_TIME_FORMAT GST_TIME_FORMAT ", timestamp %" GST_TIME_FORMAT
"), %d page buffers queued", ogg_page_granulepos (page), "), %d page buffers queued", GST_GP_CAST (ogg_page_granulepos (page)),
buffer, GST_TIME_ARGS (GST_BUFFER_OFFSET (buffer)), buffer, GST_TIME_ARGS (GST_BUFFER_OFFSET (buffer)),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)),
g_queue_get_length (pad->pagebuffers)); g_queue_get_length (pad->pagebuffers));
@ -1201,7 +1203,7 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best)
GST_LOG_OBJECT (pad->collect.pad, GST_LOG_OBJECT (pad->collect.pad,
GST_GP_FORMAT " stored packet %" G_GINT64_FORMAT GST_GP_FORMAT " stored packet %" G_GINT64_FORMAT
" will make page too long, flushing", " will make page too long, flushing",
GST_BUFFER_OFFSET_END (pad->buffer), pad->stream.packetno); GST_BUFFER_OFFSET_END (pad->buffer), (gint64) pad->stream.packetno);
while (ogg_stream_flush (&pad->stream, &page)) { while (ogg_stream_flush (&pad->stream, &page)) {
/* end time of this page is the timestamp of the next buffer */ /* end time of this page is the timestamp of the next buffer */
@ -1283,7 +1285,8 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best)
packet.packetno = pad->packetno++; packet.packetno = pad->packetno++;
GST_LOG_OBJECT (pad->collect.pad, GST_GP_FORMAT GST_LOG_OBJECT (pad->collect.pad, GST_GP_FORMAT
" packet %" G_GINT64_FORMAT " (%ld bytes) created from buffer", " packet %" G_GINT64_FORMAT " (%ld bytes) created from buffer",
packet.granulepos, packet.packetno, packet.bytes); GST_GP_CAST (packet.granulepos), (gint64) packet.packetno,
packet.bytes);
packet.e_o_s = (pad->eos ? 1 : 0); packet.e_o_s = (pad->eos ? 1 : 0);
tmpbuf = NULL; tmpbuf = NULL;
@ -1366,7 +1369,7 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best)
GST_LOG_OBJECT (pad->collect.pad, GST_LOG_OBJECT (pad->collect.pad,
GST_GP_FORMAT " packet %" G_GINT64_FORMAT ", gp time %" GST_GP_FORMAT " packet %" G_GINT64_FORMAT ", gp time %"
GST_TIME_FORMAT ", timestamp %" GST_TIME_FORMAT " packetin'd", GST_TIME_FORMAT ", timestamp %" GST_TIME_FORMAT " packetin'd",
granulepos, packet.packetno, GST_TIME_ARGS (gp_time), granulepos, (gint64) packet.packetno, GST_TIME_ARGS (gp_time),
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
/* don't need the old buffer anymore */ /* don't need the old buffer anymore */
gst_buffer_unref (pad->buffer); gst_buffer_unref (pad->buffer);
@ -1383,10 +1386,10 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best)
GST_LOG_OBJECT (pad->collect.pad, GST_LOG_OBJECT (pad->collect.pad,
GST_GP_FORMAT " packet %" G_GINT64_FORMAT ", time %" GST_GP_FORMAT " packet %" G_GINT64_FORMAT ", time %"
GST_TIME_FORMAT ") caused new page", GST_TIME_FORMAT ") caused new page",
granulepos, packet.packetno, GST_TIME_ARGS (timestamp)); granulepos, (gint64) packet.packetno, GST_TIME_ARGS (timestamp));
GST_LOG_OBJECT (pad->collect.pad, GST_LOG_OBJECT (pad->collect.pad,
GST_GP_FORMAT " new page %ld", ogg_page_granulepos (&page), GST_GP_FORMAT " new page %ld",
pad->stream.pageno); GST_GP_CAST (ogg_page_granulepos (&page)), pad->stream.pageno);
if (ogg_page_granulepos (&page) == granulepos) { if (ogg_page_granulepos (&page) == granulepos) {
/* the packet we streamed in finishes on the current page, /* the packet we streamed in finishes on the current page,

12
ext/ogg/gstoggparse.c
View file

@ -435,7 +435,7 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
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 %u "
"at offset %lld", serialno, ogg->offset); "at offset %" G_GINT64_FORMAT, serialno, ogg->offset);
} }
if (ogg->last_page_not_bos) { if (ogg->last_page_not_bos) {
@ -452,7 +452,8 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
stream->headers = g_slist_append (stream->headers, pagebuffer); stream->headers = g_slist_append (stream->headers, pagebuffer);
if (!ogg->in_headers) { if (!ogg->in_headers) {
GST_LOG_OBJECT (ogg, "Found start of new chain at offset %llu", GST_LOG_OBJECT (ogg,
"Found start of new chain at offset %" G_GUINT64_FORMAT,
startoffset); startoffset);
ogg->in_headers = 1; ogg->in_headers = 1;
} }
@ -474,7 +475,8 @@ 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) { if (!stream) {
GST_LOG_OBJECT (ogg, "Non-BOS page unexpectedly found at %lld", GST_LOG_OBJECT (ogg,
"Non-BOS page unexpectedly found at %" G_GINT64_FORMAT,
ogg->offset); ogg->offset);
goto failure; goto failure;
} }
@ -491,7 +493,7 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
} else if (type == PAGE_HEADER) { } else if (type == PAGE_HEADER) {
if (!ogg->in_headers) { if (!ogg->in_headers) {
GST_LOG_OBJECT (ogg, "Header page unexpectedly found outside " GST_LOG_OBJECT (ogg, "Header page unexpectedly found outside "
"headers at offset %lld", ogg->offset); "headers at offset %" G_GINT64_FORMAT, ogg->offset);
goto failure; goto failure;
} else { } else {
/* Append the header to the buffer list, after any unknown previous /* Append the header to the buffer list, after any unknown previous
@ -602,7 +604,7 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
if (found_pending_headers) { if (found_pending_headers) {
GST_WARNING_OBJECT (ogg, "Incorrectly muxed headers found at " GST_WARNING_OBJECT (ogg, "Incorrectly muxed headers found at "
"approximate offset %lld", ogg->offset); "approximate offset %" G_GINT64_FORMAT, ogg->offset);
} }
found_pending_headers = TRUE; found_pending_headers = TRUE;