Merge commit '2940e196c5e439d9869f8c02a49a318d0847453c'

* commit '2940e196c5e439d9869f8c02a49a318d0847453c': vaapi_h265: cu_qp_delta should not be used in constant-QP mode Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago · 6c841e03ce
parent 4b90413cb2 2940e196c5
commit 6c841e03ce
1 changed files with 4 additions and 1 deletions
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@ -868,7 +868,10 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx)

        vpic->pic_fields.bits.screen_content_flag = 0;
        vpic->pic_fields.bits.enable_gpu_weighted_prediction = 0;
-        vpic->pic_fields.bits.cu_qp_delta_enabled_flag = 1;
+
+        // Per-CU QP changes are required for non-constant-QP modes.
+        vpic->pic_fields.bits.cu_qp_delta_enabled_flag =
+            ctx->va_rc_mode != VA_RC_CQP;
    }

    {