edits
parent
1c534c05f1
commit
6a2da08d86
|
|
@ -766,9 +766,9 @@ void NormStreamer::ReadInput()
|
||||||
assert(input_index < input_msg_length);
|
assert(input_index < input_msg_length);
|
||||||
numBytes = input_msg_length - input_index;
|
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);
|
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)
|
if (result > 0)
|
||||||
{
|
{
|
||||||
input_index += result;
|
input_index += result;
|
||||||
|
|
@ -1176,7 +1176,7 @@ void NormStreamer::HandleNormEvent(const NormEvent& event)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NORM_GRTT_UPDATED:
|
case NORM_GRTT_UPDATED:
|
||||||
fprintf(stderr, "new GRTT = %lf\n", NormGetGrttEstimate(norm_session));
|
//TRACE("normStreamer: new GRTT = %lf\n", NormGetGrttEstimate(norm_session));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NORM_ACKING_NODE_NEW:
|
case NORM_ACKING_NODE_NEW:
|
||||||
|
|
@ -1455,7 +1455,7 @@ int main(int argc, char* argv[])
|
||||||
unsigned long outputSocketBufferSize = 0; // 6*1024*1024;
|
unsigned long outputSocketBufferSize = 0; // 6*1024*1024;
|
||||||
unsigned long txSocketBufferSize = 0; // 6*1024*1024;
|
unsigned long txSocketBufferSize = 0; // 6*1024*1024;
|
||||||
unsigned long rxSocketBufferSize = 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
|
// Instantiate a NormStreamer and set default params
|
||||||
NormStreamer normStreamer;
|
NormStreamer normStreamer;
|
||||||
|
|
|
||||||
|
|
@ -1801,7 +1801,7 @@ class NormCCFeedbackExtension : public NormHeaderExtension
|
||||||
CC_LOSS_OFFSET = (CC_RTT_OFFSET + 1)/2,
|
CC_LOSS_OFFSET = (CC_RTT_OFFSET + 1)/2,
|
||||||
CC_RATE_OFFSET = ((CC_LOSS_OFFSET*2)+2)/2,
|
CC_RATE_OFFSET = ((CC_LOSS_OFFSET*2)+2)/2,
|
||||||
//CC_RESERVED_OFFSET = ((CC_RATE_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
|
}; // end class NormCCFeedbackExtension
|
||||||
|
|
|
||||||
2
protolib
2
protolib
|
|
@ -1 +1 @@
|
||||||
Subproject commit e5ac157eb61e991c74acfe39e2febe8c09e187dc
|
Subproject commit a28606945f6b507760548b242b6706b51b5b69d3
|
||||||
Loading…
Reference in New Issue