Merge "Encoder: Fixed adaptive intra refresh."
am: cb9903952b
* commit 'cb9903952be53e96567162958e4c9f1eac07d878':
Encoder: Fixed adaptive intra refresh.
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c
index 205bc9b..7c4305b 100644
--- a/decoder/ih264d_dpb_mgr.c
+++ b/decoder/ih264d_dpb_mgr.c
@@ -17,6 +17,9 @@
*****************************************************************************
* Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
*/
+#include "log/log.h"
+#include <cutils/log.h>
+
#include "ih264_typedefs.h"
#include "ih264_macros.h"
#include "ih264_platform_macros.h"
@@ -872,6 +875,13 @@
pu4_bitstrm_buf);
while(u4_mmco != END_OF_MMCO)
{
+ if (j >= MAX_REF_BUFS)
+ {
+ ALOGE("b/25818142");
+ android_errorWriteLog(0x534e4554, "25818142");
+ ps_dpb_cmds->u1_num_of_commands = 0;
+ return -1;
+ }
ps_mmc_params = &ps_dpb_cmds->as_mmc_params[j];
ps_mmc_params->u4_mmco = u4_mmco;
switch(u4_mmco)
diff --git a/decoder/ih264d_parse_bslice.c b/decoder/ih264d_parse_bslice.c
index 0758b77..85b0d0f 100644
--- a/decoder/ih264d_parse_bslice.c
+++ b/decoder/ih264d_parse_bslice.c
@@ -1590,7 +1590,14 @@
if(ps_slice->u1_nal_ref_idc != 0)
{
if(!ps_dec->ps_dpb_cmds->u1_dpb_commands_read)
- ps_dec->u4_bitoffset = ih264d_read_mmco_commands(ps_dec);
+ {
+ i_temp = ih264d_read_mmco_commands(ps_dec);
+ if (i_temp < 0)
+ {
+ return ERROR_DBP_MANAGER_T;
+ }
+ ps_dec->u4_bitoffset = i_temp;
+ }
else
ps_bitstrm->u4_ofst += ps_dec->u4_bitoffset;
}
diff --git a/decoder/ih264d_parse_islice.c b/decoder/ih264d_parse_islice.c
index 4f58c5b..a5072e9 100644
--- a/decoder/ih264d_parse_islice.c
+++ b/decoder/ih264d_parse_islice.c
@@ -898,7 +898,6 @@
(UWORD16)(u1_num_mbs >> u1_mbaff));
}
u1_num_mbs++;
- ps_dec->u2_total_mbs_coded++;
/****************************************************************/
/* Check for End Of Row */
@@ -928,7 +927,7 @@
u1_num_mbs_next, u1_tfr_n_mb,
u1_end_of_row);
}
-
+ ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;
@@ -1117,7 +1116,6 @@
(UWORD16)(u1_num_mbs >> u1_mbaff));
}
u1_num_mbs++;
- ps_dec->u2_total_mbs_coded++;
}
@@ -1146,7 +1144,7 @@
u1_num_mbs_next, u1_tfr_n_mb,
u1_end_of_row);
}
-
+ ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;
@@ -1374,8 +1372,14 @@
if(ps_slice->u1_nal_ref_idc != 0)
{
if(!ps_dec->ps_dpb_cmds->u1_dpb_commands_read)
- ps_dec->u4_bitoffset = ih264d_read_mmco_commands(
- ps_dec);
+ {
+ i_temp = ih264d_read_mmco_commands(ps_dec);
+ if (i_temp < 0)
+ {
+ return ERROR_DBP_MANAGER_T;
+ }
+ ps_dec->u4_bitoffset = i_temp;
+ }
else
ps_dec->ps_bitstrm->u4_ofst += ps_dec->u4_bitoffset;
}
diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 5a105cc..8694a36 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1020,7 +1020,6 @@
}
u1_num_mbs++;
- ps_dec->u2_total_mbs_coded++;
u1_num_mbsNby2++;
ps_parse_mb_data++;
@@ -1071,7 +1070,7 @@
u1_num_mbs_next, u1_tfr_n_mb,
u1_end_of_row);
}
-
+ ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;
@@ -1356,7 +1355,6 @@
i2_cur_mb_addr++;
u1_num_mbs++;
- ps_dec->u2_total_mbs_coded++;
u1_num_mbsNby2++;
ps_parse_mb_data++;
@@ -1409,7 +1407,7 @@
u1_num_mbs_next, u1_tfr_n_mb,
u1_end_of_row);
}
-
+ ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;
@@ -1618,7 +1616,7 @@
ih264d_decode_recon_tfr_nmb(ps_dec, u1_mb_idx, u1_num_mbs,
u1_num_mbs_next, u1_tfr_n_mb, u1_end_of_row);
}
-
+ ps_dec->u2_total_mbs_coded += u1_num_mbs;
ps_dec->u1_mb_idx = 0;
ps_dec->u4_num_mbs_cur_nmb = 0;
}
@@ -1788,7 +1786,6 @@
i2_cur_mb_addr++;
u1_num_mbs++;
- ps_dec->u2_total_mbs_coded++;
u1_num_mbsNby2++;
ps_parse_mb_data++;
@@ -1824,7 +1821,7 @@
ih264d_decode_recon_tfr_nmb(ps_dec, u1_mb_idx, u1_num_mbs, u1_num_mbs_next,
u1_tfr_n_mb, u1_end_of_row);
}
-
+ ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;
@@ -2075,7 +2072,14 @@
if(ps_cur_slice->u1_nal_ref_idc != 0)
{
if(!ps_dec->ps_dpb_cmds->u1_dpb_commands_read)
- ps_dec->u4_bitoffset = ih264d_read_mmco_commands(ps_dec);
+ {
+ i_temp = ih264d_read_mmco_commands(ps_dec);
+ if (i_temp < 0)
+ {
+ return ERROR_DBP_MANAGER_T;
+ }
+ ps_dec->u4_bitoffset = i_temp;
+ }
else
ps_bitstrm->u4_ofst += ps_dec->u4_bitoffset;
