From a3575cb8480e269c84ba7ce90db87e77a887c6f2 Mon Sep 17 00:00:00 2001 From: Anton Bikineev Date: Sun, 4 Apr 2021 15:04:27 +0200 Subject: [PATCH] Remove tautological 'unsigned expr < 0' comparisons This is the result of compiling Chromium with Wtautological-unsigned-zero-compare. For more details, see: https://chromium-review.googlesource.com/c/chromium/src/+/2802412 Change-Id: I05cec6ae5738036a56beadeaa1dde5189edf0137 Bug: chromium:1195670 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/213783 Reviewed-by: Stefan Holmer Reviewed-by: Danil Chapovalov Commit-Queue: Stefan Holmer Cr-Commit-Position: refs/heads/master@{#33689} --- .../opus/audio_encoder_multi_channel_opus_config.cc | 4 ++-- api/audio_codecs/opus/audio_encoder_opus_config.cc | 2 +- modules/rtp_rtcp/source/rtp_packet_history.cc | 2 +- .../rtp_rtcp/source/rtp_video_layers_allocation_extension.cc | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/api/audio_codecs/opus/audio_encoder_multi_channel_opus_config.cc b/api/audio_codecs/opus/audio_encoder_multi_channel_opus_config.cc index f01caf11b6..0052c429b2 100644 --- a/api/audio_codecs/opus/audio_encoder_multi_channel_opus_config.cc +++ b/api/audio_codecs/opus/audio_encoder_multi_channel_opus_config.cc @@ -38,7 +38,7 @@ operator=(const AudioEncoderMultiChannelOpusConfig&) = default; bool AudioEncoderMultiChannelOpusConfig::IsOk() const { if (frame_size_ms <= 0 || frame_size_ms % 10 != 0) return false; - if (num_channels < 0 || num_channels >= 255) { + if (num_channels >= 255) { return false; } if (bitrate_bps < kMinBitrateBps || bitrate_bps > kMaxBitrateBps) @@ -47,7 +47,7 @@ bool AudioEncoderMultiChannelOpusConfig::IsOk() const { return false; // Check the lengths: - if (num_channels < 0 || num_streams < 0 || coupled_streams < 0) { + if (num_streams < 0 || coupled_streams < 0) { return false; } if (num_streams < coupled_streams) { diff --git a/api/audio_codecs/opus/audio_encoder_opus_config.cc b/api/audio_codecs/opus/audio_encoder_opus_config.cc index 2f36d0261e..0e6f55ee65 100644 --- a/api/audio_codecs/opus/audio_encoder_opus_config.cc +++ b/api/audio_codecs/opus/audio_encoder_opus_config.cc @@ -61,7 +61,7 @@ bool AudioEncoderOpusConfig::IsOk() const { // well; we can add support for them when needed.) return false; } - if (num_channels < 0 || num_channels >= 255) { + if (num_channels >= 255) { return false; } if (!bitrate_bps) diff --git a/modules/rtp_rtcp/source/rtp_packet_history.cc b/modules/rtp_rtcp/source/rtp_packet_history.cc index 1fbfb7651d..5089933051 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.cc +++ b/modules/rtp_rtcp/source/rtp_packet_history.cc @@ -134,7 +134,7 @@ void RtpPacketHistory::PutRtpPacket(std::unique_ptr packet, // Store packet. const uint16_t rtp_seq_no = packet->SequenceNumber(); int packet_index = GetPacketIndex(rtp_seq_no); - if (packet_index >= 0u && + if (packet_index >= 0 && static_cast(packet_index) < packet_history_.size() && packet_history_[packet_index].packet_ != nullptr) { RTC_LOG(LS_WARNING) << "Duplicate packet inserted: " << rtp_seq_no; diff --git a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc index be6aadb084..93fb235dcd 100644 --- a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc +++ b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc @@ -110,8 +110,7 @@ bool AllocationIsValid(const VideoLayersAllocation& allocation) { if (spatial_layer.height <= 0) { return false; } - if (spatial_layer.frame_rate_fps < 0 || - spatial_layer.frame_rate_fps > 255) { + if (spatial_layer.frame_rate_fps > 255) { return false; } }