Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix detection of sudden congestion #1672

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Fix detection of sudden congestion #1672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c644de
Fix detection of sudden congestion
huitema Apr 14, 2024
a300da5
Relax mediatest-wifi for now
huitema Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else()
endif()

project(picoquic
VERSION 1.1.19.8
VERSION 1.1.19.9
DESCRIPTION "picoquic library"
LANGUAGES C CXX)

Expand Down
5 changes: 2 additions & 3 deletions picoquic/bbr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,11 +1517,10 @@ static uint64_t BBRTargetInflight(picoquic_bbr_state_t* bbr_state, picoquic_path
#ifdef RTTJitterBufferProbe
static int BBRCheckPathSaturated(picoquic_bbr_state_t* bbr_state, picoquic_path_t* path_x, bbr_per_ack_state_t * rs, uint64_t current_time)
{
if (!rs->is_app_limited &&
bbr_state->state != picoquic_bbr_alg_drain &&
if (IsInAProbeBWState(bbr_state) &&
rs->rtt_sample > 2*bbr_state->min_rtt &&
bbr_state->rounds_since_bw_probe >= 1 &&
bbr_state->pacing_rate > 3 * rs->delivery_rate &&
rs->rtt_sample > 2*bbr_state->min_rtt &&
bbr_state->wifi_shadow_rtt == 0) {
bbr_state->prior_cwnd = rs->delivered;
bbr_state->probe_rtt_done_stamp = 0;
Expand Down
2 changes: 1 addition & 1 deletion picoquic/picoquic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
extern "C" {
#endif

#define PICOQUIC_VERSION "1.1.19.8"
#define PICOQUIC_VERSION "1.1.19.9"
#define PICOQUIC_ERROR_CLASS 0x400
#define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
#define PICOQUIC_ERROR_AEAD_CHECK (PICOQUIC_ERROR_CLASS + 3)
Expand Down
10 changes: 5 additions & 5 deletions picoquictest/mediatest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,7 @@ int mediatest_video2_down_test()
spec.do_video2 = 1;
spec.do_audio = 1;
spec.data_size = 0;
spec.latency_average = 110000;
spec.latency_average = 100000;
spec.latency_max = 600000;
spec.do_not_check_video2 = 1;
ret = mediatest_one(mediatest_video2_down, &spec);
Expand All @@ -1344,8 +1344,8 @@ int mediatest_video2_back_test()
spec.do_video2 = 1;
spec.do_audio = 1;
spec.data_size = 0;
spec.latency_average = 110000;
spec.latency_max = 600000;
spec.latency_average = 50000;
spec.latency_max = 450000;
spec.do_not_check_video2 = 1;
ret = mediatest_one(mediatest_video2_back, &spec);

Expand Down Expand Up @@ -1376,8 +1376,8 @@ int mediatest_wifi_test()
spec.do_video2 = 1;
spec.do_audio = 1;
spec.data_size = 0;
spec.latency_average = 45000;
spec.latency_max = 240000;
spec.latency_average = 50000;
spec.latency_max = 300000;
spec.do_not_check_video2 = 1;
ret = mediatest_one(mediatest_wifi, &spec);

Expand Down
Loading