commit 9abb24cd10926f0a9b803fda6ccbf1b975cefc42
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Dec 05 13:36:19 2016 +0530
committer gitbuildkicker <android-build@google.com> Thu Dec 15 14:30:55 2016 -0800
tree 20d2542c62796c9e83fb010fcfe3254c13fccb7a
parent c0d86a2499d4974a8398c266f2cb58143985b208

Decoder: Fix in checking for valid profile flags

Apart from Baseline, main and high profile, only extended profile
is supported provided, constraint_set0_flag or constraint_set1_flag are set to 1

Bug: 31999646
Change-Id: I3b62069efc49e222a7126fba0805fa9124aac8f2
(cherry picked from commit d7eee555dc124a4ab7977f073c6b4a76c346f760)

decoder/ih264d_defs.h

diff --git a/decoder/ih264d_defs.h b/decoder/ih264d_defs.h
index e266206..0682339 100644
--- a/decoder/ih264d_defs.h
+++ b/decoder/ih264d_defs.h
@@ -257,6 +257,7 @@
 /** Profile Types*/
 #define BASE_PROFILE_IDC    66
 #define MAIN_PROFILE_IDC    77
+#define EXTENDED_PROFILE_IDC    88
 #define HIGH_PROFILE_IDC   100
 
 

decoder/ih264d_parse_headers.c

diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c
index e6cd61f..c687fa1 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -533,18 +533,14 @@
     )
     {
 
-        if((uc_constraint_set1_flag != 1) && (uc_constraint_set0_flag != 1))
+        /* Apart from Baseline, main and high profile,
+         * only extended profile is supported provided
+         * uc_constraint_set0_flag or uc_constraint_set1_flag are set to 1
+         */
+        if((u1_profile_idc != EXTENDED_PROFILE_IDC) ||
+           ((uc_constraint_set1_flag != 1) && (uc_constraint_set0_flag != 1)))
         {
-            if(NULL != ps_dec)
-            {
-                UWORD32 i4_error_code;
-                i4_error_code = ERROR_FEATURE_UNAVAIL;
-                return i4_error_code;
-            }
-            else
-            {
-                return (ERROR_FEATURE_UNAVAIL);
-            }
+            return (ERROR_FEATURE_UNAVAIL);
         }
     }