Skip to content

GitLab

A
aom-rav1e
Commit 0c89dca7 authored by Angie Chiang's avatar Angie Chiang
Browse files
Options

Use || to replace && logics in try_level_down() 

Change-Id: I6e9e1c94f688ed84c49d3b861dbac15c37248827
parent 8e4c3a74
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
av1/encoder/encodetxb.c
View file @ 0c89dca7
......@@ -777,8 +777,8 @@ int try_level_down(int coeff_idx, const TxbCache *txb_cache,
const int nb_col = col - sig_ref_offset[i][1];
const int nb_coeff_idx = nb_row * txb_info->stride + nb_col;
if (!(nb_row >= 0 && nb_col >= 0 && nb_row < txb_info->height &&
nb_col < txb_info->stride))
if (nb_row < 0 || nb_col < 0 || nb_row >= txb_info->height ||
nb_col >= txb_info->stride)
continue;
const int nb_scan_idx = iscan[nb_coeff_idx];
......@@ -799,8 +799,8 @@ int try_level_down(int coeff_idx, const TxbCache *txb_cache,
const int nb_col = col - base_ref_offset[i][1];
const int nb_coeff_idx = nb_row * txb_info->stride + nb_col;
if (!(nb_row >= 0 && nb_col >= 0 && nb_row < txb_info->height &&
nb_col < txb_info->stride))
if (nb_row < 0 || nb_col < 0 || nb_row >= txb_info->height ||
nb_col >= txb_info->stride)
continue;
const int nb_scan_idx = iscan[nb_coeff_idx];
......@@ -821,8 +821,8 @@ int try_level_down(int coeff_idx, const TxbCache *txb_cache,
const int nb_col = col - br_ref_offset[i][1];
const int nb_coeff_idx = nb_row * txb_info->stride + nb_col;
if (!(nb_row >= 0 && nb_col >= 0 && nb_row < txb_info->height &&
nb_col < txb_info->stride))
if (nb_row < 0 || nb_col < 0 || nb_row >= txb_info->height ||
nb_col >= txb_info->stride)
continue;
const int nb_scan_idx = iscan[nb_coeff_idx];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment