From patchwork Tue Sep 18 22:30:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10365 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp11568jap; Tue, 18 Sep 2018 15:32:30 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYiPg48XHhTJN1bqfFEQ8BwVCZ/8Dn8wA46dwLAIfcIrZrtCZlbGO6a4RBIIahHYkMUN1pM X-Received: by 2002:a1c:8e81:: with SMTP id q123-v6mr17422599wmd.56.1537309950811; Tue, 18 Sep 2018 15:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537309950; cv=none; d=google.com; s=arc-20160816; b=cGaa/CRKek9KOApuaeG4zSbWSA77o+6IRByaNxGHAax5Dabbv1txbOJmTpVXNpYm2f xMZ0JkUXVBT80DXPUrMzGbICJwgCECApeaggbUDfIVI/+OmdoIAsODSNdMYXPQ2GQlMJ zHKZUq112lBj12TH5bgqNguRY2+izpMpjj46xuUfiDovvrUGASdJrd2Z+82Kk1k+KDR8 KOhBzrFWVc55jVhamp6Kn+pChrcon/5jY2vwXGMegEcS0EAacd/5jT/tMOApSUcRADZe sZuRdwyYcyEV/hAviO/g4Pms7fMFO9wTvuSkLiWbf7ASxChgkxgXjqELs5xwpf4VQDc/ MgEQ== 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; bh=Ju1rnzvZaFN1wVHckSV8YAbGfM3QltMGsPTZtEj2X00=; b=dofFQzgFGvfygnAn+Kl5URuxBdOauRX36AswUaLEFpYACqPbKCyGQYltwMa42ixqac pWsSznrQe8NUxDdVfk6kc1wG0NODO3VG24e7GSbYajmQBZx6b0JdqrdaLudV+UYr92eO e8AJiKnWsO+9yHPJ0h5k1pZ2Ka8HD3JF3jIKNSGjtuJD7UQ231QPy/WbGFfH5l8rNAK9 0vUuYaMwfS6mLXyz8pvcbpGsx36b/6CoKCJT6ccSuosnqazyK4mhnUCJxX++QxN7/+oy GZr642esC3XckDez0NeySwIQY7UpJoF7jFOGrTJiGc0D+VMmmHcWc4Lx6b7DszOM17s9 6xzg== 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=g1dyWDTs; 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 k3-v6si4120622wrh.237.2018.09.18.15.32.30; Tue, 18 Sep 2018 15:32:30 -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=g1dyWDTs; 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 C02E568A457; Wed, 19 Sep 2018 01:31:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90D9268A0FA for ; Wed, 19 Sep 2018 01:31:14 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id 207-v6so4581611wme.5 for ; Tue, 18 Sep 2018 15:31:27 -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=DSlknrjoa5noC22MNxvH8a/GpCibLZUMqwwjVd8Ys8g=; b=g1dyWDTsBtH8KTNOuxjfyu9xkjWoAMDDIyXNr9NMSiv5AiblJHWjHp4XmCPHs9MA9r QNlGnWNOWp+GtO43HQbppeRMcihQs1/CjhQ+MEXIiCY/o0OrnEg1+nChz2l6d+/nd6Ka g4n9JhUBzpqeT5TBGyJW5KazgVVStsqCs04kyZifdE005bFq2efOkj6Ch+no3QeVja0I y1FqjmlGpSM/JbViv8qdYy+O6bEcGhtoXl3RkOL/Tn2SJxeHXN6Nox8cUGay3KRZQVQJ m0qsPSlcWyT4wGv+tWgn+8wgwOpWZfyiZUnyTm9L/SFh6Y3p1j+yOYv3vmBLf9hjJfhw NLeQ== 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=DSlknrjoa5noC22MNxvH8a/GpCibLZUMqwwjVd8Ys8g=; b=huhMSjbCFJT7w6bc/r9l9lpvPnVbkKBjxEAoTLUOEGipCGOKXhKvoYqEn5qba4XAMx 7x9m+np7Efi4CoyME0eGGSIBDlJgscEe6gyhQJNqi8ZHSy6XmtFsfFX9GB/LhkvFRZY4 zhVOJEPSlj/tEhocuCM/eNGjS86nLc0ISAhuTLGdCSY+bjF0g8u/GUgoJYGDh7Qerrdu EmvwF6xvO5vord+/Xq0XUzt/uWtAMEmkHPdsKaIwSk9xG9+6U/K9j1nmsEKaGx82f66H NIVSf16naHgn5HbqnfrosaS1tmXQ08BjpE1E41A0xr7pb8H/F8TiMO2VAjpBUNWHndTA SExg== X-Gm-Message-State: APzg51BEGZXJQB49FIGYoWHBIJ6c5tMrD3wU+IZh2DhEgqJR7pX0hQqu YC6qNW7RpfehESaQ7U24DvSpLwOF4mo= X-Received: by 2002:a1c:1bca:: with SMTP id b193-v6mr18452157wmb.6.1537309887042; Tue, 18 Sep 2018 15:31:27 -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 e141-v6sm4863826wmd.32.2018.09.18.15.31.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:26 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:30:44 +0100 Message-Id: <20180918223116.14322-7-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 06/38] 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 35a4e90f67..1969c9252f 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) {