diff --git a/examples/normStreamer.cpp b/examples/normStreamer.cpp index 4c68de0..7a339fe 100755 --- a/examples/normStreamer.cpp +++ b/examples/normStreamer.cpp @@ -766,9 +766,9 @@ void NormStreamer::ReadInput() assert(input_index < input_msg_length); numBytes = input_msg_length - input_index; } - TRACE("reading STDIN ...\n"); + //TRACE("reading STDIN ...\n"); ssize_t result = read(input_fd, input_buffer + input_index, numBytes); - TRACE(" result: %d\n", (int)result); + //TRACE(" result: %d\n", (int)result); if (result > 0) { input_index += result; @@ -1176,7 +1176,7 @@ void NormStreamer::HandleNormEvent(const NormEvent& event) break; case NORM_GRTT_UPDATED: - fprintf(stderr, "new GRTT = %lf\n", NormGetGrttEstimate(norm_session)); + //TRACE("normStreamer: new GRTT = %lf\n", NormGetGrttEstimate(norm_session)); break; case NORM_ACKING_NODE_NEW: @@ -1455,7 +1455,7 @@ int main(int argc, char* argv[]) unsigned long outputSocketBufferSize = 0; // 6*1024*1024; unsigned long txSocketBufferSize = 0; // 6*1024*1024; unsigned long rxSocketBufferSize = 0; // 6*1024*1024; - unsigned long streamBufferSize = 10*1024*1024; + unsigned long streamBufferSize = 2*1024*1024; // Instantiate a NormStreamer and set default params NormStreamer normStreamer; diff --git a/include/normMessage.h b/include/normMessage.h index 5aee81a..d913010 100755 --- a/include/normMessage.h +++ b/include/normMessage.h @@ -1801,7 +1801,7 @@ class NormCCFeedbackExtension : public NormHeaderExtension CC_LOSS_OFFSET = (CC_RTT_OFFSET + 1)/2, CC_RATE_OFFSET = ((CC_LOSS_OFFSET*2)+2)/2, //CC_RESERVED_OFFSET = ((CC_RATE_OFFSET*2)+2)/2 - CC_LOSS_EX_OFFSET = ((CC_RATE_OFFSET*2)+2)/2 // extended precision loss estimate (non-RFC5940 compliant, but compatible) + CC_LOSS_EX_OFFSET = ((CC_RATE_OFFSET*2)+2)/2 // extended precision loss estimate (non-RFC5740 compliant, but compatible) }; }; // end class NormCCFeedbackExtension diff --git a/protolib b/protolib index e5ac157..a286069 160000 --- a/protolib +++ b/protolib @@ -1 +1 @@ -Subproject commit e5ac157eb61e991c74acfe39e2febe8c09e187dc +Subproject commit a28606945f6b507760548b242b6706b51b5b69d3