Haivision · ethouris · Aug 26, 2025 · May 24, 2024 · May 24, 2024 · May 25, 2024
diff --git a/.travis.yml b/.travis.yml
@@ -81,7 +81,7 @@ script:
         CMAKE_OPTS="-DENABLE_UNITTESTS=ON"
       fi
     - cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE $BUILD_OPTS $CMAKE_OPTS; then echo "Configure OK"; else cat CMakeFiles/CMakeError.log; fi;
-    - make -j$(nproc);
+    - make VERBOSE=1 -j$(nproc);
     - if [ "$TRAVIS_COMPILER" != "x86_64-w64-mingw32-g++" ]; then
         ulimit -c unlimited;
         ./test-srt -disable-ipv6;

diff --git a/apps/apputil.cpp b/apps/apputil.cpp
@@ -12,7 +12,6 @@
 #include <chrono>
 #include <iostream>
 #include <iomanip>
-#include <sstream>
 #include <utility>
 #include <memory>
 
@@ -21,6 +20,7 @@
 #include "apputil.hpp"
 #include "netinet_any.h"
 #include "srt_compat.h"
+#include "ofmt.h"
 
 using namespace std;
 using namespace srt;
@@ -145,10 +145,10 @@ sockaddr_any CreateAddr(const string& name, unsigned short port, int pref_family
 
 string Join(const vector<string>& in, string sep)
 {
-    if ( in.empty() )
+    if (in.empty())
         return "";
 
-    ostringstream os;
+    srt::ofmtbufstream os;
 
     os << in[0];
     for (auto i = in.begin()+1; i != in.end(); ++i)

diff --git a/apps/logsupport.cpp b/apps/logsupport.cpp
@@ -17,6 +17,7 @@
 #include "logsupport.hpp"
 #include "../srtcore/srt.h"
 #include "../srtcore/utilities.h"
+#include "../srtcore/ofmt.h"
 
 using namespace std;
 using namespace srt;
@@ -174,7 +175,7 @@ set<srt_logging::LogFA> SrtParseLogFA(string fa, set<string>* punknown)
 
 void ParseLogFASpec(const vector<string>& speclist, string& w_on, string& w_off)
 {
-    std::ostringstream son, soff;
+    srt::ofmtbufstream son, soff;
 
     for (auto& s: speclist)
     {

diff --git a/apps/srt-file-transmit.cpp b/apps/srt-file-transmit.cpp
@@ -390,8 +390,10 @@ bool DoUpload(UriParser& ut, string path, string filename,
             while (n > 0)
             {
                 int st = tar->Write(buf.data() + shift, n, 0, out_stats);
-                Verb() << "Upload: " << n << " --> " << st
-                    << (!shift ? string() : "+" + Sprint(shift));
+                Verb("Upload: ", n, " --> ", st, VerbNoEOL);
+                if (shift)
+                    Verb("+", shift, VerbNoEOL);
+                Verb();
                 if (st == int(SRT_ERROR))
                 {
                     cerr << "Upload: SRT error: " << srt_getlasterror_str()

diff --git a/apps/srt-tunnel.cpp b/apps/srt-tunnel.cpp
@@ -472,13 +472,13 @@ class SrtMedium: public Medium
     {
         string message = srt_strerror(srterror, errnov);
 
-        string hm = srt::Sprint("ERROR #", srterror, ": ", text, ": ", message);
+        string hm = fmtcat("ERROR #", srterror, ": ", text, ": ", message);
         if (errnov == 0)
             throw TransmissionError(hm);
         else
         {
             char buf[180];
-            throw TransmissionError(srt::Sprint(hm, ": #", errnov, ": ", SysStrError(errnov, buf, 179)));
+            throw TransmissionError(fmtcat(hm, ": #", errnov, ": ", SysStrError(errnov, buf, 179)));
         }
     }
 

diff --git a/apps/transmitmedia.cpp b/apps/transmitmedia.cpp
@@ -29,7 +29,11 @@
 #include <sys/filio.h>
 #endif
 
+#define REQUIRE_CXX11 1
+
+#include "srt_attr_defs.h"
 #include "netinet_any.h"
+#include "ofmt.h"
 #include "apputil.hpp"
 #include "socketoptions.hpp"
 #include "uriparser.hpp"
@@ -230,9 +234,9 @@ void SrtCommon::InitParameters(string host, map<string,string> par)
         && transmit_chunk_size > SRT_LIVE_DEF_PLSIZE)
     {
         if (transmit_chunk_size > max_payload_size)
-            Error(Sprint("Chunk size in live mode exceeds ", max_payload_size, " bytes; this is not supported"));
+            Error(fmtcat("Chunk size in live mode exceeds ", max_payload_size, " bytes; this is not supported"));
 
-        par["payloadsize"] = Sprint(transmit_chunk_size);
+        par["payloadsize"] = fmts(transmit_chunk_size);
     }
     else
     {
@@ -315,7 +319,7 @@ bool SrtCommon::AcceptNewClient()
     {
         srt_close(m_bindsock);
         srt_close(m_sock);
-        Error(Sprint("accepted connection's payload size ", maxsize, " is too small for required ", transmit_chunk_size, " chunk size"));
+        Error(fmtcat("accepted connection's payload size ", maxsize, " is too small for required ", transmit_chunk_size, " chunk size"));
     }
 
     // we do one client connection at a time,
@@ -495,7 +499,7 @@ void SrtCommon::ConnectClient(string host, int port)
     if (m_transtype == SRTT_LIVE && transmit_chunk_size > size_t(maxsize))
     {
         srt_close(m_sock);
-        Error(Sprint("accepted connection's payload size ", maxsize, " is too small for required ", transmit_chunk_size, " chunk size"));
+        Error(fmtcat("accepted connection's payload size ", maxsize, " is too small for required ", transmit_chunk_size, " chunk size"));
     }
 
     SRTSTATUS stat = ConfigurePost(m_sock);
@@ -586,10 +590,7 @@ SrtCommon::~SrtCommon()
 SrtSource::SrtSource(string host, int port, const map<string,string>& par)
 {
     Init(host, port, par, false);
-
-    ostringstream os;
-    os << host << ":" << port;
-    hostport_copy = os.str();
+    hostport_copy = fmtcat(host, ":"_V, port);
 }
 
 int SrtSource::Read(size_t chunk, MediaPacket& pkt, ostream &out_stats)

diff --git a/apps/uriparser.cpp b/apps/uriparser.cpp
@@ -57,44 +57,46 @@ UriParser::~UriParser(void)
 
 string UriParser::makeUri()
 {
+    using namespace srt;
+
     // Reassemble parts into the URI
     string prefix = "";
     if (m_proto != "")
     {
         prefix = m_proto + "://";
     }
 
-    std::ostringstream out;
+    ofmtbufstream out;
 
-    out << prefix << m_host;
+    out.print(prefix, m_host);
     if ((m_port == "" || m_port == "0") && m_expect == EXPECT_FILE)
     {
         // Do not add port
     }
     else
     {
-        out << ":" << m_port;
+        out.print(":"_V, m_port);
     }
 
     if (m_path != "")
     {
         if (m_path[0] != '/')
-            out << "/";
-        out << m_path;
+            out.print("/"_V);
+        out.print(m_path);
     }
 
     if (!m_mapQuery.empty())
     {
-        out << "?";
+        out.print("?"_V);
 
         query_it i = m_mapQuery.begin();
         for (;;)
         {
-            out << i->first << "=" << i->second;
+            out.print(i->first, "="_V, i->second);
             ++i;
             if (i == m_mapQuery.end())
                 break;
-            out << "&";
+            out.print("&"_V);
         }
     }
 

diff --git a/apps/verbose.hpp b/apps/verbose.hpp
@@ -11,7 +11,7 @@
 #ifndef INC_SRT_VERBOSE_HPP
 #define INC_SRT_VERBOSE_HPP
 
-#include <iostream>
+#include "ofmt_iostream.h"
 #include "sync.h"
 
 namespace Verbose

diff --git a/srtcore/api.cpp b/srtcore/api.cpp
@@ -249,7 +249,7 @@ string CUDTUnited::CONID(SRTSOCKET sock)
     if (int32_t(sock) <= 0) // embraces SRT_INVALID_SOCK, SRT_SOCKID_CONNREQ and illegal negative domain
         return "";
 
-    std::ostringstream os;
+    ofmtbufstream os;
     os << "@" << int(sock) << ":";
     return os.str();
 }
@@ -1732,7 +1732,7 @@ SRTSOCKET CUDTUnited::groupConnect(CUDTGroup* pg, SRT_SOCKGROUPCONFIG* targets,
             for (size_t i = 0; i < g.m_config.size(); ++i)
             {
                 HLOGC(aclog.Debug, log << "groupConnect: OPTION @" << sid << " #" << g.m_config[i].so);
-                error_reason = "group-derived option: #" + Sprint(g.m_config[i].so);
+                error_reason = fmtcat("group-derived option: #", g.m_config[i].so);
                 ns->core().setOpt(g.m_config[i].so, &g.m_config[i].value[0], (int)g.m_config[i].value.size());
             }
 
@@ -4003,13 +4003,13 @@ bool CUDTUnited::updateListenerMux(CUDTSocket* s, const CUDTSocket* ls)
             CMultiplexer& m = i->second;
 
 #if ENABLE_HEAVY_LOGGING
-            ostringstream that_muxer;
+            ofmtbufstream that_muxer;
             that_muxer << "id=" << m.id() << " addr=" << m.selfAddr().str();
 #endif
 
             if (m.selfAddr().hport() == port)
             {
-                HLOGC(smlog.Debug, log << "updateListenerMux: reusing muxer: " << that_muxer.str());
+                HLOGC(smlog.Debug, log << "updateListenerMux: reusing muxer: " << that_muxer);
                 if (m.selfAddr().family() == s->m_PeerAddr.family())
                 {
                     mux = &m; // best match
@@ -4023,7 +4023,7 @@ bool CUDTUnited::updateListenerMux(CUDTSocket* s, const CUDTSocket* ls)
             }
             else
             {
-                HLOGC(smlog.Debug, log << "updateListenerMux: SKIPPING muxer: " << that_muxer.str());
+                HLOGC(smlog.Debug, log << "updateListenerMux: SKIPPING muxer: " << that_muxer);
             }
         }
 

diff --git a/srtcore/buffer_rcv.cpp b/srtcore/buffer_rcv.cpp
@@ -161,7 +161,7 @@ CRcvBuffer::InsertInfo CRcvBuffer::insert(CUnit* unit)
         IF_RCVBUF_DEBUG(scoped_log.ss << " returns -2");
         return InsertInfo(InsertInfo::BELATED);
     }
-    IF_HEAVY_LOGGING(string debug_source = "insert %" + Sprint(seqno));
+    IF_HEAVY_LOGGING(string debug_source = fmtcat("insert %", seqno));
 
     if (offset >= COff(capacity()))
     {
@@ -510,7 +510,7 @@ std::pair<int, int> CRcvBuffer::dropUpTo(int32_t seqno)
     }
     if (!m_tsbpd.isEnabled() && m_bMessageAPI)
         updateFirstReadableNonOrder();
-    IF_HEAVY_LOGGING(debugShowState(("drop %" + Sprint(seqno)).c_str()));
+    IF_HEAVY_LOGGING(debugShowState(fmtcat("drop %", seqno).c_str()));
     return std::make_pair(iNumDropped, iNumDiscarded);
 }
 
@@ -660,7 +660,7 @@ int CRcvBuffer::dropMessage(int32_t seqnolo, int32_t seqnohi, int32_t msgno, Dro
     updateGapInfo();
 
     IF_HEAVY_LOGGING(debugShowState(
-                ("dropmsg off %" + Sprint(seqnolo) + " #" + Sprint(msgno)).c_str()));
+                ("dropmsg off %" + fmts(seqnolo) + " #" + fmts(msgno)).c_str()));
 
     if (needUpdateNonreadPos)
     {
@@ -674,7 +674,7 @@ int CRcvBuffer::dropMessage(int32_t seqnolo, int32_t seqnohi, int32_t msgno, Dro
         updateFirstReadableNonOrder();
     }
 
-    IF_HEAVY_LOGGING(debugShowState(("dropmsg off %" + Sprint(seqnolo)).c_str()));
+    IF_HEAVY_LOGGING(debugShowState(("dropmsg off %" + fmts(seqnolo)).c_str()));
     return iDropCnt;
 }
 

diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp
@@ -1145,7 +1145,8 @@ EReadStatus CChannel::recvfrom(sockaddr_any& w_addr, CPacket& w_packet) const
 #endif
 
         HLOGC(krlog.Debug,
-              log << CONID() << "NET ERROR: packet size=" << recv_size << " msg_flags=0x" << hex << msg_flags
+              log << CONID() << "NET ERROR: packet size=" << recv_size << " msg_flags=0x"
+                  << fmt(msg_flags, hex)
                   << ", detected flags:" << flg.str());
 #endif
         status = RST_AGAIN;

diff --git a/srtcore/common.cpp b/srtcore/common.cpp
@@ -282,15 +282,15 @@ void CIPAddress::pton(sockaddr_any& w_addr, const uint32_t ip[4], const sockaddr
     }
     else
     {
-        LOGC(inlog.Error, log << "pton: IPE or net error: can't determine IPv4 carryover format: " << std::hex
-                << peeraddr16[0] << ":"
-                << peeraddr16[1] << ":"
-                << peeraddr16[2] << ":"
-                << peeraddr16[3] << ":"
-                << peeraddr16[4] << ":"
-                << peeraddr16[5] << ":"
-                << peeraddr16[6] << ":"
-                << peeraddr16[7] << std::dec);
+#if ENABLE_LOGGING
+        ofmtbufstream peeraddr_form;
+        fmtc hex04 = fmtc().hex().fillzero().width(4);
+        peeraddr_form << fmt(peeraddr16[0], hex04);
+        for (int i = 1; i < 8; ++i)
+            peeraddr_form << ":" << fmt(peeraddr16[i], hex04);
+
+        LOGC(inlog.Error, log << "pton: IPE or net error: can't determine IPv4 carryover format: " << peeraddr_form);
+#endif
         *target_ipv4_addr = 0;
         if (peer.family() != AF_INET)
         {