diff options
| author | Hamsalekha S <hamsalekha.s@ittiam.com> | 2017-07-15 00:35:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-15 00:35:31 +0000 |
| commit | bf8b7083e92bc4c34e5f560f22f562c37a57c373 (patch) | |
| tree | dfcc23131f386d16d4430f0fd60c67fd13d3e482 | |
| parent | 136293c3730ec8fd8a14ace29f106db69e424c9e (diff) | |
| parent | a925a6b539642c8749c91a6f33e362eda8c4a5b6 (diff) | |
| download | android_external_libavc-bf8b7083e92bc4c34e5f560f22f562c37a57c373.tar.gz android_external_libavc-bf8b7083e92bc4c34e5f560f22f562c37a57c373.tar.bz2 android_external_libavc-bf8b7083e92bc4c34e5f560f22f562c37a57c373.zip | |
Decoder: Fixed allocation of pv_map_ref_idx_to_poc_buf.
am: a925a6b539
Change-Id: I0026b1c090325b96b15a48a6049393ee7de40bc3
| -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, 7 insertions, 20 deletions
diff --git a/decoder/ih264d_parse_bslice.c b/decoder/ih264d_parse_bslice.c index 772964a..db64ce9 100644 --- a/decoder/ih264d_parse_bslice.c +++ b/decoder/ih264d_parse_bslice.c @@ -1531,10 +1531,7 @@ WORD32 ih264d_parse_bslice(dec_struct_t * ps_dec, UWORD16 u2_first_mb_in_slice) } num_entries = ((2 * num_entries) + 1); - if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) - { - num_entries *= 2; - } + 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 bcfbe05..d6b0f23 100644 --- a/decoder/ih264d_parse_pslice.c +++ b/decoder/ih264d_parse_pslice.c @@ -1696,10 +1696,8 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec, num_entries = 1; } num_entries = ((2 * num_entries) + 1); - if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) - { - num_entries *= 2; - } + num_entries *= 2; + size = num_entries * sizeof(void *); size += PAD_MAP_IDX_POC * sizeof(void *); @@ -2063,10 +2061,7 @@ WORD32 ih264d_parse_pslice(dec_struct_t *ps_dec, UWORD16 u2_first_mb_in_slice) num_entries = 1; } num_entries = ((2 * num_entries) + 1); - if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) - { - num_entries *= 2; - } + 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 849b9c5..bdfccb6 100644 --- a/decoder/ih264d_parse_slice.c +++ b/decoder/ih264d_parse_slice.c @@ -1802,10 +1802,8 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, num_entries = 1; } num_entries = ((2 * num_entries) + 1); - if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) - { - num_entries *= 2; - } + 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 4f6deca..7d7475d 100644 --- a/decoder/ih264d_utils.c +++ b/decoder/ih264d_utils.c @@ -1979,10 +1979,7 @@ WORD16 ih264d_allocate_dynamic_bufs(dec_struct_t * ps_dec) num_entries = 1; } num_entries = ((2 * num_entries) + 1); - if(BASE_PROFILE_IDC != ps_dec->ps_cur_sps->u1_profile_idc) - { - num_entries *= 2; - } + num_entries *= 2; size = num_entries * sizeof(void *); size += PAD_MAP_IDX_POC * sizeof(void *); |