diff options
| author | Naveen Kumar P <naveenkumar.p@ittiam.com> | 2018-04-05 18:29:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-05 18:29:30 -0700 |
| commit | 2dba4eec8f008bf2a3846ddf38ff3aeedda5c342 (patch) | |
| tree | 59bce06e71796734a584392c58ec99c1ef4ef612 | |
| parent | d89141758069e0ad67c3e8855a48fdb15e54ecf0 (diff) | |
| parent | 8c56e181af8ee1b5f8766c8ce82a5056858b9326 (diff) | |
| download | libhevc-2dba4eec8f008bf2a3846ddf38ff3aeedda5c342.tar.gz | |
[automerger] Return error for invalid reorder parameter am: 4286d31e9e am: df2bef9a86 am: e7950035a8 am: b596887685 am: 3d1c41dfb1 am: a5af46e7c4 am: a01ece8616 am: a4843b0735 am: 884157609f
am: 8c56e181af
Change-Id: I7298994030e5c0fd10923a6e1605c09078b1976c
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index d534662..52de10b 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1413,20 +1413,18 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) for(; i < ps_sps->i1_sps_max_sub_layers; i++) { UEV_PARSE("max_dec_pic_buffering", value, ps_bitstrm); - ps_sps->ai1_sps_max_dec_pic_buffering[i] = value + 1; - - if(ps_sps->ai1_sps_max_dec_pic_buffering[i] > MAX_DPB_SIZE) + if((value + 1) > MAX_DPB_SIZE) { return IHEVCD_INVALID_PARAMETER; } + ps_sps->ai1_sps_max_dec_pic_buffering[i] = value + 1; UEV_PARSE("num_reorder_pics", value, ps_bitstrm); - ps_sps->ai1_sps_max_num_reorder_pics[i] = value; - - if(ps_sps->ai1_sps_max_num_reorder_pics[i] > ps_sps->ai1_sps_max_dec_pic_buffering[i]) + if(value > ps_sps->ai1_sps_max_dec_pic_buffering[i]) { return IHEVCD_INVALID_PARAMETER; } + ps_sps->ai1_sps_max_num_reorder_pics[i] = value; UEV_PARSE("max_latency_increase", value, ps_bitstrm); ps_sps->ai1_sps_max_latency_increase[i] = value; |