diff options
| author | Yi Kong <yikong@google.com> | 2022-03-31 03:16:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-31 03:16:38 +0000 |
| commit | f98b4617a5ed78cd7751a72502769b7be9869069 (patch) | |
| tree | 7011eef0a9de0580f3a9c5078d4711bba51ef390 | |
| parent | 0ef970e29896b3af221928b82bd1e80a775272d0 (diff) | |
| parent | 6b2208f1c77faf31f30e708bb08f48b1807452d4 (diff) | |
| download | libhevc-f98b4617a5ed78cd7751a72502769b7be9869069.tar.gz | |
Fix int-in-bool-context warning am: 6b2208f1c7
Original change: https://android-review.googlesource.com/c/platform/external/libhevc/+/2030528
Change-Id: If5208dc033bbb7b243efdadb63f6031c8a234953
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 */ |