diff --git a/main.cpp b/main.cpp index 8e83d75..782b4df 100644 --- a/main.cpp +++ b/main.cpp @@ -33,10 +33,10 @@ int debug_force_flush_fec=0; int fec_data_num=20; int fec_redundant_num=10; -int fec_mtu=1200; +int fec_mtu=1250; int fec_pending_num=200; -int fec_pending_time=10*1000; //10ms -int fec_type=0; +int fec_pending_time=8*1000; //8ms +int fec_type=1; int jitter_min=0*1000; int jitter_max=0*1000; @@ -1170,8 +1170,8 @@ void print_help() printf("main options:\n"); printf(" -f,--fec x:y forward error correction,send y redundant packets for every x packets\n"); - printf(" --timeout how long could a packet be held in queue before doing fec,unit: ms\n"); - printf(" --mode fec-mode,available values: 0,1 ; 0 cost less bandwidth,1 cost less latency\n"); + printf(" --timeout how long could a packet be held in queue before doing fec,unit: ms,default :8ms\n"); + printf(" --mode fec-mode,available values: 0,1 ; 0 cost less bandwidth,1 cost less latency(default)\n"); printf(" --report turn on send/recv report,and set a period for reporting,unit:s\n"); printf("advanced options:\n"); @@ -1190,7 +1190,7 @@ void print_help() printf(" -j ,--jitter jmin:jmax similiar to -j above,but create jitter randomly between jmin and jmax\n"); printf(" -i,--interval imin:imax similiar to -i above,but scatter randomly between imin and imax\n"); printf(" -q,--queue-len max fec queue len,only for mode 0\n"); - printf(" --decode-buf size of buffer of fec decoder,unit:packet,default:2000\n"); + printf(" --decode-buf size of buffer of fec decoder,unit:packet,default:2000\n"); printf(" --fix-latency try to stabilize latency,only for mode 0\n"); printf(" --delay-capacity max number of delayed packets\n"); printf(" --disable-fec completely disable fec,turn the program into a normal udp tunnel\n"); diff --git a/makefile b/makefile index 459911c..0d1a57b 100755 --- a/makefile +++ b/makefile @@ -10,7 +10,7 @@ FLAGS= -std=c++11 -Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -Wn SOURCES=main.cpp log.cpp common.cpp lib/fec.c lib/rs.c packet.cpp delay_manager.cpp fd_manager.cpp connection.cpp fec_manager.cpp -NAME=speeder +NAME=speederv2 TARGETS=amd64 arm mips24kc_be x86 mips24kc_le TAR=${NAME}_binaries.tar.gz `echo ${TARGETS}|sed -r 's/([^ ]+)/speeder_\1/g'`