scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 10:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced chrono clocks with integer nanoseconds

Browse Source 
Ref 84861d6

It was perhaps rather a workaround for low-resolution Windows timeval
compat. On the other hand it enforced C++ API and makes things a bit
complicated. It had also broken some invariants, namely that the timeval
values had been wallclock time.
This commit is contained in:
Martin Pulec
2022-03-16 11:09:15 +01:00
parent 571813689f
commit b5f1fd3735
14 changed files with 79 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@@ -90,6 +90,7 @@
#include "playback.h"
#include "rtp/rtp.h"
#include "rtsp/rtsp_utils.h"
#include "tv.h"
#include "ug_runtime_error.hpp"
#include "utils/color_out.h"
#include "utils/misc.h"
@@ -1331,7 +1332,7 @@ int main(int argc, char *argv[])
struct exporter *exporter = NULL;
int ret;
const chrono::steady_clock::time_point start_time(chrono::steady_clock::now());
time_ns_t start_time = get_time_in_ns();
struct ug_nat_traverse *nat_traverse = nullptr;
@@ -1398,7 +1399,7 @@ int main(int argc, char *argv[])
uv.audio = audio_cfg_init (&uv.root_module, &opt.audio,
opt.requested_encryption,
opt.force_ip_version, opt.requested_mcast_if,
opt.bitrate, &audio_offset, &start_time,
opt.bitrate, &audio_offset, start_time,
opt.requested_mtu, opt.requested_ttl, exporter);
if(!uv.audio) {
exit_uv(EXIT_FAIL_AUDIO);
@@ -1504,7 +1505,7 @@ int main(int argc, char *argv[])
params["fec"].str = opt.requested_video_fec;
params["encryption"].str = opt.requested_encryption;
params["bitrate"].ll = opt.bitrate;
params["start_time"].cptr = (const void *) &start_time;
params["start_time"].ll = start_time;
params["video_delay"].vptr = (volatile void *) &video_offset;
// UltraGrid RTP