removed platform_time.c + references

get_time_in_ns() should be used instead time_since_epoch_in_ms(). Having both may be misleading and may lead to errors when interchanged.
MartinPulec · Aug 8, 2023 · abffc7c · abffc7c
1 parent 1a8164a
commit abffc7c
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 152 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -143,7 +143,6 @@ COMMON_OBJS     = \
 		src/compat/dlfunc.o \
 		src/compat/platform_pipe.o \
 		src/compat/platform_semaphore.o \
-		src/compat/platform_time.o \
 		src/compat/usleep.o \
 		src/crypto/crc_32.o \
 		src/crypto/crypt_aes.o \

diff --git a/src/compat/platform_time.c b/src/compat/platform_time.c
diff --git a/src/compat/platform_time.h b/src/compat/platform_time.h
diff --git a/src/debug.cpp b/src/debug.cpp
@@ -52,7 +52,6 @@
 #include <string_view>
 #include <unordered_map>
 
-#include "compat/platform_time.h"
 #include "debug.h"
 #include "host.h"
 #include "utils/color_out.h"

diff --git a/src/debug.h b/src/debug.h
@@ -113,7 +113,7 @@ bool parse_log_cfg(const char *conf_str,
 #include <string>
 #include <string_view>
 #include <mutex>
-#include "compat/platform_time.h"
+#include "tv.h"
 #include "utils/color_out.h"
 
 class Log_output{
@@ -222,9 +222,9 @@ inline void Log_output::submit(){
         if (show_timestamps == LOG_TIMESTAMP_ENABLED
                 || (show_timestamps == LOG_TIMESTAMP_AUTO && log_level >= LOG_LEVEL_VERBOSE))
         {
-                auto time_ms = time_since_epoch_in_ms();
-                snprintf(ts_str, ts_bufsize - 1, "[%.3f] ", time_ms / 1000.0);
-                ts_str[ts_bufsize - 1] = '\0';
+                const time_ns_t time_ns = get_time_in_ns();
+                snprintf(ts_str, ts_bufsize, "[%.3f] ",
+                         (double) time_ns / NS_IN_SEC_DBL);
         }
 
         const char *start_newline = "";

diff --git a/src/hd-rum-translator/hd-rum-translator.cpp b/src/hd-rum-translator/hd-rum-translator.cpp
@@ -57,7 +57,6 @@
 #include <string.h>
 #include <pthread.h>
 
-#include "compat/platform_time.h"
 #include "control_socket.h"
 #include "crypto/random.h"
 #include "host.h"

diff --git a/src/rtp/video_decoders.cpp b/src/rtp/video_decoders.cpp
@@ -99,7 +99,6 @@
 #include "config_win32.h"
 #endif // HAVE_CONFIG_H
 
-#include "compat/platform_time.h"
 #include "control_socket.h"
 #include "crypto/openssl_decrypt.h"
 #include "debug.h"

diff --git a/src/transmit.cpp b/src/transmit.cpp
@@ -82,7 +82,6 @@
 #include "utils/random.h"
 #include "video.h"
 #include "video_codec.h"
-#include "compat/platform_time.h"
 
 #include <algorithm>
 #include <array>
@@ -94,7 +93,7 @@
 
 #define FEC_MAX_MULT 10
 
-#define CONTROL_PORT_BANDWIDTH_REPORT_INTERVAL_MS 1000
+#define CONTROL_PORT_BANDWIDTH_REPORT_INTERVAL_NS NS_IN_SEC
 
 #ifdef HAVE_MACOSX
 #define GET_STARTTIME gettimeofday(&start, NULL)
@@ -705,12 +704,14 @@ tx_send_base(struct tx *tx, struct video_frame *frame, struct rtp *rtp_session,
                         }
 
                         if (control_stats_enabled(tx->control)) {
-                                auto current_time_ms = time_since_epoch_in_ms();
-                                if(current_time_ms - tx->last_stat_report >= CONTROL_PORT_BANDWIDTH_REPORT_INTERVAL_MS){
+                                const time_ns_t current_time_ns =
+                                    get_time_in_ns();
+                                if (current_time_ns - tx->last_stat_report >=
+                                    CONTROL_PORT_BANDWIDTH_REPORT_INTERVAL_NS) {
                                         std::ostringstream oss;
                                         oss << "tx_send " << std::hex << rtp_my_ssrc(rtp_session) << std::dec << " video " << tx->sent_since_report;
                                         control_report_stats(tx->control, oss.str());
-                                        tx->last_stat_report = current_time_ms;
+                                        tx->last_stat_report = current_time_ns;
                                         tx->sent_since_report = 0;
                                 }
                                 tx->sent_since_report += data_len + rtp_hdr_len;
@@ -879,15 +880,15 @@ audio_tx_send_pkt(struct tx *tx, struct rtp *rtp_session, uint32_t timestamp,
                 }
 
                 if (control_stats_enabled(tx->control)) {
-                        auto current_time_ms = time_since_epoch_in_ms();
-                        if (current_time_ms - tx->last_stat_report >=
-                            CONTROL_PORT_BANDWIDTH_REPORT_INTERVAL_MS) {
+                        const time_ns_t current_time_ns = get_time_in_ns();
+                        if (current_time_ns - tx->last_stat_report >=
+                            CONTROL_PORT_BANDWIDTH_REPORT_INTERVAL_NS) {
                                 std::ostringstream oss;
                                 oss << "tx_send " << std::hex
                                     << rtp_my_ssrc(rtp_session) << std::dec
                                     << " audio " << tx->sent_since_report;
                                 control_report_stats(tx->control, oss.str());
-                                tx->last_stat_report  = current_time_ms;
+                                tx->last_stat_report  = current_time_ns;
                                 tx->sent_since_report = 0;
                         }
                         tx->sent_since_report += data_len + rtp_hdr_len;

diff --git a/src/video_capture/screen_pw.cpp b/src/video_capture/screen_pw.cpp
@@ -18,10 +18,11 @@
 #include <spa/param/props.h>
 #include <spa/debug/format.h>
 
-#include "utils/synchronized_queue.h"
+#include "tv.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "utils/color_out.h"
+#include "utils/synchronized_queue.h"
 #include "video.h"
 #include "video_capture.h"
 
@@ -363,7 +364,7 @@ struct screen_cast_session {
                 }
 
                 int frame_count = 0;
-                uint64_t frame_counter_begin_time = time_since_epoch_in_ms();
+                time_ns_t frame_counter_begin_time = get_time_in_ns();
                 int expecting_fps = DEFAULT_EXPECTING_FPS;
 
                 ~pw_() {
@@ -564,17 +565,20 @@ static void on_process(void *session_ptr) {
                 pw_stream_queue_buffer(session.pw.stream, buffer);
 
                 ++session.pw.frame_count;
-                uint64_t time_now = time_since_epoch_in_ms();
-
-                uint64_t delta = time_now - session.pw.frame_counter_begin_time;
-                if(delta >= 5000) {
-                        double average_fps = session.pw.frame_count / (static_cast<int>(delta) / 1000.0);
+                const time_ns_t time_now = get_time_in_ns();
+
+                const time_ns_t delta =
+                    time_now - session.pw.frame_counter_begin_time;
+                if (delta >= 5 * NS_IN_SEC) {
+                        const double average_fps = session.pw.frame_count /
+                                                   static_cast<double>(delta) /
+                                                   NS_IN_SEC_DBL;
                         LOG(LOG_LEVEL_VERBOSE) << "[screen_pw]: on process: average fps in last 5 seconds: " << average_fps << "\n";
                         session.pw.expecting_fps = static_cast<int>(average_fps);
                         if(session.pw.expecting_fps == 0)
                                 session.pw.expecting_fps = 1;
                         session.pw.frame_count = 0;
-                        session.pw.frame_counter_begin_time = time_since_epoch_in_ms();
+                        session.pw.frame_counter_begin_time = get_time_in_ns();
                 }
         }
 

diff --git a/src/video_compress.cpp b/src/video_compress.cpp
@@ -550,7 +550,7 @@ void compress_state_real::async_tile_consumer(struct compress_state *s)
                                 }
                         }
 
-                        ret->compress_end = time_since_epoch_in_ms();
+                        ret->compress_end = get_time_in_ns();
                         compressed_tiles.resize(state.size(), nullptr);
                         compressed_tiles[i] = std::move(ret);
                 }

diff --git a/src/video_display/decklink.cpp b/src/video_display/decklink.cpp
@@ -54,7 +54,6 @@
 
 #include "audio/types.h"
 #include "blackmagic_common.hpp"
-#include "compat/platform_time.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
@@ -203,7 +202,12 @@ class PlaybackDelegate : public IDeckLinkVideoOutputCallback // , public IDeckLi
 				BMD_STR timecode_str;
 				if (timecode && timecode->GetString(&timecode_str) == S_OK) {
                                         char *timecode_cstr = get_cstr_from_bmd_api_str(timecode_str);
-					LOG(LOG_LEVEL_DEBUG) << "Frame " << timecode_cstr << " output at " <<  time_since_epoch_in_ms() / (double) 1e3 << '\n';
+                                        LOG(LOG_LEVEL_DEBUG)
+                                            << "Frame " << timecode_cstr
+                                            << " output at "
+                                            << (double) get_time_in_ns() /
+                                                   NS_IN_SEC_DBL
+                                            << '\n';
                                         release_bmd_api_str(timecode_str);
                                         free(timecode_cstr);
 				}

diff --git a/src/video_rxtx/ultragrid_rtp.cpp b/src/video_rxtx/ultragrid_rtp.cpp
@@ -48,7 +48,6 @@
 #include <string>
 #include <stdexcept>
 
-#include "compat/platform_time.h"
 #include "control_socket.h"
 #include "export.h"
 #include "host.h"