summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-11-27 23:04:34 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-11-27 23:04:34 +0000
commitb2722bd816542e1e39db750b6ed5ba6ff5da6e62 (patch)
tree96c455cf422dbf2de2b5a483d82959a37e08339a
parente910b1686a40e017cdea91b0fc09d5b479d4ed9c (diff)
parent48900d4e516231f228943cb7dab2d33a5660558f (diff)
downloadplatform_external_libavc-pie-b4s4-release.tar.gz
platform_external_libavc-pie-b4s4-release.tar.bz2
platform_external_libavc-pie-b4s4-release.zip
Snap for 5150751 from 48900d4e516231f228943cb7dab2d33a5660558f to pi-b4s4-releaseandroid-9.0.0_r39android-9.0.0_r38pie-b4s4-release
Change-Id: I3ec7e730c60378773fe6adcf509374d8a17ce2ab
-rw-r--r--decoder/ih264d_parse_headers.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c
index 03ed508..d9f50f4 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -924,12 +924,25 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
ps_dec->u1_res_changed = 1;
return IVD_RES_CHANGED;
}
+
+ if((ps_dec->i4_header_decoded & 1) && (ps_dec->u2_disp_width != i4_cropped_wd))
+ {
+ ps_dec->u1_res_changed = 1;
+ return IVD_RES_CHANGED;
+ }
+
if((ps_dec->i4_header_decoded & 1) && (ps_dec->u2_pic_ht != u2_pic_ht))
{
ps_dec->u1_res_changed = 1;
return IVD_RES_CHANGED;
}
+ if((ps_dec->i4_header_decoded & 1) && (ps_dec->u2_disp_height != i4_cropped_ht))
+ {
+ ps_dec->u1_res_changed = 1;
+ return IVD_RES_CHANGED;
+ }
+
/* Check for unsupported resolutions */
if((u2_pic_wd > H264_MAX_FRAME_WIDTH) || (u2_pic_ht > H264_MAX_FRAME_HEIGHT)
|| (u2_pic_wd < H264_MIN_FRAME_WIDTH) || (u2_pic_ht < H264_MIN_FRAME_HEIGHT)