diff options
| author | Xin Li <delphij@google.com> | 2019-03-11 09:13:24 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-03-11 09:13:24 -0700 |
| commit | 76461ebab85689b74120b7fa88d5a7aa711acd55 (patch) | |
| tree | b244ef1302ba54deea6cdf9c0082d8564774d03b | |
| parent | 5302433b0a40dc914b916acda683cc19a1584e33 (diff) | |
| parent | bbe89f4115a92fbfa1628b3673a22963e782a3d0 (diff) | |
| download | libavc-76461ebab85689b74120b7fa88d5a7aa711acd55.tar.gz | |
DO NOT MERGE - Merge PPRL.190305.001 into masterandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release
Bug: 127812889
Change-Id: I92a7733be6b1a12e87d8ed066dbd7dba4af5f576
| -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) |