aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkshata Jadhav <akshata.jadhav@ittiam.com>2019-10-07 15:09:56 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-07 15:09:56 -0700
commitd52ce65b76ccda20bdba2f0b70308d004ea3f4d5 (patch)
tree4b1568d5ae6651eb66a01cbdb937d97f94e47cc4
parent6f44c269978ef42408e479223055b4e49c11ac49 (diff)
parentbf1e9088dc988165cec58f0a47e5539ce5a7033c (diff)
downloadlibhevc-d52ce65b76ccda20bdba2f0b70308d004ea3f4d5.tar.gz
libhevcenc: deblk sao low res race condition am: 50408aad50
am: bf1e9088dc Change-Id: I5911d14721b241ac96643819d2e0059fd806b749
-rw-r--r--encoder/ihevce_enc_loop_pass.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/encoder/ihevce_enc_loop_pass.c b/encoder/ihevce_enc_loop_pass.c
index f1cb79c..64c1839 100644
--- a/encoder/ihevce_enc_loop_pass.c
+++ b/encoder/ihevce_enc_loop_pass.c
@@ -2436,17 +2436,19 @@ void ihevce_enc_loop_process_row(
if(ps_ctxt->i4_deblk_pad_hpel_cur_pic)
{
- /* Wait till top neighbour CTB has done it's deblocking*/
- if(ctb_ctr < (ctb_end)-1)
+ /* for last ctb of a row check top instead of top right */
+ if(((ctb_ctr + 1) == ctb_end) && (vert_ctr > 0))
{
- ihevce_dmgr_chk_row_row_sync(
- pv_dep_mngr_enc_loop_dblk,
- ctb_ctr,
- dblk_offset,
- dblk_check_dep_pos,
- ps_ctxt->i4_tile_col_idx, /* Col Tile No. */
- ps_ctxt->thrd_id);
+ dblk_offset = 1;
}
+ /* Wait till top neighbour CTB has done it's deblocking*/
+ ihevce_dmgr_chk_row_row_sync(
+ pv_dep_mngr_enc_loop_dblk,
+ ctb_ctr,
+ dblk_offset,
+ dblk_check_dep_pos,
+ ps_ctxt->i4_tile_col_idx, /* Col Tile No. */
+ ps_ctxt->thrd_id);
if((0 == ps_ctxt->i4_deblock_type))
{