diff options
| author | Hamsalekha S <hamsalekha.s@ittiam.com> | 2017-05-23 15:54:18 +0530 |
|---|---|---|
| committer | MSe <mse1969@posteo.de> | 2017-08-31 21:25:44 +0200 |
| commit | 42bd24a67a647f745a69902559f2008e468a69a4 (patch) | |
| tree | b711e8ede0f821a7a634f503ea398136acf12502 | |
| parent | 754b12defd3408e65780b22a4ac1bbba94f6e704 (diff) | |
| download | android_external_libavc-42bd24a67a647f745a69902559f2008e468a69a4.tar.gz android_external_libavc-42bd24a67a647f745a69902559f2008e468a69a4.tar.bz2 android_external_libavc-42bd24a67a647f745a69902559f2008e468a69a4.zip | |
Fixed hang in the case of multiple sps id.
The sps parameters used to detect change in
resolution/sps were incorrect. Made a fix to
use current sps from decoder context.
Bug: 38239864
Change-Id: I2d110e635ced32b3dc7f364e08a97d672fcbae37
(cherry picked from commit 8c6fe35f6d28f3e8c3a9f9458eea89eba858bded)
(cherry picked from commit ec3f58500066edee259942057e21489621fca9dd)
| -rw-r--r-- | decoder/ih264d_parse_headers.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index faf2d6f..fcdd152 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -564,7 +564,10 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm) /*--------------------------------------------------------------------*/ ps_seq = ps_dec->pv_scratch_sps_pps; - *ps_seq = ps_dec->ps_sps[u1_seq_parameter_set_id]; + if(ps_dec->i4_header_decoded & 1) + { + *ps_seq = *ps_dec->ps_cur_sps; + } ps_seq->u1_profile_idc = u1_profile_idc; |