diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-11-10 18:16:35 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-11-10 18:16:35 +0000 |
| commit | f33c02ed73ab44127293cc4dceeb7b2fcc27b190 (patch) | |
| tree | 13c0d0ccc885011a030ecb1098aa7c96f433e4aa | |
| parent | 99015cf2e67753295ad8fcd6ac43998d6fdae11b (diff) | |
| parent | acacf063c23d3330c59536afda408b01f2bb9e59 (diff) | |
| download | android_external_libavc-f33c02ed73ab44127293cc4dceeb7b2fcc27b190.tar.gz android_external_libavc-f33c02ed73ab44127293cc4dceeb7b2fcc27b190.tar.bz2 android_external_libavc-f33c02ed73ab44127293cc4dceeb7b2fcc27b190.zip | |
[automerger] decoder: Signal IVD_RES_CHANGED error for change in crop params am: 442a01bf37 am: 1d7d7f9bf6 am: acacf063c2
Change-Id: I2fd29d8974797d8b7d864d73a1c59d37b40aa0d9
| -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)) { |