diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2018-11-27 12:15:45 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-27 12:15:45 -0800 |
| commit | 48900d4e516231f228943cb7dab2d33a5660558f (patch) | |
| tree | 96c455cf422dbf2de2b5a483d82959a37e08339a | |
| parent | e910b1686a40e017cdea91b0fc09d5b479d4ed9c (diff) | |
| parent | 7a6b55da22cd3ae89c4f2c76a72726df4d72c0e6 (diff) | |
| download | android_external_libavc-48900d4e516231f228943cb7dab2d33a5660558f.tar.gz android_external_libavc-48900d4e516231f228943cb7dab2d33a5660558f.tar.bz2 android_external_libavc-48900d4e516231f228943cb7dab2d33a5660558f.zip | |
[automerger] decoder: Signal IVD_RES_CHANGED error for change in crop params am: 442a01bf37 am: 1d7d7f9bf6 am: acacf063c2 am: f33c02ed73 am: c09d3f99ab am: 145ae0d049 am: 4402b34a4f
am: 7a6b55da22
Change-Id: I8b702d7198da5bf9dfa1ab19979e248fd2f1b790
| -rw-r--r-- | decoder/ih264d_parse_headers.c | 13 |
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) |