From patchwork Mon Jul 30 11:42:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9840 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3778434jad; Mon, 30 Jul 2018 04:43:01 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeXGi5CnAToIt5ThlcR0lsRb+EZ37yMSmckRfIkK71QOfevbuI19T+eHqOo3in/HKpEOLSM X-Received: by 2002:a1c:4885:: with SMTP id v127-v6mr14863886wma.161.1532950981632; Mon, 30 Jul 2018 04:43:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532950981; cv=none; d=google.com; s=arc-20160816; b=VCxmD/CBNWIKGNfdc/oLY2p3pHy3mK8UFEFxxSstbxFHGBmEwLvCNTVUyYTnu6nsMQ ciXumJNlw70I6yunlYDHXlDewwU/VX2w09SuihJqs8nhyk8MuuEMZE7fgQMKDa9v1HEy xH3kf0M02nPaajJlltfvODi3KDTLi1KfA4NpwhQLR0UrwMum/1J0+jRNMLaYqy6InyeY jc8sTJ28dWzds5O/Y1eifdRAtQhDxwIyaotRYcDeiKq5SHu0FD6Ye4APl33F5bZZBtOC BmzX7V8y0+DWkW5HgEvXEuDHG5Bvk8EknvnC69b3xUaLm7mE39HM4BbMHgdVOzVVTRe8 7ClQ== 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=PEieVyeKRj5v2uIlL7pYvyzgQFPEOC8Nbh+FcT+NbXg=; b=SLsw6dZd0DOG4231jDJX32EALcwKIE9yTkAtFiCwIwd5h40NCdtsEAaKQP4DXDR+Ou CXtMcCR1ZM6JJDWcGLPkA7WQBzAVT/BRl7h7QRM9CrcQ/ZvhV/fnMZpBFnG13MCeeINM xuXqu9kO2hkUiFyB5dRZUOVszGjWRnZVJSJujAM8p5Za7uWOCamqn+WvQ8ppqrg29Wlo hNKh5IWPKg3N0+aaCtZPp/3p59UiILRbL3mM5fMiUAdsyXFngOkotZ6FM8AMVmdDRj7I i7JlqXlVs/YFJcqE29DXX8zlPUpnXLcO+CeY1GU7SZis/wOZijobyPzdicHW6nf1Pjk8 kgvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=elxJnlK5; 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 b9-v6si1620856wrc.64.2018.07.30.04.43.00; Mon, 30 Jul 2018 04:43:01 -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=elxJnlK5; 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 5C07068A44A; Mon, 30 Jul 2018 14:42:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CB5B68A401 for ; Mon, 30 Jul 2018 14:42:35 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id j8-v6so4420286pff.6 for ; Mon, 30 Jul 2018 04:42:51 -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=qm+bYMMcpdtvrLPO5/WNI2YaSBNU1JhY+jZC8Gfq9BY=; b=elxJnlK5Jr+as1QBDS5Y8kIaPeFHs+E+JKX46HwY9sI95gTdr6tayOFpBtFxRXR/N9 RuJhbiDrA4C38fBT70q7U/8KAm8kk5NjiXG2yFHwLG7l4PhGmXN4eM5OOp+wGeoHIiIF 8edFFCCD5a/cqAKCxqol53PYJY4GDSJyFe4685TGPbbnX3YpQUI1/r4lLLj4SK+1nDlr Uub46uamCTQAnFmsXD4l9HM7kXPMtfDsfEICM3J2nuuKiHvWZMMPVZoCadEmGdowQx7S aYDv28J1vLBfPnpxkqrii4okJx6FNVUoP2Xhnhb87YHhGQY2mpQr8ggy3W7vfZPe3myL Hlig== 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=qm+bYMMcpdtvrLPO5/WNI2YaSBNU1JhY+jZC8Gfq9BY=; b=WVccDU76hOyRy9kQiJ1U4IMXkGxuk/kx684xYvTLP8X7rXJaSmbK9N0KewGM72gkNl w8qjTTkJeYkW2eCE7ssP5W0diWAiiyjtgYTDuA9lN4m1M9Ih7FKYzPS9k4xOrBUG7Am8 Mp/8W/nPX9uQvL5OTce7h9l5Fg3iNnOLBAnMDpDA3LQWOW4Y75U+JJxGJBRsmhwlg0wS kVklUl9I0mY68uZUl/AxbDVlMJxj9Haqk2y1Tex4Xs5X3QyEsMv9Wq30rScT9VRDUjqo NIzZDBrjlutlcIepes+jWtQ2pb9XQfRIgzehkl9Ztf0QiEGfiNMGbMC+oWFzLaCx1ASX HG2Q== X-Gm-Message-State: AOUpUlGK6UxKg7m3OwxAt2Imwoc8WBG5nh0k3itBPfB07zHWF41Qb4Yc JD7952HFJvxSXKfB4flvPPiSMpMl X-Received: by 2002:a62:d1b:: with SMTP id v27-v6mr17800765pfi.87.1532950970220; Mon, 30 Jul 2018 04:42:50 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id r81-v6sm21426132pfa.18.2018.07.30.04.42.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jul 2018 04:42:49 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Jul 2018 19:42:38 +0800 Message-Id: <1532950960-7640-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1532950960-7640-1-git-send-email-mypopydev@gmail.com> References: <1532950960-7640-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 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 910fd1b..53d6424 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -971,6 +971,7 @@ static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) { VAConfigAttribRTFormat }, { VAConfigAttribRateControl }, { VAConfigAttribEncMaxRefFrames }, + { VAConfigAttribEncMaxSlices }, { VAConfigAttribEncPackedHeaders }, }; @@ -1103,6 +1104,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 bcb9d57..6fcc83d 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -164,6 +164,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;