From patchwork Wed Aug 23 10:34:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4802 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.137.29 with SMTP id o29csp1809112jaj; Wed, 23 Aug 2017 03:35:00 -0700 (PDT) X-Received: by 10.223.184.209 with SMTP id c17mr800072wrg.326.1503484500488; Wed, 23 Aug 2017 03:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503484500; cv=none; d=google.com; s=arc-20160816; b=Rk8JgCn/eegtAJHzGpP84O9CxdH/Sg/fagiMMZfdeiEN5HyfZgB8FB22Z9lLcfjPmD vn4Hzf6rrWIy3cHV12hi20r8EAZjQufRlAA08qzlpkVGJgfOK1um7ZRXSI7qa+O1LNf0 ay1ufShQUKcdE9NW5kCPOOJ6HrmgtoUiT4TU8u9RRPCJEnr7TF/+1dkZb3Y+OT8qHbj1 u0+50uhUzp8vM4inxNaz707sZSs/DY7y2qFn64VYLpgDbBTe85wZg54yf8i2M6LY0njr v4kklQUWebkDi2dBon/ROHsqU8uvfcp6RIDEcc6reC6i7f+lQQeUbXqJKX5thV6plrzH jNCw== 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=f2crdi8w+GSnt7Botx5C583h2D71MFXP0SPV9DFZ4k4=; b=Qdjl3IP6LZV21qbJcZ/MT+WJlpyK5S7d0WAGLhhkFClo98tdokkMX8wDEAhlIEzgyT 42Fy+5vrr7jomsSn2KRlHp+1sdVA50PdjtDYMbjM4BhCmk5qQNvQJHcF+YUfwavGXsQu YbEDzU0RsIJHd1TaQU2rcBz+JXybqk2vG48K5T0iNYnoe7ZeqVz8k8nCDJr6hG8C6mW+ w9ZFfC7MJwbWZS1Y91j31PHye7RmfHv2CviUv2o7h6wTQC38uttP762i1OVorJiBBnPH XV3AzkVQ6rG8B1bZD68nXDAceW+PmQ1swHhXblU8aoEoKFJLiPN/88GmXAN0KNO8j34+ ODQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=k8hIjS1H; 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 e12si999791wrd.321.2017.08.23.03.35.00; Wed, 23 Aug 2017 03:35:00 -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=k8hIjS1H; 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 C1730689DEF; Wed, 23 Aug 2017 13:34:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02C4E689DDE for ; Wed, 23 Aug 2017 13:34:44 +0300 (EEST) Received: by mail-pf0-f180.google.com with SMTP id h75so5324025pfh.1 for ; Wed, 23 Aug 2017 03:34:52 -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=wcML9Nl2b7yjluJkIj3Ghj6wZVHvV4E6HMaDr3Bn4cI=; b=k8hIjS1HrcfR61l5FgMYAmlAbPPcmn1t1986pqNhOuWfjiNagoPCjknW/lCi5eBhNu qSoxqtPoeJo8cfJ8n0tpFcMAhESkeFKWqBV66N/uOCQYSCu07vNYXLj6ssGDiFdNJ5xR 5MyvTclBJ3hc5Sw7oYmNf5EeVfxGb5Pd4p23KecCHsV4H0sMtahaWrGPEMJT63tm5GiU Vw+IyCmlpe0hGw4FqmTreqmalzVlc7dqiWHX7GXso5RpA3gaYywCF7xrnXN0w5FaB5ai 4jbYra3s31aiTe/NbBljxuMP2CD+f9D732RfxXTWwgFEN4g7RmjhWM3UWXCwDgQkUlbf Ewbg== 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=wcML9Nl2b7yjluJkIj3Ghj6wZVHvV4E6HMaDr3Bn4cI=; b=g/5f66r63I3tzD89zi0B6w3YOF2vZh+/J8FL/Z+we/S1WdKfk3Z1FFKfPB/BteuMw2 Bq69aTqUy2FZhn9SkTl1RW8x1XRRTfpkoko09sdnbpFwJUfMJAPjh1PUDbFdeWG1jc/q ecIfTQB+4GQ75/qfYAKjSV1llSN2zDmTeFE1SfW/63dSz6vIQJDntZGLf+/96m1nzm+o BxzLwuufeDfdfojRfK0bRGGker0zxsjyfeSgMVgURsBhZuD80Aqs+XwxbZLPVImqus0B OjGi8TAh8zXG5isrH3IotaWfBneobWOwE9FDqRc6Smprzmn67yp9muGH2//PxBVONhM8 mB1Q== X-Gm-Message-State: AHYfb5iucdZGVGi/H2wBCZSbs70sv3lFKCK/V5gMtxBpAjexKK4DN9Qe Fo7rzVI6ApI5Lg== X-Received: by 10.98.201.157 with SMTP id l29mr2234521pfk.235.1503484491399; Wed, 23 Aug 2017 03:34:51 -0700 (PDT) Received: from [10.67.68.67] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id g10sm2581266pfj.7.2017.08.23.03.34.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 03:34:50 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: Date: Wed, 23 Aug 2017 18:34:47 +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 4/4] lavc/vaapi_encode_h265: respect "slices" option in h265 vaapi encoder 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 dae9051c0828f7c86417308d06f1deb0640534bc Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 23:07:34 -0400 Subject: [PATCH V4 4/4] lavc/vaapi_encode_h265: respect "slices" option in h265 vaapi encoder Enable multi-slice support in AVC/H.265 vaapi encoder. Signed-off-by: Wang, Yi A Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode_h265.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index cf6b9388d1..e27b554a98 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -176,6 +176,8 @@ typedef struct VAAPIEncodeH265Context { unsigned int ctu_width; unsigned int ctu_height; + int last_ctu_index; + int fixed_qp_idr; int fixed_qp_p; int fixed_qp_b; @@ -962,6 +964,7 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, VAEncPictureParameterBufferHEVC *vpic = pic->codec_picture_params; VAAPIEncodeH265Context *priv = ctx->priv_data; int i; + int slices; if (pic->type == PICTURE_TYPE_IDR) { av_assert0(pic->display_order == pic->encode_order); @@ -1024,7 +1027,19 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, av_assert0(0 && "invalid picture type"); } - pic->nb_slices = 1; + slices = 1; + if (ctx->max_slices) { + if (avctx->slices <= ctx->max_slices) { + slices = avctx->slices; + } else { + slices = avctx->slices; + av_log(avctx, AV_LOG_WARNING, "The max slices number per frame " + "cannot more than %d.\n", slices); + } + } + pic->nb_slices = slices; + + priv->last_ctu_index = 0; return 0; } @@ -1047,9 +1062,10 @@ static int vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, pslice = slice->priv_data; mslice = &pslice->misc_slice_params; - // Currently we only support one slice per frame. - vslice->slice_segment_address = 0; - vslice->num_ctu_in_slice = priv->ctu_width * priv->ctu_height; + vslice->slice_segment_address = priv->last_ctu_index; + vslice->num_ctu_in_slice = + ((slice->index + 1) * priv->ctu_width * priv->ctu_height) / pic->nb_slices - priv->last_ctu_index; + priv->last_ctu_index += vslice->num_ctu_in_slice; switch (pic->type) { case PICTURE_TYPE_IDR: @@ -1103,9 +1119,13 @@ static int vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, else vslice->slice_qp_delta = priv->fixed_qp_idr - vpic->pic_init_qp; - vslice->slice_fields.bits.last_slice_of_pic_flag = 1; + if (priv->last_ctu_index == priv->ctu_width * priv->ctu_height) + vslice->slice_fields.bits.last_slice_of_pic_flag = 1; - mslice->first_slice_segment_in_pic_flag = 1; + if (vslice->slice_segment_address == 0) + mslice->first_slice_segment_in_pic_flag = 1; + else + mslice->first_slice_segment_in_pic_flag = 0; if (pic->type == PICTURE_TYPE_IDR) { // No reference pictures. @@ -1198,6 +1218,10 @@ static av_cold int vaapi_encode_h265_configure(AVCodecContext *avctx) av_assert0(0 && "Invalid RC mode."); } + if (!ctx->max_slices && avctx->slices > 0) + av_log(avctx, AV_LOG_WARNING, "The encode slice option is not " + "supported with the driver.\n"); + return 0; }