From patchwork Sun Apr 25 01:32:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27334 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2772677iob; Sat, 24 Apr 2021 18:32:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJALLbAsvpaqU0S2rzLztFiHtIcD1MXIZrX3+G8yK0lVkeyoICz5JkkeJ53kPuXBn90x/L X-Received: by 2002:a17:906:1519:: with SMTP id b25mr11356727ejd.254.1619314348316; Sat, 24 Apr 2021 18:32:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619314348; cv=none; d=google.com; s=arc-20160816; b=QwWVdqcMU1/VqJLFkC6btHOVm2saMBnHDEroQxFjSUhJ3o2rNpqX4/NhXa9T81vkWG 1B5wYpC85i2Fm4gtwQMLHY/XG4drVVWD74RhGSQFdzncTbKozDt03e5/LIXLOUPiZ0rr hf06H10/bXzu2W9ZXoMDJMVJaxAh/BznXKJzKJC6VHn3uHFnsgnyMYjcBjq0S1ryrzSJ GxBkuv8QDu3v6MIMEbQ4JbF6EjKcy2YYgL7a/CbCHzqa21Wt5gLDRE6DqSorb24KLLY5 QXmjLHL5nOf8GzhXxVyrmqe41A1ic5DFAe2cPDiR0B+ZhxFYW/+MkqllXRmb60mQo71P egHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :ironport-sdr:ironport-sdr:delivered-to; bh=NP48iLTmjivb9y16ikqnpAtPq1QuTaTGw/666B6UHpw=; b=WaPrHKMCPWmoSpLVvAiPulXE7AwoouxAMkcJpi57ZY0r8FQatr3dOmfROGintyqVjY pyKzBm75o4GaNqOogKzigXjF1FGMimI3iQQ1i0vslpxyOkrQP9brDsxrM89e6XA9tlu0 xOa4EEPHT+YbuMm/lqRZ4RK5hH5D72iUDziaoMQuNhUBiOrU4+IaUImM53xNdwFdHuGZ T9tWt/C0K/1gcGxgK/yyasZObhXBCRq2SSJPKHzKyPx6L4s3C7mBFlyUgXPqIYjxtTC+ 49MyP4XUXd8GK5hCzc4g14be/DHQhjCsnaGksews0RWrfB7rZiT3WtIGTCUbOJiECmFk AlpQ== ARC-Authentication-Results: i=1; mx.google.com; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h22si9693153eds.540.2021.04.24.18.32.28; Sat, 24 Apr 2021 18:32: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; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3465F680279; Sun, 25 Apr 2021 04:32:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACEF4680279 for ; Sun, 25 Apr 2021 04:32:18 +0300 (EEST) IronPort-SDR: qIeirJlcOulZKsJqgyDt/1JpraYycscMY2GW2sRrJpSwQAZUlErjaE68Ye8esKqJrlu/UmZH0N LkkobWKKnRcA== X-IronPort-AV: E=McAfee;i="6200,9189,9964"; a="260158822" X-IronPort-AV: E=Sophos;i="5.82,249,1613462400"; d="scan'208";a="260158822" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2021 18:32:16 -0700 IronPort-SDR: /Ahi+IZSwIu4BjyiWEVr5P5ZnWpj7AWb1QTT08IjVc0AptJaOBjmayvfxPyX759M4WyjdY6Muf N2PYu9uSiaxA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,249,1613462400"; d="scan'208";a="428900240" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by orsmga008.jf.intel.com with ESMTP; 24 Apr 2021 18:32:15 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 09:32:11 +0800 Message-Id: <20210425013212.1815496-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/qsvenc_hevc: allow user set more coding options X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qHyz61CvJK4k The SDK supports NalHrdConformance, RecoveryPointSEI and AUDelimiter for hevc encoder, so we may allow user to set these coding options like what we did for h264_qsv encoder. '-strict xxx' to turn on / off NalHrdConformance '-recovery_point_sei xxx' to turn on / off RecoveryPointSEI '-aud xxx' to turn on / off AUDelimiter Signed-off-by: Haihao Xiang --- libavcodec/qsvenc.c | 15 ++++++++++++--- libavcodec/qsvenc_hevc.c | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 566a5c8552..aeb010e456 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -290,6 +290,10 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, "NalHrdConformance: %s; SingleSeiNalUnit: %s; VuiVclHrdParameters: %s VuiNalHrdParameters: %s\n", print_threestate(co->NalHrdConformance), print_threestate(co->SingleSeiNalUnit), print_threestate(co->VuiVclHrdParameters), print_threestate(co->VuiNalHrdParameters)); + } else if (avctx->codec_id == AV_CODEC_ID_HEVC) { + av_log(avctx, AV_LOG_VERBOSE, + "NalHrdConformance: %s; VuiNalHrdParameters: %s\n", + print_threestate(co->NalHrdConformance), print_threestate(co->VuiNalHrdParameters)); } av_log(avctx, AV_LOG_VERBOSE, "FrameRateExtD: %"PRIu32"; FrameRateExtN: %"PRIu32" \n", @@ -676,15 +680,20 @@ FF_ENABLE_DEPRECATION_WARNINGS q->extco.CAVLC = q->cavlc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; + if (q->single_sei_nal_unit >= 0) + q->extco.SingleSeiNalUnit = q->single_sei_nal_unit ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; + + q->extco.MaxDecFrameBuffering = q->max_dec_frame_buffering; + } + + if (avctx->codec_id == AV_CODEC_ID_H264 || + avctx->codec_id == AV_CODEC_ID_HEVC) { if (avctx->strict_std_compliance != FF_COMPLIANCE_NORMAL) q->extco.NalHrdConformance = avctx->strict_std_compliance > FF_COMPLIANCE_NORMAL ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; - if (q->single_sei_nal_unit >= 0) - q->extco.SingleSeiNalUnit = q->single_sei_nal_unit ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; if (q->recovery_point_sei >= 0) q->extco.RecoveryPointSEI = q->recovery_point_sei ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; - q->extco.MaxDecFrameBuffering = q->max_dec_frame_buffering; q->extco.AUDelimiter = q->aud ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; } diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 347f30655e..aa02361d1d 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -246,6 +246,8 @@ static const AVOption options[] = { { "tile_cols", "Number of columns for tiled encoding", OFFSET(qsv.tile_cols), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, UINT16_MAX, VE }, { "tile_rows", "Number of rows for tiled encoding", OFFSET(qsv.tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, UINT16_MAX, VE }, + { "recovery_point_sei", "Insert recovery point SEI messages", OFFSET(qsv.recovery_point_sei), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + { "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE}, { NULL }, }; From patchwork Sun Apr 25 01:32:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27333 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2772818iob; Sat, 24 Apr 2021 18:32:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZyBWt2YqK8nx2u+iejL911yLdV7A0LhavTRtsW24bz3hci+aZLigDe/iy/JNAhpI5iGt/ X-Received: by 2002:a05:6402:c1b:: with SMTP id co27mr13015803edb.61.1619314366634; Sat, 24 Apr 2021 18:32:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619314366; cv=none; d=google.com; s=arc-20160816; b=LnP6AMJc6c2Tmt+kkS+dQQfExb+D/RzYNBGY48WZ2TEmwvMPIF/zfNquvFW9RBtDo/ Q3deOgEUyMJ3dNIr12tMByszpXsNxvXe8oYWsskfG3eKhq7lv+O+Lb07CTeFzHcpYBti rQ0T8JbhouU5kdZKz9OmpQCO69oiPMF+obbwiMeBbcduEt1n2eWYlOrWCVhaForyM7tQ Rh843yK6KHB+PuZcNmoT51kI5wnjJJgSEvGEMN2yzaLvxwnOhgwHghY+khND5MxBfTtR Owf35A8BMh4nIEezwHcRkymdtYNMwI4/lt1HakIk0sRjuTtDWf0HVmokDna02Il2Eo+G cnOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:ironport-sdr:ironport-sdr:delivered-to; bh=LlMZ6vAmlhTf2Cx8cTsJ8E7ro+/gDWjIsrpYOiwJV/A=; b=EIX3+12U7n/L2DcqZpipcLeHUWYEggWVAjXKNIcm91hHBFlHwojQsQtGCB1rxu6Bu0 rtno6raTbCbL71uZNTTKB7XCuZwoBKnNI0kPYsFK2eec0FWsv0/937A+qe+W+1C/2bpP XBZOjLQ5iifXFZNbdMuS9+f6DspBKh3jVEfplZiOas64Acrm5PpP0OfwaBmGEQLRQUcm dpny50DO5p87xMTPknz8DEUMAFzAR0ClT5RKYfbUQmAOij7DlXDdFukAriE7EtBMuVZC eZCRsQyOoXAw5TBtwDcCgKSE6HJ+bZS/Q0nA8IuNnS7si1Lcfjg7bry/RKdJoUagwFxr Dalg== ARC-Authentication-Results: i=1; mx.google.com; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k9si11555263eje.640.2021.04.24.18.32.46; Sat, 24 Apr 2021 18:32:46 -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; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37A35680CC3; Sun, 25 Apr 2021 04:32:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E797A680106 for ; Sun, 25 Apr 2021 04:32:36 +0300 (EEST) IronPort-SDR: UAC5W3j7gKE6Jl3RyesirOi5YYPhJ90dW9fVno1tbiVncQ/xnjGc1Xvanp0tglJACImvi375cf J0yGBqYoPumQ== X-IronPort-AV: E=McAfee;i="6200,9189,9964"; a="196264276" X-IronPort-AV: E=Sophos;i="5.82,249,1613462400"; d="scan'208";a="196264276" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2021 18:32:33 -0700 IronPort-SDR: wvS5n0h2Kl0Ea9Egba0w/pKo5upOLLsaVbYXQ4GbdRKlcfeF5dH62hk2gcEb3B0qAGQmiXTQpT kGdW7Vytkt6w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,249,1613462400"; d="scan'208";a="428900306" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by orsmga008.jf.intel.com with ESMTP; 24 Apr 2021 18:32:32 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 09:32:12 +0800 Message-Id: <20210425013212.1815496-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210425013212.1815496-1-haihao.xiang@intel.com> References: <20210425013212.1815496-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavf/qsvenc: '0' is not a valid value for GopOptFlag X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: A25wyTas0bw3 The accepted values for GopOptFlag are MFX_GOP_CLOSED (1) and MFX_GOP_STRICT (2). Signed-off-by: Haihao Xiang --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index aeb010e456..684c8089eb 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -531,7 +531,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->param.mfx.GopPicSize = FFMAX(0, avctx->gop_size); q->param.mfx.GopRefDist = FFMAX(-1, avctx->max_b_frames) + 1; q->param.mfx.GopOptFlag = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? - MFX_GOP_CLOSED : 0; + MFX_GOP_CLOSED : MFX_GOP_STRICT; q->param.mfx.IdrInterval = q->idr_interval; q->param.mfx.NumSlice = avctx->slices; q->param.mfx.NumRefFrame = FFMAX(0, avctx->refs);