Merge remote-tracking branch 'github/master' into v2.4-branch

Author: xhaihao

src/gen9_hevc_enc_kernels_binary.h

@@ -31,6 +31,6 @@
 
 #define GEN9_HEVC_ENC_KERNEL_SIZE 149296
 
-const unsigned int gen9_hevc_encoder_kernels[GEN9_HEVC_ENC_KERNEL_SIZE];
+extern const unsigned int gen9_hevc_encoder_kernels[GEN9_HEVC_ENC_KERNEL_SIZE];
 
 #endif

src/gen9_vp9_encoder.c

@@ -1593,7 +1593,10 @@ intel_vp9enc_construct_picstate_batchbuf(VADriverContextP ctx,
         *cmd_ptr++ = 0;
 
         /* dw31 */
-        *cmd_ptr++ = (0 << 30) | 1;
+        /* dw31 is for restricting the compressed frames minimum size
+         * and we don't impose any. */
+        *cmd_ptr++ = 0;
+
         /* dw32 */
         *cmd_ptr++ = vp9_state->frame_header.bit_offset_first_partition_size;
 

test/test.h

@@ -147,7 +147,7 @@ class VaapiStatus
             status = "VA_STATUS_ERROR_HW_BUSY"; break;
         case VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE:
             status = "VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE"; break;
-        case VA_STATUS_ERROR_UNKNOWN:
+        case VAStatus(VA_STATUS_ERROR_UNKNOWN):
             status = "VA_STATUS_ERROR_UNKNOWN"; break;
         default:
             status = "Unknown VAStatus";