diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 66a8a27ab..6dfb8eca5 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -445,6 +445,7 @@ rtc_server { gso on; # Whether pad first packet for GSO for padding bytes. # If 0, disable padding for GSO. + # @remark The max padding size is 0x7f(127). # default: 0 padding 0; } diff --git a/trunk/scripts/perf_gso.py b/trunk/scripts/perf_gso.py index 2158659e0..f09014143 100755 --- a/trunk/scripts/perf_gso.py +++ b/trunk/scripts/perf_gso.py @@ -43,7 +43,7 @@ obj = json.loads(s) # 2, 3, 5, 9, 16, 32, 64, 128, 256 keys = ['lt_2', 'lt_3', 'lt_5', 'lt_9', 'lt_16', 'lt_32', 'lt_64', 'lt_128', 'lt_256', 'gt_256'] -print("\n----------- 1 2 [3,4] [5,8] [9,15] [16,31] [32,63] [64,127] [128,255] [256,+)"), +print("\n----------- 1 2 [3,4] [5,8] [9,15] [16,31] [32,63] [64,127] [128,255] [256,+) Packets"), print "" print("AV---Frames"), diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 85c70f87b..8df22fea4 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -4855,7 +4855,7 @@ int SrsConfig::get_rtc_server_padding() return DEFAULT; } - return srs_min(16, ::atoi(conf->arg0().c_str())); + return srs_min(127, ::atoi(conf->arg0().c_str())); } SrsConfDirective* SrsConfig::get_rtc(string vhost) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 03497c08f..f17cd6ea6 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -489,7 +489,7 @@ void SrsRtcPackets::reset(bool gso, bool merge_nalus) SrsRtpPacket2* packet = packets[i]; packet->reset(); } - + use_gso = gso; should_merge_nalus = merge_nalus;