Commit 8669fa8a9c for aom
commit 8669fa8a9c40eae9c2980190dd61062d9f7bc8cb
Author: Frank Galligan <fgalligan@google.com>
Date: Thu Nov 12 16:21:59 2026 -0800
txb_rdopt: fix MSVC C4334 32-bit shift warning
Cast 1 to int64_t before shifting by shift in get_coeff_dist_qm() and
get_coeff_dist() to silence MSVC warning C4334 ('<<': result of 32-bit
shift implicitly converted to 64 bits).
TAG=agy
CONV=f57e68e5-f406-4d82-a08f-9a737c3ba2b5
Change-Id: Ia3e765a914d841c47b3dda06bf24b12deaa1bb06
diff --git a/av1/encoder/txb_rdopt_utils.h b/av1/encoder/txb_rdopt_utils.h
index 97c87b8af2..769b754a91 100644
--- a/av1/encoder/txb_rdopt_utils.h
+++ b/av1/encoder/txb_rdopt_utils.h
@@ -47,14 +47,15 @@ static inline int get_dqv(const int16_t *dequant, int coeff_idx,
static inline int64_t get_coeff_dist_qm(tran_low_t tcoeff, tran_low_t dqcoeff,
int shift, int64_t qm_val) {
- const int64_t diff = (int64_t)(tcoeff - dqcoeff) * (1 << shift) * qm_val;
+ const int64_t diff =
+ (int64_t)(tcoeff - dqcoeff) * ((int64_t)1 << shift) * qm_val;
return (diff * diff + (1 << (2 * AOM_QM_BITS - 1))) >> (2 * AOM_QM_BITS);
}
static inline int64_t get_coeff_dist(tran_low_t tcoeff, tran_low_t dqcoeff,
int shift, const qm_val_t *qmatrix,
int coeff_idx) {
- const int64_t diff = (int64_t)(tcoeff - dqcoeff) * (1 << shift);
+ const int64_t diff = (int64_t)(tcoeff - dqcoeff) * ((int64_t)1 << shift);
if (qmatrix == NULL) {
return diff * diff;
}