diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2018-11-27 12:07:34 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-27 12:07:34 -0800 |
| commit | 4402b34a4f86a030a18836e34ea9e448833f6649 (patch) | |
| tree | 121f76024d175101de35c493dce3a1254d92d7a3 | |
| parent | 7ff5530ec993c09ffa49d6c79e1091084e49b0ee (diff) | |
| parent | 145ae0d0499996df1cc6020133af7f05cb124815 (diff) | |
| download | android_external_libavc-4402b34a4f86a030a18836e34ea9e448833f6649.tar.gz android_external_libavc-4402b34a4f86a030a18836e34ea9e448833f6649.tar.bz2 android_external_libavc-4402b34a4f86a030a18836e34ea9e448833f6649.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
Change-Id: I83f9555eed25009c0e8067383e938f1caf822fc3
| -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 b669331..ee38315 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -918,12 +918,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)) { |