From 70fa689fb6621ec20ed5f06ab71cfd1c9770beaf Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 8 Oct 2021 10:56:51 -0400 Subject: [PATCH] Fix Wbitwise-instead-of-logical warnings `a && b` only evaluates b if a is true. `a & b` always evaluates both a and b. If a and b are of type bool, `&&` is usually what you want, so clang now warns on `&` when both arguments are of type bool. In the one case where this fires in webrtc, it isn't important if we evaluate both branches, so I went with `&&`. Bug: chromium:1255745 Change-Id: I7fd215778fca62e0d5ca64ab0cf1142942eb7304 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234600 Reviewed-by: Magnus Flodman Commit-Queue: Nico Weber Cr-Commit-Position: refs/heads/main@{#35181} --- media/engine/simulcast_encoder_adapter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc index 8659c4cdec..d79339041f 100644 --- a/media/engine/simulcast_encoder_adapter.cc +++ b/media/engine/simulcast_encoder_adapter.cc @@ -923,7 +923,7 @@ VideoEncoder::EncoderInfo SimulcastEncoderAdapter::GetEncoderInfo() const { // Treat QP from frame/slice/tile header as average QP only if all // encoders report it as average QP. encoder_info.is_qp_trusted = - encoder_info.is_qp_trusted.value_or(true) & + encoder_info.is_qp_trusted.value_or(true) && encoder_impl_info.is_qp_trusted.value_or(true); } encoder_info.fps_allocation[i] = encoder_impl_info.fps_allocation[0];