From patchwork Wed Aug 23 10:34:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4805 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.137.29 with SMTP id o29csp1808799jaj; Wed, 23 Aug 2017 03:34:33 -0700 (PDT) X-Received: by 10.223.139.193 with SMTP id w1mr1282654wra.206.1503484473484; Wed, 23 Aug 2017 03:34:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503484473; cv=none; d=google.com; s=arc-20160816; b=B3hxgnZfLEjNatB9fGHJtEbZ90Xw9KMWx/sxO+U6NzD7k9kGD4Y1gnxjX6yzuQQNJn fMqOwCehwzf4DIvg56i1IvEBk9kMs7BQpa5I2HC+lM56vmhjXgN8aOD5BC/TPqB6YPPK hCpAxNn0HZjXVnTT/KRWKosVshTH1DK9FW74qHzbfqrpr99HGLUihUm13v/NZdVZzWP2 dUrfKG2w7SM7oX4b8tIxrGARl41fD37Gu4Utd4eUY/I3XXR/PhAip+f3a01Nukjx41nf WxQYl2kGe4I7wOkG+D/HAKdUSWLxqGeiWNhW3Me9EPbjnYyegI7D2rseBQlGWf/qZtrJ gI3g== 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=xAnXlcMZ0Dgg9e4JpPDboNu96nEf6dJznAdVdBj0nIE=; b=DUXIIhtj8w1Bf5OYUNBCCW027GCZ1WnkMRZ7D87bdiKq/s2uRJ1L4rKVUEIUQcg3os G8b29eWrpU5WjBZxmgZA7g4Z0SkbaIM1EtcE6+3IsfFbvIWP9wHjbQxMTkNvboQs3B8b DAGDqMGGmAyPdaXA/Uv66edaFq7o+TnMqYGtplBsxLEKwiZmj+tYL0Yb+NJcMzLnE2EF 7cyQImS7Qlg16b/9UqiyGk4RDUD+pArmj5IaoLhktw13GsPFAJto65V8beylL0Y1yBl4 rT3ydgnrnjnZtG/LbcNHwO5WWS3jnFbrm0KTTjl2/YTlNkYwre++VmBV6t19ccosgR5V uwSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FsXWAcV4; 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 w204si1129167wmw.190.2017.08.23.03.34.33; Wed, 23 Aug 2017 03:34:33 -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=FsXWAcV4; 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 D7C85689DD8; Wed, 23 Aug 2017 13:34:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f50.google.com (mail-pg0-f50.google.com [74.125.83.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD000689DCD for ; Wed, 23 Aug 2017 13:34:17 +0300 (EEST) Received: by mail-pg0-f50.google.com with SMTP id s14so5758215pgs.1 for ; Wed, 23 Aug 2017 03:34:25 -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=zk0tClvpe5rBEke6bl6lOMjycCJd5EPFTWU8vttYnEQ=; b=FsXWAcV4H70N1+NHF+RpgBvh4qbgj4R6JXT6SVMUDKez3yWPXaubM0kPilnCEkpofN tWaf4lGzcaCSXy9CKLOIO9M3hrFuSyZLdn5rB6eixy6UzCk2ISaQnumh8L5v6taRA6Gt Ky5TsVNcnluiQFHGatxE3v2dcpYoiaJVMMVpBCzWDfC/adAf7sGdDQ/02u3tJGTOkTvC kDImNZGPvxvJDGCDJ2RZzXAkq4H5/2thktvqiewyegis1aWKszq91PL3dEC79PyTMr4z lBkR4tWwihMMdRyjZUZjs6B0D/puDHuLBvNjiRPkAR5bkK5noocMwNqq5+JvvvRF+eVr UQ6g== 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=zk0tClvpe5rBEke6bl6lOMjycCJd5EPFTWU8vttYnEQ=; b=ruaVbwpc4aj7bwmbiNlax8W6Nltj+LE1cADJ5EtML5PW2GhbcF+jspYqMrRXXgccJb sMQ6UqjfOhyWB3uUojEFJN/R5oG44jxkspT2zWkLAfipm/HL3TTaxecjNp3PzneaYTIm TbUBHW2ndIH6Owwym47jBIPSCmFD5rEsliCjepL0QNwLIyPdTtx1/feLTFQuy92UCCe8 sWGNlucIKLEL+ihtgUBit7zEELtmRBgOMYSBtJaSKKIy9pzAQ2XpOYQubg5z9HO+xWPM L5UdLcrDbjSFEWYePTmKQlGV5pWmQhiHACik/RHyCnYFtibHqG0Wpj1kiv/ViwiYnnPM dk1w== X-Gm-Message-State: AHYfb5iWlQxuN2zy76a16wc309D0xwcxBEFWHixzPNYO2QD48+1HXUgP 3A5WsvUvFLoDUgXYlTk= X-Received: by 10.98.30.7 with SMTP id e7mr2240446pfe.329.1503484463813; Wed, 23 Aug 2017 03:34:23 -0700 (PDT) Received: from [10.67.68.67] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id 77sm2699312pfz.47.2017.08.23.03.34.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 03:34:22 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <42f0905c-8904-579a-e9ee-b5085198eb4f@gmail.com> Date: Wed, 23 Aug 2017 18:34:20 +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] [PATCH V4 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: [PATCH V4 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;