diff options
| author | Hamsalekha S <hamsalekha.s@ittiam.com> | 2017-02-21 16:02:23 +0530 |
|---|---|---|
| committer | MSe <mse1969@posteo.de> | 2017-09-01 18:32:13 +0200 |
| commit | aefbc04a09e8997baa3162238e91357265600582 (patch) | |
| tree | 900883c879ed587695e0f290eee2725d39d618d8 | |
| parent | b828eddda1c790c510bd1905f9a7bff233eb77dc (diff) | |
| download | android_external_libavc-aefbc04a09e8997baa3162238e91357265600582.tar.gz android_external_libavc-aefbc04a09e8997baa3162238e91357265600582.tar.bz2 android_external_libavc-aefbc04a09e8997baa3162238e91357265600582.zip | |
[BACKPORT] Fixed bug in the case of resolution change.replicant-6.0-0002
Modified the way i4_header_decoded in decoder context
is used, to ensure that resolution change is detected
even if PPS has not been decoded.
Bug: 35583675
Test: ran POC, no longer hangs
Change-Id: Ibb3f8dfbeb66a999fd81720a7d2a02dd951a55c4
(cherry picked from commit 1d06027c69e31d450b1e837c81073362d41084d3)
| -rw-r--r-- | decoder/ih264d_parse_headers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index aa51c3a..5b17695 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -879,12 +879,12 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm) return ERROR_INV_SPS_PPS_T; } - if((3 == ps_dec->i4_header_decoded) && (ps_dec->u2_pic_wd != u2_pic_wd)) + if((ps_dec->i4_header_decoded & 1) && (ps_dec->u2_pic_wd != u2_pic_wd)) { ps_dec->u1_res_changed = 1; return IVD_RES_CHANGED; } - if((3 == ps_dec->i4_header_decoded) && (ps_dec->u2_pic_ht != u2_pic_ht)) + 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; |