From 2f603bc241ace123082c1a12794fb9826423b5b6 Mon Sep 17 00:00:00 2001 From: Josep Torra Date: Sun, 11 Oct 2009 11:14:16 +0200 Subject: [PATCH] basevideo: fix warnings in macosx snow leopard --- gst-libs/gst/video/gstbasevideodecoder.c | 19 ++++++++++--------- gst-libs/gst/video/gstbasevideoencoder.c | 3 ++- gst-libs/gst/video/gstbasevideoparse.c | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c index f926def98e..3d736dd061 100644 --- a/gst-libs/gst/video/gstbasevideodecoder.c +++ b/gst-libs/gst/video/gstbasevideodecoder.c @@ -659,7 +659,7 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf) GstBuffer *buffer; GstFlowReturn ret; - GST_DEBUG ("chain %lld", GST_BUFFER_TIMESTAMP (buf)); + GST_DEBUG ("chain %" G_GINT64_FORMAT, GST_BUFFER_TIMESTAMP (buf)); #if 0 /* requiring the pad to be negotiated makes it impossible to use @@ -688,12 +688,12 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf) } if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) { - GST_DEBUG ("timestamp %lld offset %lld", GST_BUFFER_TIMESTAMP (buf), - base_video_decoder->offset); + GST_DEBUG ("timestamp %" G_GINT64_FORMAT " offset %" G_GINT64_FORMAT, + GST_BUFFER_TIMESTAMP (buf), base_video_decoder->offset); base_video_decoder->last_sink_timestamp = GST_BUFFER_TIMESTAMP (buf); } if (GST_BUFFER_OFFSET_END (buf) != -1) { - GST_DEBUG ("gp %lld", GST_BUFFER_OFFSET_END (buf)); + GST_DEBUG ("gp %" G_GINT64_FORMAT, GST_BUFFER_OFFSET_END (buf)); base_video_decoder->last_sink_offset_end = GST_BUFFER_OFFSET_END (buf); } base_video_decoder->offset += GST_BUFFER_SIZE (buf); @@ -841,13 +841,13 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder, base_video_decoder_class = GST_BASE_VIDEO_DECODER_GET_CLASS (base_video_decoder); - GST_DEBUG ("finish frame sync=%d pts=%lld", frame->is_sync_point, + GST_DEBUG ("finish frame sync=%d pts=%" G_GINT64_FORMAT, frame->is_sync_point, frame->presentation_timestamp); if (frame->is_sync_point) { if (GST_CLOCK_TIME_IS_VALID (frame->presentation_timestamp)) { if (frame->presentation_timestamp != base_video_decoder->timestamp_offset) { - GST_DEBUG ("sync timestamp %lld diff %lld", + GST_DEBUG ("sync timestamp %" G_GINT64_FORMAT " diff %" G_GINT64_FORMAT, frame->presentation_timestamp, frame->presentation_timestamp - base_video_decoder->state.segment.start); @@ -888,8 +888,9 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder, if (GST_CLOCK_TIME_IS_VALID (base_video_decoder->last_timestamp)) { if (frame->presentation_timestamp < base_video_decoder->last_timestamp) { - GST_WARNING ("decreasing timestamp (%lld < %lld)", - frame->presentation_timestamp, base_video_decoder->last_timestamp); + GST_WARNING ("decreasing timestamp (%" G_GINT64_FORMAT " < %" + G_GINT64_FORMAT ")", frame->presentation_timestamp, + base_video_decoder->last_timestamp); } } base_video_decoder->last_timestamp = frame->presentation_timestamp; @@ -929,7 +930,7 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder, GST_BUFFER_OFFSET (frame->src_buffer) = -1; GST_BUFFER_OFFSET_END (frame->src_buffer) = -1; - GST_DEBUG ("pushing frame %lld", frame->presentation_timestamp); + GST_DEBUG ("pushing frame %" G_GINT64_FORMAT, frame->presentation_timestamp); base_video_decoder->frames = g_list_remove (base_video_decoder->frames, frame); diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c index 991981424c..9daa6e7da5 100644 --- a/gst-libs/gst/video/gstbasevideoencoder.c +++ b/gst-libs/gst/video/gstbasevideoencoder.c @@ -188,7 +188,8 @@ gst_base_video_encoder_sink_event (GstPad * pad, GstEvent * event) if (format != GST_FORMAT_TIME) goto newseg_wrong_format; - GST_DEBUG ("new segment %lld %lld", start, position); + GST_DEBUG ("new segment %" G_GINT64_FORMAT " %" G_GINT64_FORMAT, start, + position); gst_segment_set_newsegment_full (&base_video_encoder->state.segment, update, rate, applied_rate, format, start, stop, position); diff --git a/gst-libs/gst/video/gstbasevideoparse.c b/gst-libs/gst/video/gstbasevideoparse.c index 66695c7b1b..78f34ab88a 100644 --- a/gst-libs/gst/video/gstbasevideoparse.c +++ b/gst-libs/gst/video/gstbasevideoparse.c @@ -279,7 +279,7 @@ gst_base_video_parse_src_query (GstPad * pad, GstQuery * query) time = gst_util_uint64_scale (base_parse->presentation_frame_number, base_parse->state.fps_n, base_parse->state.fps_d); time += base_parse->state.segment.time; - GST_DEBUG ("query position %lld", time); + GST_DEBUG ("query position %" G_GINT64_FORMAT, time); res = gst_base_video_encoded_video_convert (&base_parse->state, GST_FORMAT_TIME, time, &format, &value); if (!res) @@ -484,7 +484,8 @@ gst_base_video_parse_sink_event (GstPad * pad, GstEvent * event) if (rate <= 0.0) goto newseg_wrong_rate; - GST_DEBUG ("newsegment %lld %lld", start, time); + GST_DEBUG ("newsegment %" G_GINT64_FORMAT " %" G_GINT64_FORMAT, start, + time); gst_segment_set_newsegment (&base_video_parse->state.segment, update, rate, format, start, stop, time); @@ -854,9 +855,9 @@ gst_base_video_parse_push (GstBaseVideoParse * base_video_parse, } gst_buffer_set_caps (buffer, base_video_parse->caps); - GST_DEBUG ("pushing ts=%lld dur=%lld off=%lld off_end=%lld", - GST_BUFFER_TIMESTAMP (buffer), - GST_BUFFER_DURATION (buffer), + GST_DEBUG ("pushing ts=%" G_GINT64_FORMAT " dur=%" G_GINT64_FORMAT " off=%" + G_GINT64_FORMAT " off_end=%" G_GINT64_FORMAT, + GST_BUFFER_TIMESTAMP (buffer), GST_BUFFER_DURATION (buffer), GST_BUFFER_OFFSET (buffer), GST_BUFFER_OFFSET_END (buffer)); if (base_video_parse->discont) {