Commit: 15f79e079034699739fb09af9347870ce232c3f8 - hardware-intel-common-vaapi (git)

hardware/intel/common/vaapi

Commit MetaInfo

• Revisión: 15f79e079034699739fb09af9347870ce232c3f8 (tree)
• Tiempo: 2017-07-13 13:17:12
• Autor: peng.chen <peng.c.chen@inte...>
• Commiter: Xiang, Haihao

Log Message

Parse ROI Misc parameters for CQP mode

Signed-off-by: peng.chen <[e-mail]>

Cambiar Resumen

• modified: src/i965_encoder.c

Diferencia incremental

--- a/src/i965_encoder.c
+++ b/src/i965_encoder.c
@@ -687,13 +687,12 @@ intel_encoder_check_brc_parameter(VADriverContextP ctx,
     int hl_bitrate_updated = 0; // Indicate whether the bitrate for the highest level is changed in misc parameters
     unsigned int seq_bits_per_second = 0;
 
-    if (!(encoder_context->rate_control_mode & (VA_RC_CBR | VA_RC_VBR)))
-        return VA_STATUS_SUCCESS;
-
-    ret = intel_encoder_check_brc_sequence_parameter(ctx, encode_state, encoder_context, &seq_bits_per_second);
+    if (encoder_context->rate_control_mode & (VA_RC_CBR | VA_RC_VBR)) {
+        ret = intel_encoder_check_brc_sequence_parameter(ctx, encode_state, encoder_context, &seq_bits_per_second);
 
-    if (ret)
-        return ret;
+        if (ret)
+            return ret;
+    }
 
     for (i = 0; i < ARRAY_ELEMS(encode_state->misc_param); i++) {
         for (j = 0; j < ARRAY_ELEMS(encode_state->misc_param[0]); j++) {
@@ -702,6 +701,11 @@ intel_encoder_check_brc_parameter(VADriverContextP ctx,
 
             misc_param = (VAEncMiscParameterBuffer *)encode_state->misc_param[i][j]->buffer;
 
+            if (!(encoder_context->rate_control_mode & (VA_RC_CBR | VA_RC_VBR))) {
+                if (misc_param->type != VAEncMiscParameterTypeROI)
+                    continue;
+            }
+
             switch (misc_param->type) {
             case VAEncMiscParameterTypeFrameRate:
                 intel_encoder_check_framerate_parameter(ctx,