From patchwork Thu Aug 24 01:13:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4814 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp142422jao; Wed, 23 Aug 2017 18:13:29 -0700 (PDT) X-Received: by 10.28.109.194 with SMTP id b63mr2791851wmi.114.1503537208906; Wed, 23 Aug 2017 18:13:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503537208; cv=none; d=google.com; s=arc-20160816; b=fbeh7YFtDHj4pseUzZmA7NYMBi245iHQMKtyFZ82LQpMYOT3IzRJ0htuiQg6nfxX2j cSay/mAzpX1pzN9Zxpr05tOvIxG59LKyCRSLB+wzY2oVlrwCL9AMcm+Mv4k4g75B7NlW wAaPFwUHLYMxH9wn7Rc+0qr12x3MArP+I1vDuFs4bBi5OXE3l092YtcCUNvED9y3ov9K JWjq/8GEMvJYVAdK2Lvo5fGniMBPlSuj5h2akcd9BTBCmYEUV8D3BzEbhNCnlQ9uHcXm FzxoktJ3at+meHfEpYsLq5pcsWXvAEZz9X8F+lKVa7MHSOGTGXCeE+KWuLN4+AlUE5xs 9qwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=M9xhr5pohsOnlwalmOZJ60mgeLNufBrTgOHQDQORH/g=; b=ym4a65PZflL8A3DRLKGZp7xtOYKhYzLkoM8O5HlBhd2rpDILvmQb+R6FUKpS2IPl79 gkKI6fuH55np0N6dxof5BYegu9Uv7Fuo4U4+wpr7+lcx8jHYpXIINhk8uGBUgG6Uh8US WVTyL+6OCqIdH9K+pW6fVxHfj/HW2UB4XOYRLbTCLVO3dyJGLCAGoXroX3duHUnToNCM jln5EHfC4a1JJtdBz6NFM4LCa6nARaVizffRdgNPwINB0tC2sXfvvTDMovvt8OmifQIy +dhP3EBPVRbVFxEz9uDyYiGSjTZTyQDchUDtG8Ua/lDF/GD5KW+wZyrkdxZR6jEGO9ow Bj+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=U55NoRwp; 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 138si2258000wmw.42.2017.08.23.18.13.28; Wed, 23 Aug 2017 18:13:28 -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=U55NoRwp; 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 70E14689971; Thu, 24 Aug 2017 04:13:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9F4668995B for ; Thu, 24 Aug 2017 04:13:09 +0300 (EEST) Received: by mail-pg0-f66.google.com with SMTP id w27so1485240pge.4 for ; Wed, 23 Aug 2017 18:13:17 -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=qokYE4iibEM5+7AYeEcz61JUkcAECdEiiYgGoWomtug=; b=U55NoRwpgswlqg1SG4f03izq2/XFQvR/d/qn+0n/B807o8AFDFmfGi60lj9jKr5/Hw BeBmh1134Z6RiYhSBEyBI8dFo9s7olog4bPcPbJVyCCyrWfqDwhQ6d2AGO6tIPr2rN9Z OLqbQGuTRqhQanhWhU4fB26CqkK01+ugPz6ruI8nE0MHYJneeQxZoY8EG9+/WsCpWFcO J+TL+jCKiNyP7hfXMF2kQEpY2IrA57jtYko9SdbhZFWIQqgZY448tA/oL3WmDobD/MsT rqYIXljU3XDzt3ylEPnOdr25oWD2YE6kNJ+yirzAuwrsHzmXFNG7XEyMovbq5N9kOO2B ijug== 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=qokYE4iibEM5+7AYeEcz61JUkcAECdEiiYgGoWomtug=; b=gP1x1BZ34Vmx9LAuyJZ9o6lsd8t4ENc5bgjwWNis+aojlXtvjskBn5JaVHnVNMSNX+ npgbHPdtIIw7SvCu71DfxnTDEZKahF251ieRpxp4SnMY++MGr4jobBhGIa/kdGlNPjrY woNAOO0v1pgcWhkk101/+YVBoawoQtAL+srJiTstbutjk6VbosQ3K/8ijh0fqNxcQDCf 0bwy4hKF4u9mwz9RplHl5s5lqNDpB4hRs64LtumyP3EQVr+eCHTOTHHQEW6JdTn6jQES mBE5ou1K3Tq1fSGMi0w1Piw8x1dadg63Dozx7tJY8DabW3WOr0Dy9StSp6eSOaY15kZp 2M5Q== X-Gm-Message-State: AHYfb5hrMh2zERROVVJEBxqdC945ve27EQPQedOEDE05dU9AgVwcB2ny odUJtJ6aA0ZnJQ== X-Received: by 10.84.167.2 with SMTP id c2mr5117541plb.369.1503537196266; Wed, 23 Aug 2017 18:13:16 -0700 (PDT) Received: from [10.67.68.67] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id y63sm5040478pfa.36.2017.08.23.18.13.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 18:13:15 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson , Steven Liu From: Jun Zhao Message-ID: <79d133af-1e5e-1781-8e8c-70ca3f101b4a@gmail.com> Date: Thu, 24 Aug 2017 09:13:09 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [V5 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 4cac77cf990e91fececaf3dc5bffe606fcdae17c Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 04:16:30 -0400 Subject: [V5 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 f49e0e3b91..011aedd9d9 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 364b5b8028..dafbbf5045 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 mutil-slices query) + int max_slices; + // Per-sequence parameter structure (VAEncSequenceParameterBuffer*). void *codec_sequence_params;