summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2015-08-26 16:20:33 +0530
committerMarco Nelissen <marcone@google.com>2015-10-16 20:09:34 +0000
commite023fbb28cc48187d0608c8bca52098bfd9e9fb9 (patch)
tree54e358e7c0a35355254ed35f21c5775e7848ec41
parente027a11e31aaae2652a9d5a69a15f8748f6970cb (diff)
downloadandroid_external_libavc-e023fbb28cc48187d0608c8bca52098bfd9e9fb9.tar.gz
android_external_libavc-e023fbb28cc48187d0608c8bca52098bfd9e9fb9.tar.bz2
android_external_libavc-e023fbb28cc48187d0608c8bca52098bfd9e9fb9.zip
Decoder: Once all the MBs in a picture are decoded ignore remaining bytes
Once all the MBs are decoded, simply break from decode loops and do not signal an error This will handle cases where there may be extra bytes at the end of picture data Change-Id: I6d8ec918df5375f135e60f85b9a56ab2a5313a64
-rw-r--r--decoder/ih264d_parse_islice.c2
-rw-r--r--decoder/ih264d_parse_pslice.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/decoder/ih264d_parse_islice.c b/decoder/ih264d_parse_islice.c
index 1e4fdfa..4f58c5b 100644
--- a/decoder/ih264d_parse_islice.c
+++ b/decoder/ih264d_parse_islice.c
@@ -788,7 +788,6 @@ WORD32 ih264d_parse_islice_data_cavlc(dec_struct_t * ps_dec,
if(i2_cur_mb_addr > ps_dec->ps_cur_sps->u2_max_mb_addr)
{
- ret = ERROR_MB_ADDRESS_T;
break;
}
@@ -1017,7 +1016,6 @@ WORD32 ih264d_parse_islice_data_cabac(dec_struct_t * ps_dec,
if(i2_cur_mb_addr > ps_dec->ps_cur_sps->u2_max_mb_addr)
{
- ret = ERROR_MB_ADDRESS_T;
break;
}
diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index f300e2b..5a105cc 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -876,7 +876,6 @@ WORD32 ih264d_parse_inter_slice_data_cabac(dec_struct_t * ps_dec,
if(i2_cur_mb_addr > ps_dec->ps_cur_sps->u2_max_mb_addr)
{
- ret = ERROR_MB_ADDRESS_T;
break;
}
@@ -1183,7 +1182,6 @@ WORD32 ih264d_parse_inter_slice_data_cavlc(dec_struct_t * ps_dec,
if(i2_cur_mb_addr > ps_dec->ps_cur_sps->u2_max_mb_addr)
{
- ret = ERROR_MB_ADDRESS_T;
break;
}