Fix ASAN/MSAN errors in MoqtSessionTest and MoqtTrackTest. PiperOrigin-RevId: 914909406
diff --git a/quiche/quic/moqt/moqt_key_value_pair.h b/quiche/quic/moqt/moqt_key_value_pair.h index ca038af..c40b50f 100644 --- a/quiche/quic/moqt/moqt_key_value_pair.h +++ b/quiche/quic/moqt/moqt_key_value_pair.h
@@ -16,13 +16,11 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "quiche/quic/core/quic_time.h" -#include "quiche/quic/moqt/moqt_error.h" #include "quiche/quic/moqt/moqt_priority.h" #include "quiche/quic/moqt/moqt_types.h" #include "quiche/common/platform/api/quiche_export.h" #include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/quiche_callbacks.h" -#include "quiche/common/quiche_data_writer.h" namespace moqt { @@ -205,7 +203,6 @@ quic::QuicTimeDelta::Infinite(); constexpr quic::QuicTimeDelta kDefaultExpires = quic::QuicTimeDelta::Infinite(); constexpr bool kDefaultForward = true; -constexpr uint8_t kDefaultSubscriberPriority = 128; // TODO(martinduke): Refactor this to be more like TrackExtensions. struct MessageParameters { MessageParameters() = default; @@ -264,7 +261,6 @@ inline constexpr quic::QuicTimeDelta kDefaultMaxCacheDuration = quic::QuicTimeDelta::Infinite(); inline constexpr bool kDefaultImmutableExtensions = false; -inline constexpr MoqtPriority kDefaultPublisherPriority = 128; inline constexpr MoqtDeliveryOrder kDefaultGroupOrder = MoqtDeliveryOrder::kAscending; inline constexpr bool kDefaultDynamicGroups = false;
diff --git a/quiche/quic/moqt/moqt_object.h b/quiche/quic/moqt/moqt_object.h index a465036..895a360 100644 --- a/quiche/quic/moqt/moqt_object.h +++ b/quiche/quic/moqt/moqt_object.h
@@ -27,8 +27,8 @@ Location location; std::optional<uint64_t> subgroup; // nullopt for datagrams. std::string extensions; - MoqtObjectStatus status; - MoqtPriority publisher_priority; + MoqtObjectStatus status = MoqtObjectStatus::kNormal; + MoqtPriority publisher_priority = kDefaultPublisherPriority; // The length of the entire payload, which might include data that is not // present in an encompassing PublishedObject or CachedObject. uint64_t payload_length;
diff --git a/quiche/quic/moqt/moqt_priority.h b/quiche/quic/moqt/moqt_priority.h index 412cf42..a763934 100644 --- a/quiche/quic/moqt/moqt_priority.h +++ b/quiche/quic/moqt/moqt_priority.h
@@ -16,6 +16,8 @@ // with the track by either the publisher or the subscriber. using MoqtPriority = uint8_t; static constexpr uint64_t kMaxPriority = 0xff; +static constexpr MoqtPriority kDefaultPublisherPriority = 128; +static constexpr MoqtPriority kDefaultSubscriberPriority = 128; // Indicates the desired order of delivering groups associated with a given // track.
diff --git a/quiche/quic/moqt/moqt_session_test.cc b/quiche/quic/moqt/moqt_session_test.cc index 62b61be..e8f27fe 100644 --- a/quiche/quic/moqt/moqt_session_test.cc +++ b/quiche/quic/moqt/moqt_session_test.cc
@@ -2658,6 +2658,7 @@ // FETCH_OK responding to the request. MoqtFetchOk expected_ok; expected_ok.request_id = fetch.request_id; + expected_ok.end_of_track = false; expected_ok.end_location = Location(1, 0); EXPECT_CALL(mock_stream_, Writev(SerializedControlMessage(expected_ok), _)); fetch_task->CallFetchResponseCallback(expected_ok);