From patchwork Tue Nov 1 17:57:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nyanmisaka X-Patchwork-Id: 39100 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp317102pzb; Tue, 1 Nov 2022 10:58:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7rs/zvXw0l0oo3RNMb4bdotcWOkeIE6g1Esw/JOtXJsu81FvIMKC9OCAkmheeNY3Yu2AWy X-Received: by 2002:a17:907:1ca2:b0:7ad:e51b:3c7a with SMTP id nb34-20020a1709071ca200b007ade51b3c7amr7492166ejc.665.1667325499833; Tue, 01 Nov 2022 10:58:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667325499; cv=none; d=google.com; s=arc-20160816; b=pg6X3ZmZq9k7iVxaMxwNpujfoQJTg//lyRI/aRWYMf/xTVyiDCrwS2HttFvUb3F+Zq tsCNmG92dc9mVEmKtdeDfSUpRpsecvRE0ddI0FtJ6hW68w57LGYkFnitEZnssQSr5tSR DsFM6IZe4Qu46WBg+8pC6FfL53w6TFXPpl5ryLT49A389jQ2k7MlcCDHeKGy/Y2AYbFb gzVUcxx5LKqJH+4CiO+fxj97PXJw44OBITkF6vFZ/YJQEDjMtSLA+1DBoegW7ruxAJca K00Hn2x9dz5rnTEMdX2NnWX3X1t5QnKR4wla14m8d2H/g3Sr3k4drJD9vVuwxdEIjK5p fGjg== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=KN3MTZKa4ELKqeqbd0EcXrwR2Vfdx18argMgtDLMwlg=; b=TM/sd/I4hct/pI2/KaLP/XynwCK+j2Wv0SEeNaXSBifxoYYmmUKkPopj3jcR4Ik49J lP365loiYG8fFxG06FstrYVEBaLSrxiVyl19WUZhc6zV+obDJ73HPg++Tm7Dc0z//fUG rqtsa8o8NzQ2yC4hFHgcsO9tp2D2EUdIbSXwnjvxtMSD6P9WiAr4j9pVPjO/uq8+4Wki NLvftWxIgnAxvx6TuGNyIF1Rvnuu1uY6eygze39C9vhJISetR2s+E7mpTAK6Xifo3Q39 X2fLzBs7Q7QwA0h8k73HywoEzaqpgU261hdQRpollnu/AulEtzMj46znHj78UW3z9Ser iAeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aD8bWvIm; 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=QUARANTINE 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 m24-20020a50ef18000000b00461acb2deebsi10647323eds.198.2022.11.01.10.58.19; Tue, 01 Nov 2022 10:58:19 -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=20210112 header.b=aD8bWvIm; 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=QUARANTINE 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 1C5C468B5B0; Tue, 1 Nov 2022 19:58:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EFBE68BDF5 for ; Tue, 1 Nov 2022 19:58:09 +0200 (EET) Received: by mail-pj1-f41.google.com with SMTP id l22-20020a17090a3f1600b00212fbbcfb78so19531794pjc.3 for ; Tue, 01 Nov 2022 10:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=oC3N0+ofEprU0qe0YQzZwrNRZcTFKEIUIw442g8Zw/8=; b=aD8bWvImbZxtue0eB2kGt0a2V7skvdRDy/Z8bLtuBFVmDrrwRK2Mwb+8ebd7D3DCun EJvKjto8J+31btqdpALqct+DbErA01PNjkSzapXoU/+8SNFnUUs22XR5qco9qQLy90bR Ry9rBhQc++LKUZI20xwBbVyZyNnaJXb0xRkdsgWVZLHrqM+zIwI9P5RFZZRgEsb0MvLH dhh87CQGZ8NPchFHcxIcYZOZkTjGuzMUm+rZO7B8rQHz2bECELS8EMWiF+NnC7LfqrPJ 3v1Rvvez/eFAfDYRE8pQNKZwDkA4ZtXuAdrwC9MbB1s9j4UW0SUlb3V8FyUDZpt+m8T4 JIYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oC3N0+ofEprU0qe0YQzZwrNRZcTFKEIUIw442g8Zw/8=; b=LyNXcaNmMG/4bTxc/EBJBOvqN31oLDNnkWnCXLmuBxuLKH9XvFTnaoCC6wqHvjr3yw nae76NvE8AxBgx6uO4FKMqTJRwrLcBIVQkwnbAS7sdYRqFln7Y/ZYgrel0fWYO9eK3cv 6juMT6SasT2itzWPTzpYPRoY3molA3N57GtXMTGDwLeRRWIPc5PSyK8y7DOGSJRfgBMp JKtT6xbM3Ng/nDcvYEG7M+T1ej5A/sDhoMmGgEaGasTEfM0VS2YzttdlieU7jUDaqi5T nM3abhQvCYNSKpLHAKleDiJqMKINu8iaJ2XyJGNCirkFNrCnui4zIl3tZIPbPqIxiw3V mD4A== X-Gm-Message-State: ACrzQf2Z6NpygbHP56tS6IGWF3ozJZ3Vg880PGrL6ASGdNpSX/aIxf+b CG98j1jxyncL+5DR+xuHbf6ii5+nXqzCPuxq X-Received: by 2002:a17:902:c948:b0:187:2d90:9fab with SMTP id i8-20020a170902c94800b001872d909fabmr3938657pla.42.1667325486718; Tue, 01 Nov 2022 10:58:06 -0700 (PDT) Received: from sitan-pc.localdomain ([123.117.239.249]) by smtp.gmail.com with ESMTPSA id y13-20020a17090322cd00b00176d347e9a7sm6700859plg.233.2022.11.01.10.57.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 10:58:06 -0700 (PDT) From: nyanmisaka To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Nov 2022 01:57:37 +0800 Message-Id: <20221101175738.21642-1-nst799610810@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] libavcodec/qsvenc_hevc: add tier option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vyXBe4X2sciB Without this change, MSDK/VPL always defaults the HEVC tier to MAIN if the -level is specified. Also, according to the HEVC specs, only level >= 4 can support High Tier. Signed-off-by: nyanmisaka --- libavcodec/qsvenc.c | 5 ++++- libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_hevc.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 15e6936a65..5250717f0b 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -614,8 +614,11 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) return AVERROR_BUG; q->param.mfx.CodecId = ret; - if (avctx->level > 0) + if (avctx->level > 0) { q->param.mfx.CodecLevel = avctx->level; + if (avctx->codec_id == AV_CODEC_ID_HEVC && avctx->level >= MFX_LEVEL_HEVC_4) + q->param.mfx.CodecLevel |= q->tier; + } if (avctx->compression_level == FF_COMPRESSION_DEFAULT) { avctx->compression_level = q->preset; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index d77bc0aee1..d64af90235 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -180,6 +180,7 @@ typedef struct QSVEncContext { int async_depth; int idr_interval; int profile; + int tier; int preset; int avbr_accuracy; int avbr_convergence; diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 2a3f34b915..845fb93e9d 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -258,6 +258,9 @@ static const AVOption options[] = { #if QSV_VERSION_ATLEAST(1, 32) { "scc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_SCC }, INT_MIN, INT_MAX, VE, "profile" }, #endif + { "tier", "Set the encoding tier (only level >= 4 can support high tier)", OFFSET(qsv.tier), AV_OPT_TYPE_INT, { .i64 = MFX_TIER_HEVC_HIGH }, MFX_TIER_HEVC_MAIN, MFX_TIER_HEVC_HIGH, VE, "tier" }, + { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TIER_HEVC_MAIN }, INT_MIN, INT_MAX, VE, "tier" }, + { "high", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TIER_HEVC_HIGH }, INT_MIN, INT_MAX, VE, "tier" }, { "gpb", "1: GPB (generalized P/B frame); 0: regular P frame", OFFSET(qsv.gpb), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE},