Skip to content

Commit 93a6df7

Browse files
author
Anders Cedronius
committed
Removed C++20 designated initializer for portability and added correct windows defines
1 parent 2ff6a0c commit 93a6df7

File tree

2 files changed

+46
-36
lines changed

2 files changed

+46
-36
lines changed

‎RISTNet.h‎

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include "librist.h"
1717
#include <string.h>
18-
#include <sys/time.h>
1918
#include <any>
2019
#include <tuple>
2120
#include <vector>
@@ -25,8 +24,16 @@
2524
#include <map>
2625
#include <functional>
2726
#include <mutex>
28-
#include <sys/socket.h>
27+
28+
#ifdef WIN32
29+
#include <Winsock2.h>
30+
#define _WINSOCKAPI_
31+
#include <ws2tcpip.h>
32+
#else
2933
#include <arpa/inet.h>
34+
#endif
35+
36+
3037

3138
/**
3239
* \class NetworkConnection
@@ -79,24 +86,25 @@ class RISTNetReceiver {
7986
public:
8087

8188
struct RISTNetReceiverSettings {
89+
RISTNetReceiverSettings() {
90+
mPeerConfig.version = RIST_PEER_CONFIG_VERSION;
91+
mPeerConfig.virt_dst_port = RIST_DEFAULT_VIRT_DST_PORT;
92+
mPeerConfig.recovery_mode = RIST_DEFAULT_RECOVERY_MODE;
93+
mPeerConfig.recovery_maxbitrate = RIST_DEFAULT_RECOVERY_MAXBITRATE;
94+
mPeerConfig.recovery_maxbitrate_return = RIST_DEFAULT_RECOVERY_MAXBITRATE_RETURN;
95+
mPeerConfig.recovery_length_min = RIST_DEFAULT_RECOVERY_LENGHT_MIN;
96+
mPeerConfig.recovery_length_max = RIST_DEFAULT_RECOVERY_LENGHT_MAX;
97+
mPeerConfig.recovery_reorder_buffer = RIST_DEFAULT_RECOVERY_REORDER_BUFFER;
98+
mPeerConfig.recovery_rtt_min = RIST_DEFAULT_RECOVERY_RTT_MIN;
99+
mPeerConfig.recovery_rtt_max = RIST_DEFAULT_RECOVERY_RTT_MAX;
100+
mPeerConfig.weight = 5;
101+
mPeerConfig.buffer_bloat_mode = RIST_DEFAULT_BUFFER_BLOAT_MODE;
102+
mPeerConfig.buffer_bloat_limit = RIST_DEFAULT_BUFFER_BLOAT_LIMIT;
103+
mPeerConfig.buffer_bloat_hard_limit = RIST_DEFAULT_BUFFER_BLOAT_HARD_LIMIT;
104+
mPeerConfig.session_timeout = 10000;
105+
}
82106
enum rist_profile mProfile = RIST_PROFILE_MAIN;
83-
rist_peer_config mPeerConfig = {
84-
.version = RIST_PEER_CONFIG_VERSION,
85-
.virt_dst_port = RIST_DEFAULT_VIRT_DST_PORT,
86-
.recovery_mode = RIST_DEFAULT_RECOVERY_MODE,
87-
.recovery_maxbitrate = RIST_DEFAULT_RECOVERY_MAXBITRATE,
88-
.recovery_maxbitrate_return = RIST_DEFAULT_RECOVERY_MAXBITRATE_RETURN,
89-
.recovery_length_min = RIST_DEFAULT_RECOVERY_LENGHT_MIN,
90-
.recovery_length_max = RIST_DEFAULT_RECOVERY_LENGHT_MAX,
91-
.recovery_reorder_buffer = RIST_DEFAULT_RECOVERY_REORDER_BUFFER,
92-
.recovery_rtt_min = RIST_DEFAULT_RECOVERY_RTT_MIN,
93-
.recovery_rtt_max = RIST_DEFAULT_RECOVERY_RTT_MAX,
94-
.weight = 5,
95-
.buffer_bloat_mode = RIST_DEFAULT_BUFFER_BLOAT_MODE,
96-
.buffer_bloat_limit = RIST_DEFAULT_BUFFER_BLOAT_LIMIT,
97-
.buffer_bloat_hard_limit = RIST_DEFAULT_BUFFER_BLOAT_HARD_LIMIT,
98-
.session_timeout = 10000
99-
};
107+
rist_peer_config mPeerConfig;
100108

101109
enum rist_log_level mLogLevel = RIST_LOG_QUIET;
102110
std::string mPSK = "";
@@ -282,24 +290,25 @@ class RISTNetSender {
282290
public:
283291

284292
struct RISTNetSenderSettings {
285-
enum rist_profile mProfile = RIST_PROFILE_MAIN;
286-
rist_peer_config mPeerConfig = {
287-
.version = RIST_PEER_CONFIG_VERSION,
288-
.virt_dst_port = RIST_DEFAULT_VIRT_DST_PORT,
289-
.recovery_mode = RIST_DEFAULT_RECOVERY_MODE,
290-
.recovery_maxbitrate = RIST_DEFAULT_RECOVERY_MAXBITRATE,
291-
.recovery_maxbitrate_return = RIST_DEFAULT_RECOVERY_MAXBITRATE_RETURN,
292-
.recovery_length_min = RIST_DEFAULT_RECOVERY_LENGHT_MIN,
293-
.recovery_length_max = RIST_DEFAULT_RECOVERY_LENGHT_MAX,
294-
.recovery_reorder_buffer = RIST_DEFAULT_RECOVERY_REORDER_BUFFER,
295-
.recovery_rtt_min = RIST_DEFAULT_RECOVERY_RTT_MIN,
296-
.recovery_rtt_max = RIST_DEFAULT_RECOVERY_RTT_MAX,
297-
.weight = 5,
298-
.buffer_bloat_mode = RIST_DEFAULT_BUFFER_BLOAT_MODE,
299-
.buffer_bloat_limit = RIST_DEFAULT_BUFFER_BLOAT_LIMIT,
300-
.buffer_bloat_hard_limit = RIST_DEFAULT_BUFFER_BLOAT_HARD_LIMIT,
301-
.session_timeout = 10000
293+
RISTNetSenderSettings() {
294+
mPeerConfig.version = RIST_PEER_CONFIG_VERSION;
295+
mPeerConfig.virt_dst_port = RIST_DEFAULT_VIRT_DST_PORT;
296+
mPeerConfig.recovery_mode = RIST_DEFAULT_RECOVERY_MODE;
297+
mPeerConfig.recovery_maxbitrate = RIST_DEFAULT_RECOVERY_MAXBITRATE;
298+
mPeerConfig.recovery_maxbitrate_return = RIST_DEFAULT_RECOVERY_MAXBITRATE_RETURN;
299+
mPeerConfig.recovery_length_min = RIST_DEFAULT_RECOVERY_LENGHT_MIN;
300+
mPeerConfig.recovery_length_max = RIST_DEFAULT_RECOVERY_LENGHT_MAX;
301+
mPeerConfig.recovery_reorder_buffer = RIST_DEFAULT_RECOVERY_REORDER_BUFFER;
302+
mPeerConfig.recovery_rtt_min = RIST_DEFAULT_RECOVERY_RTT_MIN;
303+
mPeerConfig.recovery_rtt_max = RIST_DEFAULT_RECOVERY_RTT_MAX;
304+
mPeerConfig.weight = 5;
305+
mPeerConfig.buffer_bloat_mode = RIST_DEFAULT_BUFFER_BLOAT_MODE;
306+
mPeerConfig.buffer_bloat_limit = RIST_DEFAULT_BUFFER_BLOAT_LIMIT;
307+
mPeerConfig.buffer_bloat_hard_limit = RIST_DEFAULT_BUFFER_BLOAT_HARD_LIMIT;
308+
mPeerConfig.session_timeout = 10000;
302309
};
310+
enum rist_profile mProfile = RIST_PROFILE_MAIN;
311+
rist_peer_config mPeerConfig;
303312

304313
enum rist_log_level mLogLevel = RIST_LOG_QUIET;
305314
std::string mPSK = "";

‎main.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//
44

55
#include <iostream>
6+
#include <algorithm>
67
#include <thread>
78
#include "RISTNet.h"
89

0 commit comments

Comments
 (0)