commit 9af6f17daa07cf1559d7406d8d8d70630b3f9340
author gitbuildkicker <android-build@google.com> Thu Dec 15 16:21:24 2016 -0800
committer gitbuildkicker <android-build@google.com> Thu Dec 15 16:21:24 2016 -0800
tree ef8d65dff1ea68537e1ec5c7f26475a7f0eb30e4
parent c0d86a2499d4974a8398c266f2cb58143985b208
parent 9abb24cd10926f0a9b803fda6ccbf1b975cefc42

merge in nyc-bugfix-release history after reset to nyc-dev

decoder/ih264d_defs.h

diff --git a/decoder/ih264d_defs.h b/decoder/ih264d_defs.h
index 0682339..e266206 100644
--- a/decoder/ih264d_defs.h
+++ b/decoder/ih264d_defs.h
@@ -257,7 +257,6 @@
 /** 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 c687fa1..e6cd61f 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -533,14 +533,18 @@
     )
     {
 
-        /* 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((uc_constraint_set1_flag != 1) && (uc_constraint_set0_flag != 1))
         {
-            return (ERROR_FEATURE_UNAVAIL);
+            if(NULL != ps_dec)
+            {
+                UWORD32 i4_error_code;
+                i4_error_code = ERROR_FEATURE_UNAVAIL;
+                return i4_error_code;
+            }
+            else
+            {
+                return (ERROR_FEATURE_UNAVAIL);
+            }
         }
     }