commit 4b96ab43b996acd78524199bb5ee1f5cd736a1bc
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Apr 14 14:25:51 2016 +0530
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 08 18:15:08 2017 +0000
tree 399e19339ef33020c3b8679590ab5930f3a06851
parent 673562c34fe4fc1a24040703ae1ca10e2f31c65d

DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames
without resolution change

backported from master as part of fixing a security issue on mnc-dr.

Bug: 34779227
Test: before/after execution of PIC
Change-Id: I404099ac24439b5f6eddc9265dc571929433b3ee
(cherry picked from commit b62479887e7f5634eb2d0de9fb441e1385f48f08)

decoder/ihevcd_parse_headers.c

diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c
index 0f30620..aa2cca0 100644
--- a/decoder/ihevcd_parse_headers.c
+++ b/decoder/ihevcd_parse_headers.c
@@ -1334,6 +1334,27 @@
         UEV_PARSE("max_latency_increase", value, ps_bitstrm);
         ps_sps->ai1_sps_max_latency_increase[i] = value;
     }
+
+    /* Check if sps_max_dec_pic_buffering or sps_max_num_reorder_pics
+       has changed */
+    if(0 != ps_codec->i4_first_pic_done)
+    {
+        sps_t *ps_sps_old = ps_codec->s_parse.ps_sps;
+        if(ps_sps_old->ai1_sps_max_dec_pic_buffering[ps_sps_old->i1_sps_max_sub_layers - 1] !=
+                    ps_sps->ai1_sps_max_dec_pic_buffering[ps_sps->i1_sps_max_sub_layers - 1])
+        {
+            ps_codec->i4_reset_flag = 1;
+            return (IHEVCD_ERROR_T)IVD_RES_CHANGED;
+        }
+
+        if(ps_sps_old->ai1_sps_max_num_reorder_pics[ps_sps_old->i1_sps_max_sub_layers - 1] !=
+                    ps_sps->ai1_sps_max_num_reorder_pics[ps_sps->i1_sps_max_sub_layers - 1])
+        {
+            ps_codec->i4_reset_flag = 1;
+            return (IHEVCD_ERROR_T)IVD_RES_CHANGED;
+        }
+    }
+
     UEV_PARSE("log2_min_coding_block_size_minus3", value, ps_bitstrm);
     ps_sps->i1_log2_min_coding_block_size = value + 3;