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

qtdemux: fix warnings building on macosx

Browse source
This commit is contained in:
Josep Torra 2009-10-09 11:54:03 +02:00
parent 093546ba74
commit c3d3eb6c3b
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gst/qtdemux/qtdemux.c
View file

@ -2524,7 +2524,8 @@ next_entry_size (GstQTDemux * demux)
guint64 smalloffs = (guint64) - 1; guint64 smalloffs = (guint64) - 1;
QtDemuxSample *sample; QtDemuxSample *sample;
GST_LOG_OBJECT (demux, "Finding entry at offset %lld", demux->offset); GST_LOG_OBJECT (demux, "Finding entry at offset %" G_GUINT64_FORMAT,
demux->offset);
for (i = 0; i < demux->n_streams; i++) { for (i = 0; i < demux->n_streams; i++) {
stream = demux->streams[i]; stream = demux->streams[i];
@ -2540,8 +2541,9 @@ next_entry_size (GstQTDemux * demux)
sample = &stream->samples[stream->sample_index]; sample = &stream->samples[stream->sample_index];
GST_LOG_OBJECT (demux, GST_LOG_OBJECT (demux,
"Checking Stream %d (sample_index:%d / offset:%lld / size:%d)", "Checking Stream %d (sample_index:%d / offset:%" G_GUINT64_FORMAT
i, stream->sample_index, sample->offset, sample->size); " / size:%" G_GUINT32_FORMAT ")", i, stream->sample_index,
sample->offset, sample->size);
if (((smalloffs == -1) if (((smalloffs == -1)
|| (sample->offset < smalloffs)) && (sample->size)) { || (sample->offset < smalloffs)) && (sample->size)) {
@ -2550,8 +2552,9 @@ next_entry_size (GstQTDemux * demux)
} }
} }
GST_LOG_OBJECT (demux, "stream %d offset %lld demux->offset :%lld", GST_LOG_OBJECT (demux,
smallidx, smalloffs, demux->offset); "stream %d offset %" G_GUINT64_FORMAT " demux->offset :%"
G_GUINT64_FORMAT, smallidx, smalloffs, demux->offset);
if (smallidx == -1) if (smallidx == -1)
return -1; return -1;
@ -2564,8 +2567,8 @@ next_entry_size (GstQTDemux * demux)
return sample->size + demux->todrop; return sample->size + demux->todrop;
} }
GST_DEBUG_OBJECT (demux, "There wasn't any entry at offset %lld", GST_DEBUG_OBJECT (demux,
demux->offset); "There wasn't any entry at offset %" G_GUINT64_FORMAT, demux->offset);
return -1; return -1;
} }
@ -2601,8 +2604,8 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
(ret == GST_FLOW_OK)) { (ret == GST_FLOW_OK)) {
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"state:%d , demux->neededbytes:%d, demux->offset:%lld", demux->state, "state:%d , demux->neededbytes:%d, demux->offset:%" G_GUINT64_FORMAT,
demux->neededbytes, demux->offset); demux->state, demux->neededbytes, demux->offset);
switch (demux->state) { switch (demux->state) {
case QTDEMUX_STATE_INITIAL:{ case QTDEMUX_STATE_INITIAL:{
@ -2723,7 +2726,7 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
case QTDEMUX_STATE_BUFFER_MDAT:{ case QTDEMUX_STATE_BUFFER_MDAT:{
GstBuffer *buf; GstBuffer *buf;
GST_DEBUG_OBJECT (demux, "Got our buffer at offset %lld", GST_DEBUG_OBJECT (demux, "Got our buffer at offset %" G_GUINT64_FORMAT,
demux->offset); demux->offset);
buf = gst_adapter_take_buffer (demux->adapter, demux->neededbytes); buf = gst_adapter_take_buffer (demux->adapter, demux->neededbytes);
GST_DEBUG_OBJECT (demux, "mdatbuffer starts with %" GST_FOURCC_FORMAT, GST_DEBUG_OBJECT (demux, "mdatbuffer starts with %" GST_FOURCC_FORMAT,
@ -2744,8 +2747,8 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
QtDemuxStream *stream = NULL; QtDemuxStream *stream = NULL;
int i = -1; int i = -1;
GST_DEBUG_OBJECT (demux, "BEGIN // in MOVIE for offset %lld", GST_DEBUG_OBJECT (demux,
demux->offset); "BEGIN // in MOVIE for offset %" G_GUINT64_FORMAT, demux->offset);
if (demux->todrop) { if (demux->todrop) {
GST_LOG_OBJECT (demux, "Dropping %d bytes", demux->todrop); GST_LOG_OBJECT (demux, "Dropping %d bytes", demux->todrop);
@ -2773,8 +2776,8 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
if (stream->sample_index >= stream->n_samples) if (stream->sample_index >= stream->n_samples)
continue; continue;
GST_LOG_OBJECT (demux, GST_LOG_OBJECT (demux,
"Checking stream %d (sample_index:%d / offset:%lld / size:%d)", "Checking stream %d (sample_index:%d / offset:%" G_GUINT64_FORMAT
i, stream->sample_index, " / size:%d)", i, stream->sample_index,
stream->samples[stream->sample_index].offset, stream->samples[stream->sample_index].offset,
stream->samples[stream->sample_index].size); stream->samples[stream->sample_index].size);
@ -2833,7 +2836,8 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
GST_LOG_OBJECT (demux, "increasing offset %" G_GUINT64_FORMAT " by %u", GST_LOG_OBJECT (demux, "increasing offset %" G_GUINT64_FORMAT " by %u",
demux->offset, demux->neededbytes); demux->offset, demux->neededbytes);
demux->offset += demux->neededbytes; demux->offset += demux->neededbytes;
GST_LOG_OBJECT (demux, "offset is now %lld", demux->offset); GST_LOG_OBJECT (demux, "offset is now %" G_GUINT64_FORMAT,
demux->offset);
if ((demux->neededbytes = next_entry_size (demux)) == -1) if ((demux->neededbytes = next_entry_size (demux)) == -1)
goto eos; goto eos;
@ -3052,7 +3056,8 @@ qtdemux_parse_container (GstQTDemux * qtdemux, GNode * node, const guint8 * buf,
break; break;
} }
if (G_UNLIKELY (len > (end - buf))) { if (G_UNLIKELY (len > (end - buf))) {
GST_WARNING_OBJECT (qtdemux, "length too long (%d > %d)", len, end - buf); GST_WARNING_OBJECT (qtdemux, "length too long (%d > %d)", len,
(gint) (end - buf));
break; break;
} }