From patchwork Wed Aug 29 10:38:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10170 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp547812jap; Wed, 29 Aug 2018 03:39:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaJE/FG/UyaTBYD6gCvKfCx/Vkgf5iKupjXIlMOGKIhULkbDD7srZNV8zgDmQnkmigRZuNU X-Received: by 2002:a1c:a386:: with SMTP id m128-v6mr3894138wme.139.1535539148763; Wed, 29 Aug 2018 03:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535539148; cv=none; d=google.com; s=arc-20160816; b=Zbfp5mJIawu6EIB5bf7mKVFp0g4LKmjT44Mux0YLzoM1unrQw1nMkIsdNs/s5jYv6R TJoaEqI/9HGbgfUvZ8UGdlOCXLDIVlHxYOVPRWPljy5aMQlYiFfZ+x2bpxbMuvlj4eZJ HAeXARfu3pkCP9wmG5qpALfnKMUeKH5q8hnqboqRUvkQME/w6lbCG28eHXIIYr2gs2Ba 50nPgc3Loh30+DQH01oD1+NAM/L6u2T6FPPA0coSz5eb5Cw0ASjh4S2WQbeTzTYMTENt oaWk0CgmK6wBOPkaLrLz/RMnr32zxNEhK6UAKAf8bG2N9dEJJD3nJa3Jmr0PlqcC+pba 7WFA== 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:cc: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=qunSzQwuP/89KFAZFZgYTI5XRKsO5jNRs/jPgpfjb7E=; b=fv8bXTiacBxL9f+S+ng6qPkloTCairJqYhAqAdKQoTbVItFjdF/6gMhZlXClWbBt7f Vm72bOQPErqAt4Z3TOlj47S/cEjRRANuZCQHIYg4cPv8lUChqrQCmksulWb0c1aSCqEu rPO6W1MxMsgdSDvamh4EtzMha4Gn/7ryg+5RmIDajcTgLctiqHBVzYOxd0G2aK1qQXwW rLFy25kcPFdF6bXSBfqqIzCS63hnMxxD0/eAwrGi7nrdJRInKyn6tvAFmR2h29mjbmOT zUmc1slb8ELcScIC41bwYG1hKNRRQZ0knI7OZyYu5nyIP3s5phPMsQ+0a17pT7aIkN6i t1aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cRRCpA8t; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n188-v6si3049955wmn.170.2018.08.29.03.39.08; Wed, 29 Aug 2018 03:39:08 -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=@gmail.com header.s=20161025 header.b=cRRCpA8t; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E680689F1F; Wed, 29 Aug 2018 13:39:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CE28689E21 for ; Wed, 29 Aug 2018 13:38:56 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id s17-v6so2103183plp.7 for ; Wed, 29 Aug 2018 03:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9Mwt1/12D7ZE4u/GSfpfX/Ae5W1hhLiY0qZuAcCnfIQ=; b=cRRCpA8tZDe4Y/TeZFxKfdZzAEUC1iu1eQ6b6vD8kz4CAdUD/z5+JwwjVTMWRFlfd7 P8ztw5SRMuyzRhs/rlxA1cNUg0o5Ly9GrQcvyEJltUahYVfcZtTmTxfhrMK0FzfB5K13 sCO25PMnS/Xb8YH+afcVCAbglPsIgRyp5gnom8DIFVlyCheCBWJdgps4QzX6ZpHw6Eym KpTLVgxc5CV/KSS20ovtMJXLfZydw1exXw18xnHInUK4FiEHjFbjNH8QJSdS0m8hpnGs tOnEzdPZUuH5SZDM+StBN4R/NRgrg4a0pfBQ1/UGgRQojQTELYnomjy1G1fsClp3DrbK Y2xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9Mwt1/12D7ZE4u/GSfpfX/Ae5W1hhLiY0qZuAcCnfIQ=; b=NMPjeYRwt8FawBBEfAyBpXilAfEi6rC6Ucz4k0S7VTQcROSRMzO6PTW0GsnCPZpyzH nWOaeW2FkNvHaWw7f6HVc+jJyp6nq0IKpZ5TCrguIWiWQwuwGbpzkRvgJWHWP9BKgKES QEHhpGLaS+ZRUoPeENA41ZGovKT2DMqC8ChDJ6IVBRnCW/fyXgeAqx4Mx9RRA4yI5ADx 3O6gW9x+QIPqn1SNeNjzkF6AnCZkSU/RQ6yIHZci6hLAYbsRPIvOeFZSIrkTFT+bQy/6 6XCQSbky3qJBQbRw5lX8qWaRpGXGNyxstfTneVZbuQ2qdvJtkRdFD+vuImSITRi/pNc1 xD8g== X-Gm-Message-State: APzg51A6YbzRInIm95Rh8af9aNL1bNTtU+cH6Fgh3ElDRmlzvpdk1Bqk CYhJVXtliRXNxqI+gvAAg78eAmO3 X-Received: by 2002:a17:902:8a8e:: with SMTP id p14-v6mr5395857plo.213.1535539138744; Wed, 29 Aug 2018 03:38:58 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id b1-v6sm9895286pgi.91.2018.08.29.03.38.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Aug 2018 03:38:57 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Aug 2018 18:38:42 +0800 Message-Id: <1535539124-16338-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1535539124-16338-1-git-send-email-mypopydev@gmail.com> References: <1535539124-16338-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V7 1/3] lavc/vaapi_encode: Add max slices number query. 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 Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Add max slices number query. Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode.c | 4 ++++ libavcodec/vaapi_encode.h | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 313f551..e4a104e 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -985,6 +985,7 @@ static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) { VAConfigAttribRTFormat }, { VAConfigAttribRateControl }, { VAConfigAttribEncMaxRefFrames }, + { VAConfigAttribEncMaxSlices }, { VAConfigAttribEncPackedHeaders }, }; @@ -1117,6 +1118,9 @@ static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) } } break; + case VAConfigAttribEncMaxSlices: + ctx->max_slices = attr[i].value; + break; case VAConfigAttribEncPackedHeaders: if (ctx->va_packed_headers & ~attr[i].value) { // This isn't fatal, but packed headers are always diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index c7370a1..0df76b5 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -161,6 +161,10 @@ typedef struct VAAPIEncodeContext { } quality_params; #endif + // Supported max-slices number per frame. (0 means driver cannot + // support max multi-slices query) + int max_slices; + // Per-sequence parameter structure (VAEncSequenceParameterBuffer*). void *codec_sequence_params;