diff options
| author | Yi Kong <yikong@google.com> | 2022-03-31 04:01:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-31 04:01:36 +0000 |
| commit | e85befcbe82e71228e4ffe059085599950e52cf0 (patch) | |
| tree | 593d6ce54298be2f99429f640d100338e21b1752 | |
| parent | 05523dbdac80bee1efa96706158b66e9fb7e9a5a (diff) | |
| parent | e27fc881dccb7a4d9523006eeae551dec9ca599f (diff) | |
| download | libhevc-e85befcbe82e71228e4ffe059085599950e52cf0.tar.gz | |
Fix int-in-bool-context warning am: 6b2208f1c7 am: f98b4617a5 am: e27fc881dc
Original change: https://android-review.googlesource.com/c/platform/external/libhevc/+/2030528
Change-Id: I33df45e80951732eb8b3453e667dba7ce55cee92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | encoder/ihevce_enc_loop_pass.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/encoder/ihevce_enc_loop_pass.c b/encoder/ihevce_enc_loop_pass.c index c73c7ff..b1a8b71 100644 --- a/encoder/ihevce_enc_loop_pass.c +++ b/encoder/ihevce_enc_loop_pass.c @@ -3018,14 +3018,10 @@ void ihevce_enc_loop_process( ps_ctxt->pv_err_func_selector = ps_func_selector; #endif - /*Bit0 - of this Flag indicates whether current pictute needs to be deblocked, - padded and hpel planes need to be generated. - Bit1 - of this flag set to 1 if sao is enabled. This is to enable deblocking when sao is enabled*/ ps_ctxt->i4_deblk_pad_hpel_cur_pic = - (ps_frm_recon->i4_deblk_pad_hpel_cur_pic) || - ((ps_ctxt->s_sao_ctxt_t.ps_slice_hdr->i1_slice_sao_luma_flag || - ps_ctxt->s_sao_ctxt_t.ps_slice_hdr->i1_slice_sao_chroma_flag) - << 1); + ps_frm_recon->i4_deblk_pad_hpel_cur_pic || + ps_ctxt->s_sao_ctxt_t.ps_slice_hdr->i1_slice_sao_luma_flag || + ps_ctxt->s_sao_ctxt_t.ps_slice_hdr->i1_slice_sao_chroma_flag; /* Share all reference pictures with nbr clients. This flag will be used only in case of dist-enc mode */ |