diff options
| author | Ray Essick <essick@google.com> | 2021-06-08 04:41:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-08 04:41:36 +0000 |
| commit | a537f15bc9ff008cf3973297d41a968c90630147 (patch) | |
| tree | 0d5e664d36a77cd4a3cecc9beff61b6771c7e37f | |
| parent | af5bd177be31cc846d75b5fde70269574578d75c (diff) | |
| parent | 6ddeb05426eb613987beba1dfd52f93cfc64ad71 (diff) | |
| download | libavc-a537f15bc9ff008cf3973297d41a968c90630147.tar.gz | |
Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libavc/+/14460944
Change-Id: Id3844c9c5eb2c20ad2db75981bb19ff58151be47
| -rw-r--r-- | decoder/ih264d_parse_slice.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c index 3ae206b..668ed5f 100644 --- a/decoder/ih264d_parse_slice.c +++ b/decoder/ih264d_parse_slice.c @@ -1423,17 +1423,20 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, i1_is_end_of_poc = 0; } - if (ps_dec->u4_first_slice_in_pic == 0) + /* Increment only if the current slice has atleast 1 more MB */ + if (ps_dec->u4_first_slice_in_pic == 0 && + (ps_dec->ps_parse_cur_slice->u4_first_mb_in_slice < + (UWORD32)(ps_dec->u2_total_mbs_coded >> ps_dec->ps_cur_slice->u1_mbaff_frame_flag))) { ps_dec->ps_parse_cur_slice++; ps_dec->u2_cur_slice_num++; + // in the case of single core increment ps_decode_cur_slice + if(ps_dec->u1_separate_parse == 0) + { + ps_dec->ps_decode_cur_slice++; + } } - // in the case of single core increment ps_decode_cur_slice - if((ps_dec->u1_separate_parse == 0) && (ps_dec->u4_first_slice_in_pic == 0)) - { - ps_dec->ps_decode_cur_slice++; - } ps_dec->u1_slice_header_done = 0; |