From patchwork Fri Aug 18 02:14:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4738 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp256366vsu; Thu, 17 Aug 2017 19:14:32 -0700 (PDT) X-Received: by 10.28.193.10 with SMTP id r10mr488999wmf.157.1503022472374; Thu, 17 Aug 2017 19:14:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503022472; cv=none; d=google.com; s=arc-20160816; b=hD3JntwRaPWgr18dUbq/Zg7NeCn8NrWClVW+elN00zZsqW8kPMhaF5vEFLZ3kWlFfk jn1YsnJoBN+Bb3H5sB1pm7ZN5qJnmTSXcgzYMj4blwsY9y0+k8MMYG2pSMhxego42Pnx OyvyQ9C5yR9ngvOVzUaUdvSMSy+vUT42vu88AFSHsC8hOXlvp8J7OabSSh5NutsOOhwE ZM5zSUwxJlsgDC62hlRsyyMMiqfnJk1oOLlWGQoRsHrnEf7NW1LJmP4rZsIW1WVPs0fs WszPTW2fuVcqNPvWMIsdqKn6aVbaxvBwDrE8Sd7ujvPYd3rgwAYo1zd/shAWra3LDhAL tXZQ== 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=jw19ydYJMsS7slos7rH1Z8QpijCXcEV9nf/6M9XdqLs=; b=Tm5qHlB9rtJElKQc1TfzCtnFP3u0RaWKpitBP0/60KRK6axR0GKGbSU6xR/9dG8NuW bWcg5rpD8gKO6IfKAn9gdU01cJAkwHl0CTT+FoSkaLnrm6l+CJZOz9QVOLo/b3UrvqN8 uOob+28oshsyNJFF1y7PcsUAFVTzS17WUuy2kxe5uheYpwhKnxu7bMXhzXgpxEVTV6ee AmNgZ5W8r2lL+zY9Q024AsU9ImZSnoNokLOuADJfU0xQZA41M1aGjy3kK/XhcioXt1uy oD2oqOw1t+d+O/ajrfpmiI0+UhxT9F/oZaUfHKtUThBwzZmJ2PfkIEQ3J5sGZd4eR+e+ pfjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CKot4dPn; 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 c12si3676817wrg.543.2017.08.17.19.14.32; Thu, 17 Aug 2017 19:14:32 -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=CKot4dPn; 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 43D64689A14; Fri, 18 Aug 2017 05:14:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f41.google.com (mail-pg0-f41.google.com [74.125.83.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B335968838C for ; Fri, 18 Aug 2017 05:14:16 +0300 (EEST) Received: by mail-pg0-f41.google.com with SMTP id i12so54426820pgr.3 for ; Thu, 17 Aug 2017 19:14:22 -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=i+6grx+ZPkRpWo0cBxhnRg5mztwBy7W7lxidif68gHk=; b=CKot4dPnwcbWbGHljg2UWzP/ExodL+/Hw1xxWQ9QIlMABm30XaUwZ5s9TcKIlvc0Zv +Z+LnY69+nKXpqAHSXp2qbuE7n2pyJo4Avjh+AnJdu1IuBPe8TSQuXtuz6BJ6zdRQWNd ca6IrKkXH6esg81GuLmpQkuSEWdU16yIpGH0JH6oacfxcWZkAAR+Uwh05IxlLmer0bWA 2AiHiTmQCZpeBdhH6m6T1LBxn2dryJNdHppWDFDVB5CDH+1QNWEjkzzh8/T4kNHtR6Fd uZ9xZn7MdJfGEak3l1eZJrcQ+WELJS+PTAbml7s0hUCMaItUeQcKsyxOteZEIAlfLhhh D6vQ== 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=i+6grx+ZPkRpWo0cBxhnRg5mztwBy7W7lxidif68gHk=; b=M8Ea3lx2y817fgI08uBvwfdA/C9XqPIK2vk1kjT29QwXzhBVyqqH8ZU3pq/xJzZL3j mITowZDSOGx60QGSLlFnmKVyM1Xc1z7AJBGqkpEPoWPchFzGwj2jHb/GKXl3dq/v9ORy mMvHKPh0RdN0N2WZqt3O0OZ3QNiaNxM5Ml1Zey+6rWxkKJdRTKhjFXS9vODIXQy7y0gG a1V510RztJZ65Nn8GM0G4Trqf9she+U/c7cmBGshKy1mDk5OrhFCtqQvGWyNVwvIQlMd ze0Pn9u9Ouecn+lHjeAK7Nd2FP2Cip5QcpTHpS+vqoQe6Ph7x8fvpIrz2tyADw/jxWNI keCw== X-Gm-Message-State: AHYfb5jIzHSnK/LKd01wcUX84MPIgVHi9LoX7J1z6wvgmLLYhNWKWGxt QoBLfmbs+R7SIjmW X-Received: by 10.98.62.197 with SMTP id y66mr7117799pfj.270.1503022460983; Thu, 17 Aug 2017 19:14:20 -0700 (PDT) Received: from [10.67.68.37] (fmdmzpr02-ext.fm.intel.com. [192.55.55.37]) by smtp.gmail.com with ESMTPSA id a63sm8106585pfc.165.2017.08.17.19.14.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 19:14:20 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: Date: Fri, 18 Aug 2017 10:14:17 +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*0="0004-lavc-vaapi_encode_h265-respect-slices-option-in-h265.pa"; filename*1="tch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH V3 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 183ee30f5d9c1d4bb33ddbb0f0a8dcc952e3572e Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 23:07:34 -0400 Subject: [PATCH V3 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; }