]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7500: use unsigned int for frame->timestamp
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 4 Dec 2014 20:43:47 +0000 (14:43 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:46:50 +0000 (12:46 -0500)
src/include/switch_frame.h
src/switch_core_media.c

index b264e51de68fe5b3cd6424c5cfbf5a1d12fb86ab..0307db1ce7a0c82baa73e83ed68411664aee49e5 100644 (file)
@@ -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;
index 16f935d525565eeea3592de8259b817b38ac3c7b..9a616b02a38f914e6992383b01c8ede389692311 100644 (file)
@@ -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),