Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build on GCC 4.8.5. #100

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Fixed build on GCC 4.8.5. #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion xtransmit/misc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ inline std::string print_timestamp_now()

#endif // HAS_PUT_TIME


struct stats_config
{
int stats_freq_ms = 0;
Expand Down
45 changes: 34 additions & 11 deletions xtransmit/receive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
#include "apputil.hpp"
#include "uriparser.hpp"

using namespace std;
using std::vector;
using std::unique_ptr;
using std::atomic_bool;
using std::string;
using namespace xtransmit;
using namespace xtransmit::receive;
using namespace std::chrono;
Expand All @@ -32,33 +35,53 @@ using shared_sock = std::shared_ptr<socket::isocket>;

#define LOG_SC_RECEIVE "RECEIVE "


namespace xtransmit
{
namespace details
{
#if defined(_MSC_VER) || __cplusplus >= 201402L // C++14 and beyond
using std::make_unique;
#else
template<typename T, typename... Args>
std::unique_ptr<T> make_unique(Args &&... args)
{
static_assert(!std::is_array<T>::value, "arrays are not supported");
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
#endif
}
}

void trace_message(const size_t bytes, const vector<char>& buffer, SOCKET conn_id)
{
::cout << "RECEIVED MESSAGE length " << bytes << " on conn ID " << conn_id;
using std::cout;
cout << "RECEIVED MESSAGE length " << bytes << " on conn ID " << conn_id;

#if 0
if (bytes < 50)
{
::cout << ":\n";
::cout << string(buffer.data(), bytes).c_str();
cout << ":\n";
cout << string(buffer.data(), bytes).c_str();
}
else if (buffer[0] >= '0' && buffer[0] <= 'z')
{
::cout << " (first character):";
::cout << buffer[0];
cout << " (first character):";
cout << buffer[0];
}
#endif
::cout << endl;
cout << std::endl;

// CHandShake hs;
// if (hs.load_from(buffer.data(), buffer.size()) < 0)
// return;
//
//::cout << "SRT HS: " << hs.show() << endl;
//cout << "SRT HS: " << hs.show() << endl;
}

void run_pipe(shared_sock src, const config& cfg, unique_ptr<metrics::metrics_writer>& metrics, std::function<void(int conn_id)> const& on_done, const atomic_bool& force_break)
{
using std::make_shared;
socket::isocket& sock = *src.get();
const auto conn_id = sock.id();

Expand Down Expand Up @@ -128,10 +151,10 @@ void xtransmit::receive::run(const std::vector<std::string>& src_urls,
if (write_metrics)
{
try {
metrics = make_unique<metrics::metrics_writer>(
metrics = details::make_unique<metrics::metrics_writer>(
cfg.metrics_file, milliseconds(cfg.metrics_freq_ms));
}
catch (const runtime_error& e)
catch (const std::runtime_error& e)
{
spdlog::error(LOG_SC_RECEIVE "{}", e.what());
return;
Expand All @@ -144,7 +167,7 @@ void xtransmit::receive::run(const std::vector<std::string>& src_urls,

CLI::App* xtransmit::receive::add_subcommand(CLI::App& app, config& cfg, std::vector<std::string>& src_urls)
{
const map<string, int> to_ms{{"s", 1000}, {"ms", 1}};
const std::map<string, int> to_ms{{"s", 1000}, {"ms", 1}};

CLI::App* sc_receive = app.add_subcommand("receive", "Receive data (SRT, UDP)")->fallthrough();
sc_receive->add_option("-i,--input,src", src_urls, "Source URI");
Expand Down
Loading