From patchwork Fri Aug 18 02:13:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4737 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp256172vsu; Thu, 17 Aug 2017 19:14:15 -0700 (PDT) X-Received: by 10.223.172.232 with SMTP id o95mr4316949wrc.276.1503022455708; Thu, 17 Aug 2017 19:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503022455; cv=none; d=google.com; s=arc-20160816; b=NA1BJHpDZjaf8ZavyfyWEqdDMOI/RBoO2EoqGQSXGQI2dHUVyJ6zgsf8SIPd9sZVRs KlxqEV+xJPCFqajWNWrTKa+m2lcDirOBFh1uCOSaWB8IPphuXtx52N3USAxQZS/lh4VZ 630L8vCDYNP7E+M4ICQeyvT+SMJgQw3T2v/VwTmIXts41h9Y+zfm0ZNhpWp0yVtHK3q2 WU8OozlGry5lfvtmz6MIewFu3kdl2Zd2P8imvJiKOT6APeqfwU6ODQ8yvGEODq3puqab JiFjBri/VKq6euORAQF+9T4+pQ/Htq2HEXGxAaDcyus8G65sAE6u/oyiK5/5X6ZtJ30K 8tzA== 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=B67gDYUeqlzsQCAkcjtKh9dOvCxP/r6fBrXVhsTmoU4=; b=kDZBnNp4l3wXbRSrXiu0jJWnni/2ztcqRKoSYS2gGPPKXaF3lkUqBOOVVWfFfdAkPZ yJ0PftpRWPCLHuYqwgR9Ivbf6KT3XQj/bmT6c8EyrNx1nQnWGcluOTkCO/eGlPPN4l3i GviYk4dMXKJlmdofCUhyj999Ah8g6zMP2dEHm+PVFFxPr1qo6CJ+GvkrJ1BWRTknV4PW C+QNNEZGQm0TsiUhwfYzaUi/K2HsgatX5Tb2MbR34R3/cXNKEtK10RpB1va5T+FqnosD ELXhPvUaKD/Eh6AgmRWNR+IjG2SwOLUtFFML1o/uFesV+babOqRhSsOKBu32wAC6WrLw 9Dtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=heAiqohS; 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 x19si3457240wrd.233.2017.08.17.19.14.15; Thu, 17 Aug 2017 19:14:15 -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=heAiqohS; 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 7DC6D6899F5; Fri, 18 Aug 2017 05:14:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f44.google.com (mail-pg0-f44.google.com [74.125.83.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9A896882CF for ; Fri, 18 Aug 2017 05:14:00 +0300 (EEST) Received: by mail-pg0-f44.google.com with SMTP id u185so54201683pgb.1 for ; Thu, 17 Aug 2017 19:14:06 -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=F9T2T8fmV0jtVgyk3VmJx44RbZv9Ie+hTAc56SdkzSc=; b=heAiqohSdUVOPkRGXO3nNiusaF3XxynUlCcFFSBpf8PWPjqmqxMsmnRKouyMxTxXF8 Wzx4eGBiHHpKSmry1CX/JyTQHdiHygyeHPdos3rBRjl7m60Bl/eszwKCgIqeYIOwb/dR 7YtKoMMG0chvR4ynp4rObuFxCsrK5gmV5fkk+FX/spXjKbN0QW0ERY015NPuw9K2sc9n /MWLaeMNugHAEOkrBcowFDE0a6XXhcg56qT0fmg5TTn7Gz4skZiWqhYLTNgKB0m6zxNz mBAdCKFqKof5ghsY5w3aGrnFERGu/o7rDOmW6S2luNVslk0rcIICYwJp0W6DGCGg/OtI 6nYA== 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=F9T2T8fmV0jtVgyk3VmJx44RbZv9Ie+hTAc56SdkzSc=; b=pPSHGTVOndBHVUJeN/6Ovuwy7saFWwmaeAz0zgCuKZMcRXX2yOBNm6WbwjFecv4F1N xibPYo5oJEu0B/4g4YoLduwXFS4vSGlrQTaMZLLed9+J7eM+UCfGb8gkcx1nCI0yOcFW 55VHURSUlrt87WyzFoIWE73Je0Sf7khkoFy6N2vagUQbaRg48Mrn3xQyQfyKTGKuRICs LYIOQjCupPc6Pn89cE4/mqblQaFIbiJ1Rwj2fGT3Hft47Xjxd0AjYUZ4PujYbaiXGd/b 5lSjlTCvoVjwgGqaUJHjiUvgdVjJeOcyWAB6ms1paCn0rsVAdc/zyPeQNkruvRIVd6TZ zr7w== X-Gm-Message-State: AHYfb5gtOzuN1kmK4dqL/wVS72bOEv9JXnBMIvR0VNBNTyxd3VH9ly8P WbHaDnHeEl+SxD7K X-Received: by 10.99.97.195 with SMTP id v186mr7017800pgb.254.1503022444979; Thu, 17 Aug 2017 19:14:04 -0700 (PDT) Received: from [10.67.68.37] (fmdmzpr02-ext.fm.intel.com. [192.55.55.37]) by smtp.gmail.com with ESMTPSA id n1sm9566090pfj.46.2017.08.17.19.14.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 19:14:03 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <5e0a7a6c-55d9-cdd0-a6e0-4eaa789adfc9@gmail.com> Date: Fri, 18 Aug 2017 10:13:37 +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 V3 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 23201c7288b07fc117279a2efca7372158564730 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 04:16:30 -0400 Subject: [PATCH V3 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 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index afc3970d44..f4275dfab4 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 }, }; @@ -1101,6 +1102,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 e9aaec6f74..59633bb60f 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -158,6 +158,10 @@ typedef struct VAAPIEncodeContext { VAEncMiscParameterFrameRate fr; } fr_params; + // Supported max-slices number per frame. (0 means driver cannot + // support max mutil-slices query) + int max_slices; + // Per-sequence parameter structure (VAEncSequenceParameterBuffer*). void *codec_sequence_params;