From patchwork Sun Apr 22 15:29:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8570 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2854592jad; Sun, 22 Apr 2018 08:31:47 -0700 (PDT) X-Google-Smtp-Source: AIpwx49mEwCJugbACvJfpw3uK/PePXjRWZNGwOUG4yZ3sjaI5gUCCU8PZGtxeqsG051pHKqwID31 X-Received: by 2002:adf:ca12:: with SMTP id o18-v6mr13722473wrh.281.1524411107630; Sun, 22 Apr 2018 08:31:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524411107; cv=none; d=google.com; s=arc-20160816; b=OoN7WvUvDSU5vo/XYiVyWgyZTg1oBkcx83TFhINfelce5H8L7vJfkYG/JED+gPXQL2 QtyUzidtrgJFYS67C+u652NdH/kX+Tk8cLgWyy+KK4eRE95Gdsjq+iLxxwUqMjq5MFqq ZXunWq04SPLMkZhn5nfLhkqO4718iu1VQD7a5g1Vt36VPfxf3uh0z1F26WL+2lNPEG/L wsbLu7juxJyXoQP978x5G40v8GFBcS0GeHbo8Ws1Fi9ptv7szpLGMERaCXHOt+pckxaB 239SAhfBZvdTfAGQiRoenDsuyxj0lHcxGw6pd2WRDfMIlRBtQ0sRdgAO03qHjFhLZmoy 9b2Q== 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=VBO4mYg+4qUIfNj2jEK2oXIagb6JGAmbBOK1uhlMyBU=; b=vEPTaJAlOik6wgNwOGXBPeSWR6XVANAP6Qp9b8w8opNfGTFrBtTu0TGTTvXiuFwEiJ 9ofYBs6khPYJgYdwCKTFh5e9JWASnn5pz2qtT5Slf+7S3yZA++95PTEn+n4np6ztLH2S 6WgsCBEG+1GJ7k3HDHNi/WGG8P/BC/7VxX1qpsC/T8Bj4gxbxrInPbc2OAdZ/JzCtzNV RPsVDNZ+mK7+6KCKxJhnR+B4prn6dBxdhmZb8uBtW80xfI16A+laQ4rBtozf80cZ/3BF tJXz1X/DW0NvA6c3l0vZSOEoEB9Lh7q87sJbgM0uS4LjglDIeu75p61vDbt4MY9E6U3v jaHA== 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=YIBimZQa; 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 w77si4371277wme.169.2018.04.22.08.31.47; Sun, 22 Apr 2018 08:31:47 -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=YIBimZQa; 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 C3CB268A361; Sun, 22 Apr 2018 18:29:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF71968A25E for ; Sun, 22 Apr 2018 18:29:14 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id v15-v6so16485750wrm.10 for ; Sun, 22 Apr 2018 08:29:43 -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=vf0tJW7JmrQNjHFEtwUB4TECA33xgS5OVcFXYn1jKns=; b=YIBimZQaFvQUUFsBs5ZrlKYgRDG/fVGQkvrogAMiZowyucRARbSWr3cFYBEUotwwWe LVPwL+pmy4FW+H8fqnt2wBXvK2G5GzH2A2W+Uowgvug4UCuil+cuOxg1U53Y+OinEhZX FujBoLUfeW8tUroIbqano29ypyw4117N0uNwlvws0w57OaVdEXGPjCiH6GkKbyJzF7u4 GgHBlX3dmCIA5I1NJYuIs6FO6znhP657figjN0Pu33oBQNbO4Iuh47GcS6BgwzevcqZ0 Uw7I2Ul/DcAhmr8ZeozbvaGDNFGjfrihn7bEQbZs2zsCqhws8xLvql7k9GiFlS/Js8Lg CoMA== 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=vf0tJW7JmrQNjHFEtwUB4TECA33xgS5OVcFXYn1jKns=; b=AkPRmMOHVr7EkW2Xi4kX+yQPeq9+makZ1GIu0Cu3inFJoRb7h1gJp6nh90mnKIpe6y sss3S1DDfJafsE+amXjH21sIDav1VGeVJVImzhgUd3ba5gr8J8gMXdbcXcEvZGOIie4m 19lJyz4Y1Y6p2uqwRHzoYoP2BLLYHTQshuQmry+rsvoCKPheqd7qjgu29yLO5X/BOZA9 oYNRtaPoPHF1i4+8CB+uDKPlf4tjbLOjp3pCI8YoIgWfNKGPfXtggodgxybUgXyEwSqD lcH9ILyROIuF6rHSLpYoZHsWoc96l7aFToe1OJw8Sli6Ob7xVLhIEUWLXchV1M1ctwqF Q23g== X-Gm-Message-State: ALQs6tAZVoAuFW3H93NSCYTojx3IBGn28QWL6z++YCxHATabUtl5BLSm XKNIwQoEoEYVQrjgTIDbb7rpgf5/ X-Received: by 10.28.155.206 with SMTP id d197mr7893126wme.44.1524410983110; Sun, 22 Apr 2018 08:29:43 -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 32-v6sm7021498wrf.79.2018.04.22.08.29.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 08:29:42 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 16:29:09 +0100 Message-Id: <20180422152921.32510-15-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180422152921.32510-1-sw@jkqxz.net> References: <20180422152921.32510-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 14/26] 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 a5eb072843..fc83d3db11 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) {