From be21d4f28ff215bb5d5730e12e37d3a1addf297c Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 4 Dec 2014 14:43:47 -0600 Subject: [PATCH] FS-7500: use unsigned int for frame->timestamp --- src/include/switch_frame.h | 2 +- src/switch_core_media.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/switch_frame.h b/src/include/switch_frame.h index b264e51de6..0307db1ce7 100644 --- a/src/include/switch_frame.h +++ b/src/include/switch_frame.h @@ -66,7 +66,7 @@ SWITCH_BEGIN_EXTERN_C /*! the payload of the frame */ switch_payload_t payload; /*! the timestamp of the frame */ - switch_size_t timestamp; + uint32_t timestamp; uint16_t seq; uint32_t ssrc; switch_bool_t m; diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 16f935d525..9a616b02a3 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -2000,7 +2000,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session snprintf(value, sizeof(value), "%u", rtcp_frame.octect_count); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Octect-Packet-Count", value); - snprintf(value, sizeof(value), "%" SWITCH_SIZE_T_FMT, engine->read_frame.timestamp); + snprintf(value, sizeof(value), "%u", engine->read_frame.timestamp); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Last-RTP-Timestamp", value); snprintf(value, sizeof(value), "%u", engine->read_frame.rate); @@ -9824,7 +9824,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "VIDEO: CNG\n"); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, - "VIDEO: seq: %d ts: %ld len: %4d %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x mark: %d\n", + "VIDEO: seq: %d ts: %u len: %4d %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x mark: %d\n", (*frame)->seq, (*frame)->timestamp, (*frame)->datalen, *((uint8_t *)(*frame)->data), *((uint8_t *)(*frame)->data + 1), *((uint8_t *)(*frame)->data + 2), *((uint8_t *)(*frame)->data + 3),