From patchwork Wed Aug 2 05:55:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4585 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp813758vsu; Tue, 1 Aug 2017 23:01:55 -0700 (PDT) X-Received: by 10.28.184.23 with SMTP id i23mr764518wmf.22.1501653715247; Tue, 01 Aug 2017 23:01:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501653715; cv=none; d=google.com; s=arc-20160816; b=DgSv3rJmNL6dxfP0lIzZeb0kmssC0MS9M45qiB1lPRz6M8TozteS2VvciJYpBd2Ie4 ZIeGYmjppxMQp2CqrPeKEEHIH53czCwRBRI9CFb2NrB/sGetetBn5nvUDefnnJWnz+Da YMisTOpVenPBjscb3yG9mvgBdEVX3Vc4VU2xQn/O9lssadMkJLTfzxFqHOOwDp1OAwVy G1KVO6WlzgRf8amc+c0pMhWgGRZXLoFl0rdw1fXk8q+xxMu8q/3zqbOT4kgK2SRyx8Th uIKHeHMAe8iGnA2YvXMM0gUQ/e4CosLKCe9rOw9Rq7YUkzm4WvoAmV5EN3/dxKO9tXmq MznA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=bZH4dWYVVoRQe+5RWT9EZi5I6oR2r7O3YTCpfu0psNo=; b=Lpz6E3m2lUUHu8fwfx66Xul9f1TGbN6Wdjw8v5N6AmHW/zl6EJmA/3Fo+unU5qWqSq 6E65NPhn8ieJftPjFbN9kxsihibxakt+RancNmup+fBTmWEXtY27dhVaHMCTbPRv/Mz0 8pLoXw5sjrnutqwhF4geSasUcphaM4f0OxA7arjn7PuzQSHVHr6rm2bUZAJLlGhFormC nAbRgoAVwm2FSu/v64vgfAdTMCmLByRuCsVr+vCANT4JaEliDXGZ4rs6wi3NYxGlhOEn e0bBmv7D1tBd5Gh+pyrd+XCAhRI69Fjk4EKbIplVFJCgSMgls9j2UA9vXM0K0Y534xUy IrvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UQFRcyzJ; 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=NONE 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 d31si2642352wma.169.2017.08.01.23.01.54; Tue, 01 Aug 2017 23:01:55 -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=UQFRcyzJ; 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=NONE 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 8317968A421; Wed, 2 Aug 2017 09:01:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f53.google.com (mail-pg0-f53.google.com [74.125.83.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FD3168081C for ; Wed, 2 Aug 2017 09:01:43 +0300 (EEST) Received: by mail-pg0-f53.google.com with SMTP id l64so17100142pge.5 for ; Tue, 01 Aug 2017 23:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=0zmEZVxUMSzJ6VMyKrb2s/Ni60gL/Gkh0loFxm31HVA=; b=UQFRcyzJuPrky2oI/wIHy9hhw8ZPf1nkuzaJPez8gON4/8GVTgoVkj4GZx+Sbix8gH Vl4Bj2I6Z/EvZGsMaffKxyn7OZnUDN/phPbcNroyuYR5HWdx2zhl3ktr64pj2H3MG8ZW rPPTWxg1jnhlCd6665TWsTKXZIZ3t8EKs3bWDuVhxPCiBg8B2faNc5Gb0pnMQ/KpvvQg +fYXZ6zXqLu4pNdTMLrVQ4Vn/ro2J5Jz/u1c6hZ6HOznwDQTle3jYxylC9RH11M4Okkh QVaKjeNk/i8DMh60opMmmKLdVY1pmwLADEdNwXpasPkQHp7iOz3SPffaidLuUe5qP+cD 33uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=0zmEZVxUMSzJ6VMyKrb2s/Ni60gL/Gkh0loFxm31HVA=; b=geHiGeLaZsR2PEHZz8CproeZsBV0jRRfZGr/Ycx72V/K8EsK4BRfPW+pxbjugof5ic IqCcXoLBr2on2ozb0VZBrxkevdOS3qoXi8xnrSqHWG4b8xxE4WRn2SuEvSHeHuKJ5vk1 ZbgWWgyKEvhFj9ZIPzLF7ttg2ICOqd+FC4gjOdSPEEpsbUD/6Br/9G7wCUjQP/5T34CH Tl5BcVKNi1H/vNQLQxGSwj/YOpmjuetbBuIfCW3whMrL2Wba6gIYd7hrS89mKXsgMkYv CRkQbtdoE/bSHPSGm3TNZMmVLhWbvpPEhqLjAdr6ruZDisgRs5PWh4oTn/L4CWBSi0lS Yd0g== X-Gm-Message-State: AIVw112Uh9mb8BRJRxBSAAeJBRiJUacDBD5B+WDjkqE0kElw+wZHJqov DzBnhRwD8GKvKw== X-Received: by 10.98.236.137 with SMTP id e9mr10935475pfm.159.1501653308569; Tue, 01 Aug 2017 22:55:08 -0700 (PDT) Received: from [10.67.68.50] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id n3sm65065186pfb.87.2017.08.01.22.55.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 22:55:07 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <30afe0b0-3706-6df4-67f3-caf059986214@gmail.com> Date: Wed, 2 Aug 2017 13:55:04 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename="0002-lavc-vaapi_encode-Add-max-slices-number-query.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH V2 2/4] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 2a0bd4795fcf7d889c3c93b03e8698015a519260 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 04:16:30 -0400 Subject: [PATCH V2 2/4] lavc/vaapi_encode: Add max slices number query. Add max slices number query. Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode.c | 4 ++++ libavcodec/vaapi_encode.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 11d9803b5d..9fc70bdd55 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -972,6 +972,7 @@ static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) { VAConfigAttribRTFormat }, { VAConfigAttribRateControl }, { VAConfigAttribEncMaxRefFrames }, + { VAConfigAttribEncMaxSlices }, { VAConfigAttribEncPackedHeaders }, }; @@ -1102,6 +1103,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 b542772aed..fd55aa6cdc 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -103,6 +103,9 @@ typedef struct VAAPIEncodeContext { // Supported packed headers (initially the desired set, modified // later to what is actually supported). unsigned int va_packed_headers; + // Supported max-slices number per frame. (0 means driver cannot + // support max mutil-slices query) + int max_slices; // The required size of surfaces. This is probably the input // size (AVCodecContext.width|height) aligned up to whatever