diff options
| author | Marco Nelissen <marcone@google.com> | 2017-01-17 20:27:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-17 20:27:24 +0000 |
| commit | c4f317b87322fc887903cd386c0db8e1bf4e46be (patch) | |
| tree | 3dc5354d19b3c835c5ede6e58d200661a3df31af /decoder/ih264d_api.c | |
| parent | 99a85bb4690dd30871d9457c30ca3b44a0928cc1 (diff) | |
| parent | e1cf7ea8ae9af4d8b5aca7efba61025dae10a345 (diff) | |
| download | android_external_libavc-c4f317b87322fc887903cd386c0db8e1bf4e46be.tar.gz android_external_libavc-c4f317b87322fc887903cd386c0db8e1bf4e46be.tar.bz2 android_external_libavc-c4f317b87322fc887903cd386c0db8e1bf4e46be.zip | |
Merge "Decoder: Fixed number of MB calculation for interlaced error streams" into mnc-dev
Diffstat (limited to 'decoder/ih264d_api.c')
| -rw-r--r-- | decoder/ih264d_api.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index efc5220..9082c1e 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -3115,8 +3115,9 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) WORD32 prev_slice_err; pocstruct_t temp_poc; WORD32 ret1; - - num_mb_skipped = (ps_dec->u2_frm_ht_in_mbs * ps_dec->u2_frm_wd_in_mbs) + WORD32 ht_in_mbs; + ht_in_mbs = ps_dec->u2_pic_ht >> (4 + ps_dec->ps_cur_slice->u1_field_pic_flag); + num_mb_skipped = (ht_in_mbs * ps_dec->u2_frm_wd_in_mbs) - ps_dec->u2_total_mbs_coded; if(ps_dec->u4_first_slice_in_pic && (ps_dec->u4_pic_buf_got == 0)) |