diff options
| author | Xin Li <delphij@google.com> | 2022-02-07 23:01:44 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-02-07 23:17:26 -0800 |
| commit | 2191ac2b82618e4acf73e5247794f51eb01eabd3 (patch) | |
| tree | 4bb2d1378763f3e2332562d077f9cc510a9a81aa | |
| parent | 91e3d65f9f3badfed72a87a56e6588d0b87bc730 (diff) | |
| parent | a95fbdd1f01428a7245db22c6b29191d0460bf23 (diff) | |
| download | libavc-2191ac2b82618e4acf73e5247794f51eb01eabd3.tar.gz | |
Merge SQ1A.220205.002
Bug: 213904741
Merged-In: I8569e9369e4ab6f6c69c81b937f111c299b7a134
Change-Id: If5e4ac031bbea6d69b3a588566de5f759333c6e6
| -rw-r--r-- | decoder/ih264d_parse_slice.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c index 266c69b..ad033be 100644 --- a/decoder/ih264d_parse_slice.c +++ b/decoder/ih264d_parse_slice.c @@ -1435,23 +1435,6 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, i1_is_end_of_poc = 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++; - } - } - - ps_dec->u1_slice_header_done = 0; - - if(u1_field_pic_flag) { ps_dec->u2_prv_frame_num = u2_frame_num; @@ -1519,6 +1502,22 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, } } + /* 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++; + } + } + + ps_dec->u1_slice_header_done = 0; + /*--------------------------------------------------------------------*/ /* Copy the values read from the bitstream to the slice header and then*/ /* If the slice is first slice in picture, then do Start of Picture */ |