mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

avtp: Change "%lu" for G_GUINT64_FORMAT

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1398>
This commit is contained in:
Ederson de Souza 2020-07-08 09:08:31 -07:00 committed by GStreamer Merge Bot
parent 84f8dbd932
commit 38d3360edb
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/avtp/gstavtpcvfdepay.c
View file

@ -365,7 +365,7 @@ gst_avtp_cvf_depay_validate_avtpdu (GstAvtpCvfDepay * avtpcvfdepay,
g_assert (r == 0); g_assert (r == 0);
if (G_UNLIKELY (map->size < sizeof (*pdu) + val)) { if (G_UNLIKELY (map->size < sizeof (*pdu) + val)) {
GST_DEBUG_OBJECT (avtpcvfdepay, GST_DEBUG_OBJECT (avtpcvfdepay,
"AVTP packet size %ld too small, expected at least %lu", "AVTP packet size %ld too small, expected at least %" G_GUINT64_FORMAT,
map->size - AVTP_CVF_H264_HEADER_SIZE, sizeof (*pdu) + val); map->size - AVTP_CVF_H264_HEADER_SIZE, sizeof (*pdu) + val);
goto end; goto end;
} }
@ -375,8 +375,8 @@ gst_avtp_cvf_depay_validate_avtpdu (GstAvtpCvfDepay * avtpcvfdepay,
g_assert (r == 0); g_assert (r == 0);
if (G_UNLIKELY (val != avtpcvfdepay->seqnum)) { if (G_UNLIKELY (val != avtpcvfdepay->seqnum)) {
GST_INFO_OBJECT (avtpcvfdepay, GST_INFO_OBJECT (avtpcvfdepay,
"Unexpected AVTP header seq num %lu, expected %u", val, "Unexpected AVTP header seq num %" G_GUINT64_FORMAT ", expected %u",
avtpcvfdepay->seqnum); val, avtpcvfdepay->seqnum);
avtpcvfdepay->seqnum = val; avtpcvfdepay->seqnum = val;
/* This is not a reason to drop the packet, but it may be a good moment /* This is not a reason to drop the packet, but it may be a good moment
@ -447,8 +447,8 @@ gst_avtp_cvf_depay_internal_push (GstAvtpCvfDepay * avtpcvfdepay,
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GST_LOG_OBJECT (avtpcvfdepay, GST_LOG_OBJECT (avtpcvfdepay,
"Adding buffer of size %lu (nalu size %lu) to out_buffer", "Adding buffer of size %" G_GUINT64_FORMAT " (nalu size %"
gst_buffer_get_size (buffer), G_GUINT64_FORMAT ") to out_buffer", gst_buffer_get_size (buffer),
gst_buffer_get_size (buffer) - sizeof (guint32)); gst_buffer_get_size (buffer) - sizeof (guint32));
if (avtpcvfdepay->out_buffer) { if (avtpcvfdepay->out_buffer) {
@ -568,8 +568,8 @@ gst_avtp_cvf_depay_handle_fu_a (GstAvtpCvfDepay * avtpcvfdepay,
if (G_UNLIKELY (map->size - AVTP_CVF_H264_HEADER_SIZE < 2)) { if (G_UNLIKELY (map->size - AVTP_CVF_H264_HEADER_SIZE < 2)) {
GST_ERROR_OBJECT (avtpcvfdepay, GST_ERROR_OBJECT (avtpcvfdepay,
"Buffer too small to contain fragment headers, size: %lu", "Buffer too small to contain fragment headers, size: %"
map->size - AVTP_CVF_H264_HEADER_SIZE); G_GUINT64_FORMAT, map->size - AVTP_CVF_H264_HEADER_SIZE);
ret = gst_avtp_cvf_depay_push_and_discard (avtpcvfdepay); ret = gst_avtp_cvf_depay_push_and_discard (avtpcvfdepay);
goto end; goto end;
} }

17
ext/avtp/gstavtpcvfpay.c
View file

@ -347,7 +347,8 @@ gst_avtpcvpay_fragment_nal (GstAvtpCvfPay * avtpcvfpay, GstBuffer * nal,
if (*offset == 0 && (nal_size + AVTP_CVF_H264_HEADER_SIZE) <= avtpcvfpay->mtu) { if (*offset == 0 && (nal_size + AVTP_CVF_H264_HEADER_SIZE) <= avtpcvfpay->mtu) {
*last_fragment = TRUE; *last_fragment = TRUE;
*offset = nal_size; *offset = nal_size;
GST_DEBUG_OBJECT (avtpcvfpay, "Generated fragment with size %lu", nal_size); GST_DEBUG_OBJECT (avtpcvfpay,
"Generated fragment with size %" G_GUINT64_FORMAT, nal_size);
return gst_buffer_ref (nal); return gst_buffer_ref (nal);
} }
@ -402,8 +403,8 @@ gst_avtpcvpay_fragment_nal (GstAvtpCvfPay * avtpcvfpay, GstBuffer * nal,
*offset += fragment_size; *offset += fragment_size;
GST_DEBUG_OBJECT (avtpcvfpay, "Generated fragment with size %lu", GST_DEBUG_OBJECT (avtpcvfpay,
fragment_size); "Generated fragment with size %" G_GUINT64_FORMAT, fragment_size);
return fragment; return fragment;
} }
@ -533,7 +534,7 @@ gst_avtp_cvf_pay_prepare_avtp_packets (GstAvtpCvfPay * avtpcvfpay,
nal = g_ptr_array_index (nals, i); nal = g_ptr_array_index (nals, i);
GST_LOG_OBJECT (avtpcvfpay, GST_LOG_OBJECT (avtpcvfpay,
"Preparing AVTP packets for NAL whose size is %lu", "Preparing AVTP packets for NAL whose size is %" G_GUINT64_FORMAT,
gst_buffer_get_size (nal)); gst_buffer_get_size (nal));
/* Calculate timestamps. Note that we do it twice, one using DTS as base, /* Calculate timestamps. Note that we do it twice, one using DTS as base,
@ -602,8 +603,8 @@ gst_avtp_cvf_pay_prepare_avtp_packets (GstAvtpCvfPay * avtpcvfpay,
if (M) { if (M) {
GST_LOG_OBJECT (avtpcvfpay, "M packet sent, PTS: %" GST_TIME_FORMAT GST_LOG_OBJECT (avtpcvfpay, "M packet sent, PTS: %" GST_TIME_FORMAT
" DTS: %" GST_TIME_FORMAT " AVTP_TS: %" GST_TIME_FORMAT " DTS: %" GST_TIME_FORMAT " AVTP_TS: %" GST_TIME_FORMAT
" H264_TS: %" GST_TIME_FORMAT "\navtp_time: %lu h264_time: %lu", " H264_TS: %" GST_TIME_FORMAT "\navtp_time: %" G_GUINT64_FORMAT
GST_TIME_ARGS (h264_time), " h264_time: %" G_GUINT64_FORMAT, GST_TIME_ARGS (h264_time),
GST_TIME_ARGS (avtp_time), GST_TIME_ARGS ((guint32) avtp_time), GST_TIME_ARGS (avtp_time), GST_TIME_ARGS ((guint32) avtp_time),
GST_TIME_ARGS ((guint32) h264_time), avtp_time, h264_time); GST_TIME_ARGS ((guint32) h264_time), avtp_time, h264_time);
} }
@ -662,8 +663,8 @@ gst_avtp_cvf_pay_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GST_LOG_OBJECT (avtpcvfpay, GST_LOG_OBJECT (avtpcvfpay,
"Incoming buffer size: %lu PTS: %" GST_TIME_FORMAT " DTS: %" "Incoming buffer size: %" G_GUINT64_FORMAT " PTS: %" GST_TIME_FORMAT
GST_TIME_FORMAT, gst_buffer_get_size (buffer), " DTS: %" GST_TIME_FORMAT, gst_buffer_get_size (buffer),
GST_TIME_ARGS (GST_BUFFER_PTS (buffer)), GST_TIME_ARGS (GST_BUFFER_PTS (buffer)),
GST_TIME_ARGS (GST_BUFFER_DTS (buffer))); GST_TIME_ARGS (GST_BUFFER_DTS (buffer)));

5
ext/avtp/gstavtpsrc.c
View file

@ -275,8 +275,9 @@ gst_avtp_src_fill (GstPushSrc * pushsrc, GstBuffer * buffer)
buffer_size = gst_buffer_get_size (buffer); buffer_size = gst_buffer_get_size (buffer);
if (G_UNLIKELY (buffer_size < MAX_AVTPDU_SIZE)) { if (G_UNLIKELY (buffer_size < MAX_AVTPDU_SIZE)) {
GST_WARNING_OBJECT (avtpsrc, GST_WARNING_OBJECT (avtpsrc,
"Buffer size (%lu) may not be enough to hold AVTPDU (max AVTPDU size %d)", "Buffer size (%" G_GUINT64_FORMAT
buffer_size, MAX_AVTPDU_SIZE); ") may not be enough to hold AVTPDU (max AVTPDU size %d)", buffer_size,
MAX_AVTPDU_SIZE);
n = buffer_size; n = buffer_size;
} }