diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2022-08-22 17:16:20 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2022-08-22 17:16:20 +0200 |
| commit | 7544d1eca9f33f450d2bf3e36b9df298cd7c23d9 (patch) | |
| tree | b9a31156af4a3ff835a114513cec8ae404a3301d | |
| parent | ba05fa20365b26d1e0519220abf4d84319b5408e (diff) | |
| download | ODR-AudioEnc-7544d1eca9f33f450d2bf3e36b9df298cd7c23d9.tar.gz ODR-AudioEnc-7544d1eca9f33f450d2bf3e36b9df298cd7c23d9.tar.bz2 ODR-AudioEnc-7544d1eca9f33f450d2bf3e36b9df298cd7c23d9.zip | |
Common 306b5fc: Move tcp_server_preroll setting to tcp_server_t
| -rw-r--r-- | contrib/edioutput/EDIConfig.h | 6 | ||||
| -rw-r--r-- | contrib/edioutput/Transport.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/edioutput/EDIConfig.h b/contrib/edioutput/EDIConfig.h index a7225a7..1997210 100644 --- a/contrib/edioutput/EDIConfig.h +++ b/contrib/edioutput/EDIConfig.h @@ -53,6 +53,9 @@ struct udp_destination_t : public destination_t { struct tcp_server_t : public destination_t { unsigned int listen_port = 0; size_t max_frames_queued = 1024; + + // The TCP Server output can preroll a fixed number of previous buffers each time a new client connects. + size_t tcp_server_preroll_buffers = 0; }; // TCP client that connects to one endpoint @@ -74,9 +77,6 @@ struct configuration_t { // Spread transmission of fragments in time. 1.0 = 100% means spreading over the whole duration of a frame (24ms) // Above 100% means that the fragments are spread over several 24ms periods, interleaving the AF packets. - // TCP Server output can preroll a fixed number of previous buffers each time a new client connects. - size_t tcp_server_preroll_buffers = 0; - bool enabled() const { return destinations.size() > 0; } void print() const; diff --git a/contrib/edioutput/Transport.cpp b/contrib/edioutput/Transport.cpp index a870aa0..8ebb9fc 100644 --- a/contrib/edioutput/Transport.cpp +++ b/contrib/edioutput/Transport.cpp @@ -66,7 +66,7 @@ Sender::Sender(const configuration_t& conf) : edi_pft(m_conf) { if (m_conf.verbose) { - etiLog.level(info) << "Setup EDI Output, TCP output preroll " << m_conf.tcp_server_preroll_buffers; + etiLog.level(info) << "Setup EDI Output"; } for (const auto& edi_dest : m_conf.destinations) { @@ -82,7 +82,7 @@ Sender::Sender(const configuration_t& conf) : } else if (auto tcp_dest = dynamic_pointer_cast<edi::tcp_server_t>(edi_dest)) { auto dispatcher = make_shared<Socket::TCPDataDispatcher>( - tcp_dest->max_frames_queued, m_conf.tcp_server_preroll_buffers); + tcp_dest->max_frames_queued, tcp_dest->tcp_server_preroll_buffers); dispatcher->start(tcp_dest->listen_port, "0.0.0.0"); tcp_dispatchers.emplace(tcp_dest.get(), dispatcher); |