diff --git a/logging/rtc_event_log/encoder/delta_encoding.cc b/logging/rtc_event_log/encoder/delta_encoding.cc index 80fb5879d9..914b0ca8aa 100644 --- a/logging/rtc_event_log/encoder/delta_encoding.cc +++ b/logging/rtc_event_log/encoder/delta_encoding.cc @@ -116,7 +116,6 @@ class FixedLengthEncodingParameters final { public: static bool ValidParameters(uint64_t delta_width_bits, bool signed_deltas, - bool values_optional, uint64_t value_width_bits) { return (1 <= delta_width_bits && delta_width_bits <= 64 && 1 <= value_width_bits && value_width_bits <= 64 && @@ -133,8 +132,8 @@ class FixedLengthEncodingParameters final { value_width_bits_(value_width_bits), delta_mask_(MaxUnsignedValueOfBitWidth(delta_width_bits_)), value_mask_(MaxUnsignedValueOfBitWidth(value_width_bits_)) { - RTC_DCHECK(ValidParameters(delta_width_bits, signed_deltas, values_optional, - value_width_bits)); + RTC_DCHECK( + ValidParameters(delta_width_bits, signed_deltas, value_width_bits)); } // Number of bits necessary to hold the widest(*) of the deltas between the @@ -701,7 +700,7 @@ std::unique_ptr FixedLengthDeltaDecoder::Create( // for illegal values to be read. We check nevertheless, in case the code // changes in the future in a way that breaks this promise. if (!FixedLengthEncodingParameters::ValidParameters( - delta_width_bits, signed_deltas, values_optional, value_width_bits)) { + delta_width_bits, signed_deltas, value_width_bits)) { RTC_LOG(LS_WARNING) << "Corrupt log; illegal encoding parameters."; return nullptr; } diff --git a/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc b/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc index 166dedd6e4..037afa8e81 100644 --- a/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc +++ b/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc @@ -91,8 +91,8 @@ FixedLengthEncodingParametersV3::CalculateParameters( // equal". RTC_DCHECK(!use_signed_deltas || delta_bit_width < 64); - RTC_DCHECK(ValidParameters(delta_bit_width, use_signed_deltas, - values_optional, value_bit_width)); + RTC_DCHECK( + ValidParameters(delta_bit_width, use_signed_deltas, value_bit_width)); return FixedLengthEncodingParametersV3(delta_bit_width, use_signed_deltas, values_optional, value_bit_width); } @@ -122,8 +122,7 @@ FixedLengthEncodingParametersV3::ParseDeltaHeader(uint64_t header, return std::nullopt; } - if (!ValidParameters(delta_bit_width, signed_deltas, values_optional, - value_bit_width)) { + if (!ValidParameters(delta_bit_width, signed_deltas, value_bit_width)) { RTC_LOG(LS_ERROR) << "Failed to parse delta header. Invalid combination of " "values: delta_bit_width=" << delta_bit_width << " signed_deltas=" << signed_deltas diff --git a/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h b/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h index 3640b20edb..c93d9b3dd2 100644 --- a/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h +++ b/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h @@ -25,7 +25,6 @@ class FixedLengthEncodingParametersV3 final { public: static bool ValidParameters(uint64_t delta_bit_width, bool signed_deltas, - bool values_optional, uint64_t value_bit_width) { return (1 <= delta_bit_width && delta_bit_width <= 64 && 1 <= value_bit_width && value_bit_width <= 64 &&