From patchwork Thu Jun 7 23:43:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9300 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp193599jad; Thu, 7 Jun 2018 16:45:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJAMYEkuRY7977bbvKhfkRn0jh6rMdpTWZ97BcnsclzrpSv6VrbpYVjgZVB5Bbp0lULmKr4 X-Received: by 2002:a1c:150:: with SMTP id 77-v6mr3112450wmb.3.1528415148041; Thu, 07 Jun 2018 16:45:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415148; cv=none; d=google.com; s=arc-20160816; b=CyLgG4OAZ65LgmmfeaxMOUDqmrR6GxpIUxO5bxScDyNKno++B5ymZD5y2SkV9odTdo MaXuzAnO6eoLiC6143TATnHY+MdBhaPP6fC5hBuoxp7PbYL9gxewlS5dDdAqvXhGlA0X AJpl4HBZ6FoR/GkcKYGYO1lW6W2JA4zzeW2Ie7zTe6MdNTWMFf1vs0ksVFT/jj0yrkJA gEdWpNLtzh9ED2iBYYevffCYsYqZhP4D9TiJlPHpZVGjGPF9Bh1hRpRJeHkkAQX0XnNj +oTQOnGMkXpzKCr/Ge0FEwvw15Rf5hsQo+BHF6Lu/TtUA3poBbgUK/9ZGYYDZDL7ZSLn syeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=YfHt4h6iVVwSQZEP6cHeBUN0/ZHwNRaRW3kkX+y/ciE=; b=kKJtZLdQVB7gz1Amge3UCPM8Z2d//E7ZhIeTauiMnBSUZ++DSAAIEEmoPQjUfwddES xftl83fb7wAyXT8+3q158+XTiZOVn/+7Q1KSVAlzy8a2NMDLXWsafJSx5MBeYhfgOKwn ifXHV56//47jyptZR3YuQNKw3BXFQJu9F2PKjIMUHc8tQaVrcGalrFA+8CcpzTZ2tEqK ZGp0DTmnf+MD8QSSKjWRlFrHRtZ3Dp4M+iXQ+hzWUVeh6+D1oDOogh9YKS/hILYVyuYv 7Fi3dYTDrYMBYxdDbbH/FyMUx7v4ryk1WQS8rLaZ1Bu3c2yYjcJ++LKa5OnnjcjCY/An 4rGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=0BaeiWi4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 128-v6si70250wmh.155.2018.06.07.16.45.47; Thu, 07 Jun 2018 16:45:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=0BaeiWi4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC1BA68A6F9; Fri, 8 Jun 2018 02:43:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76CFB68A7AF for ; Fri, 8 Jun 2018 02:43:07 +0300 (EEST) Received: by mail-wr0-f170.google.com with SMTP id f16-v6so11537138wrm.3 for ; Thu, 07 Jun 2018 16:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=OCvoEmPzBbqkl2Y8kFnIy/mOShvpRQ2ArZczJoZR94E=; b=0BaeiWi4WFz9bEcbhChGmFeMGYbr8pScZyjU+u6FPr1UKNT2Uog6CuFC1G/cHyiOic Oxm0YhBhaySaX88J3Dmms9QcNW3ZJNl5Qb3ID5ffl1U0Q2LSPjqYreZFN7T5zUHMGlk3 7jrFDwFTwRSyv1N01TznSmhQxjXPMqH76pdrtFzj429f2JM2k+IYPPVhrKj4ssEYgYkO eS8Y+BpbuuW2wrzwtiBM20+qg47Owx+v1VmbcdlG36acXKLjK6eDu5LsRRWJPmIysIjr Ijw5zyq+19Pa5+69BtotZPNiye+Q87gfbYw095/FKBlGnTJc6Pmh4wrip5GRaWMvjPYL zfeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=OCvoEmPzBbqkl2Y8kFnIy/mOShvpRQ2ArZczJoZR94E=; b=HbJk+yVMmKLfrJpYe80D8C6f1WD2jrZfAkscp7NnNbmDYUz7YjGarWjJ6zUOeIn/Id f+LirwX6Whp4XHrD6deUXLF6I8NshIF54WwNhwaPmY9VmGFW4eeEh/nEL45akG1TtKqN E1kd2dj1hr2iT/hHlMQIcPt/SfP7+gJ46rpK0uD4t5Gjlxn4hjSeAue57w7vs4z7Sm8B ATl4uUTyLduTpbxYfcstaW0q5P2znFDC0RgOA5Oidegt4G4UvnJ1rszsGbSoG+vqR5Uk n8vtljdibZEaXiE4txAhw7f9PyndYSas4UvMcMMdp7kVqAHpYML5ZaoBN7gBG456gy1u 271w== X-Gm-Message-State: APt69E2LlojNTF64Gwx3W9xE2XrP1RN4K01hEPU22ypODEWO5tIvpMr3 Z5ZEdPVabZ2lCR0ZAAchAOkRpQ3Y X-Received: by 2002:adf:f18b:: with SMTP id h11-v6mr1483059wro.214.1528415034660; Thu, 07 Jun 2018 16:43:54 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id r2-v6sm18640545wrq.55.2018.06.07.16.43.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:54 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:10 +0100 Message-Id: <20180607234331.32139-16-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 15/36] vaapi_encode: Always reapply global parameters after the sequence header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The codec sequence headers may contain fields which can overwrite the fine parameters given in the specific settings (e.g. a crude bitrate value vs. the max-rate / target-percentage / etc. values in VAEncMiscParameterRateControl). Always reapply all global parameters after a sequence header to avoid this causing problems. --- libavcodec/vaapi_encode.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 4da8a7083c..f4c063734c 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -207,9 +207,16 @@ static int vaapi_encode_issue(AVCodecContext *avctx, pic->nb_param_buffers = 0; - if (pic->encode_order == 0) { - // Global parameter buffers are set on the first picture only. + if (pic->type == PICTURE_TYPE_IDR && ctx->codec->init_sequence_params) { + err = vaapi_encode_make_param_buffer(avctx, pic, + VAEncSequenceParameterBufferType, + ctx->codec_sequence_params, + ctx->codec->sequence_params_size); + if (err < 0) + goto fail; + } + if (pic->type == PICTURE_TYPE_IDR) { for (i = 0; i < ctx->nb_global_params; i++) { err = vaapi_encode_make_param_buffer(avctx, pic, VAEncMiscParameterBufferType, @@ -220,15 +227,6 @@ static int vaapi_encode_issue(AVCodecContext *avctx, } } - if (pic->type == PICTURE_TYPE_IDR && ctx->codec->init_sequence_params) { - err = vaapi_encode_make_param_buffer(avctx, pic, - VAEncSequenceParameterBufferType, - ctx->codec_sequence_params, - ctx->codec->sequence_params_size); - if (err < 0) - goto fail; - } - if (ctx->codec->init_picture_params) { err = ctx->codec->init_picture_params(avctx, pic); if (err < 0) {