Fix MoqtSession to actually read data from the padding streams. Add an integration test to ensure the MoqtProbeManager actually works. PiperOrigin-RevId: 793886723
diff --git a/quiche/quic/moqt/moqt_integration_test.cc b/quiche/quic/moqt/moqt_integration_test.cc index 3b6af85..3325c2e 100644 --- a/quiche/quic/moqt/moqt_integration_test.cc +++ b/quiche/quic/moqt/moqt_integration_test.cc
@@ -10,13 +10,16 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include "quiche/quic/core/quic_bandwidth.h" #include "quiche/quic/core/quic_generic_session.h" #include "quiche/quic/core/quic_time.h" +#include "quiche/quic/core/quic_types.h" #include "quiche/quic/moqt/moqt_known_track_publisher.h" #include "quiche/quic/moqt/moqt_live_relay_queue.h" #include "quiche/quic/moqt/moqt_messages.h" #include "quiche/quic/moqt/moqt_outgoing_queue.h" #include "quiche/quic/moqt/moqt_priority.h" +#include "quiche/quic/moqt/moqt_probe_manager.h" #include "quiche/quic/moqt/moqt_publisher.h" #include "quiche/quic/moqt/moqt_session.h" #include "quiche/quic/moqt/moqt_subscribe_windows.h" @@ -777,6 +780,28 @@ EXPECT_EQ(bytes_received, 2000); } +TEST_F(MoqtIntegrationTest, BandwidthProbe) { + EstablishSession(); + MoqtProbeManager probe_manager(client_->session()->session(), + test_harness_.simulator().GetClock(), + *test_harness_.simulator().GetAlarmFactory()); + + constexpr quic::QuicBandwidth kModelBandwidth = + quic::simulator::TestHarness::kServerBandwidth; + constexpr quic::QuicByteCount kProbeSize = 1024 * 1024; + constexpr quic::QuicTimeDelta kProbeTimeout = + kModelBandwidth.TransferTime(kProbeSize) * 10; + bool probe_done = false; + probe_manager.StartProbe(kProbeSize, kProbeTimeout, + [&probe_done](const ProbeResult& result) { + probe_done = true; + EXPECT_EQ(result.status, ProbeStatus::kSuccess); + }); + bool success = + test_harness_.RunUntilWithDefaultTimeout([&]() { return probe_done; }); + EXPECT_TRUE(success); +} + } // namespace } // namespace moqt::test
diff --git a/quiche/quic/moqt/moqt_session.cc b/quiche/quic/moqt/moqt_session.cc index dcdee31..d68578d 100644 --- a/quiche/quic/moqt/moqt_session.cc +++ b/quiche/quic/moqt/moqt_session.cc
@@ -1844,6 +1844,10 @@ return; } } + if (parser_.stream_type()->IsPadding()) { + (void)stream_->SkipBytes(stream_->ReadableBytes()); + return; + } bool knew_track_alias = parser_.track_alias().has_value(); if (parser_.stream_type()->IsSubgroup()) { parser_.ReadAllData();