diff options
| author | Ivan Kutepov <its.kutepov@gmail.com> | 2017-11-11 17:52:01 +0300 |
|---|---|---|
| committer | Ivan Kutepov <its.kutepov@gmail.com> | 2017-11-11 17:57:14 +0300 |
| commit | 45bb30c171b0e790353356f0ee408d6c9d91d9d7 (patch) | |
| tree | dd036a71882785252fe2036f4cb0caee2b74aa57 | |
| parent | 3193b6f8c9d33e26f8dd9c7bf85aa0573fe242b9 (diff) | |
| download | android_external_libavc-45bb30c171b0e790353356f0ee408d6c9d91d9d7.tar.gz android_external_libavc-45bb30c171b0e790353356f0ee408d6c9d91d9d7.tar.bz2 android_external_libavc-45bb30c171b0e790353356f0ee408d6c9d91d9d7.zip | |
Revert "Decoder: Fixed allocation of pv_map_ref_idx_to_poc_buf."
This reverts commit 839c6327f8467e2e238238623ab3831fc4b3f280.
Change-Id: Ia07e3a08843c3f52cb40efcd91fa4d1bba3b7b90
| -rw-r--r-- | decoder/ih264d_parse_bslice.c | 5 | ||||
| -rw-r--r-- | decoder/ih264d_parse_pslice.c | 11 | ||||
| -rw-r--r-- | decoder/ih264d_parse_slice.c | 6 | ||||
| -rw-r--r-- | decoder/ih264d_utils.c | 5 |
4 files changed, 20 insertions, 7 deletions
diff --git a/decoder/ih264d_parse_bslice.c b/decoder/ih264d_parse_bslice.c index db64ce9..772964a 100644 --- a/decoder/ih264d_parse_bslice.c +++ b/decoder/ih264d_parse_bslice.c @@ -1531,7 +1531,10 @@ WORD32 ih264d_parse_bslice(dec_struct_t * ps_dec, UWORD16 u2_first_mb_in_slice) } num_entries = ((2 * num_entries) + 1); - num_entries *= 2; + if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) + { + num_entries *= 2; + } size = num_entries * sizeof(void *); size += PAD_MAP_IDX_POC * sizeof(void *); diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c index d6b0f23..bcfbe05 100644 --- a/decoder/ih264d_parse_pslice.c +++ b/decoder/ih264d_parse_pslice.c @@ -1696,8 +1696,10 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec, num_entries = 1; } num_entries = ((2 * num_entries) + 1); - num_entries *= 2; - + if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) + { + num_entries *= 2; + } size = num_entries * sizeof(void *); size += PAD_MAP_IDX_POC * sizeof(void *); @@ -2061,7 +2063,10 @@ WORD32 ih264d_parse_pslice(dec_struct_t *ps_dec, UWORD16 u2_first_mb_in_slice) num_entries = 1; } num_entries = ((2 * num_entries) + 1); - num_entries *= 2; + if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) + { + num_entries *= 2; + } size = num_entries * sizeof(void *); size += PAD_MAP_IDX_POC * sizeof(void *); diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c index bdfccb6..849b9c5 100644 --- a/decoder/ih264d_parse_slice.c +++ b/decoder/ih264d_parse_slice.c @@ -1802,8 +1802,10 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, num_entries = 1; } num_entries = ((2 * num_entries) + 1); - num_entries *= 2; - + if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) + { + num_entries *= 2; + } size = num_entries * sizeof(void *); size += PAD_MAP_IDX_POC * sizeof(void *); diff --git a/decoder/ih264d_utils.c b/decoder/ih264d_utils.c index 7d7475d..4f6deca 100644 --- a/decoder/ih264d_utils.c +++ b/decoder/ih264d_utils.c @@ -1979,7 +1979,10 @@ WORD16 ih264d_allocate_dynamic_bufs(dec_struct_t * ps_dec) num_entries = 1; } num_entries = ((2 * num_entries) + 1); - num_entries *= 2; + if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) + { + num_entries *= 2; + } size = num_entries * sizeof(void *); size += PAD_MAP_IDX_POC * sizeof(void *); |