From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 22FFF441E0 for ; Tue, 1 Nov 2022 17:58:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D95AF68BE5F; Tue, 1 Nov 2022 19:58:19 +0200 (EET) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CBA768BE58 for ; Tue, 1 Nov 2022 19:58:14 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id c24so14266684pls.9 for ; Tue, 01 Nov 2022 10:58:14 -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=c0WEmhpyxNmFXMn4F8eyq9AB8b2vPVVFJ7OObvOb89DcoAmYzU9RbFHgzlqsUeji0p in1k6rdn2CdCt8Q3vKNXWi45wilvxd6HlsYCHyPdVOq0ItM7rB3ZR4YLy4Jopotbnfnb VoI5tHPu6AcnXgSg2ES/aVvqBKOmzY54zmrw49CE3fh3yWpEz3gUFGdQjjlpIvb/KOIs vb+bFDo4EdveUB0mG0l7n3ipQE8iePcf2ofx7yciDxlXgEQSCX0vv1d8Tt6itvpZpUwt hyazB56CTHu+1vQZ0Ozkv4YjAGq7M5meNIQdFJmp95s+Y+FtU3+UcpcMFCdAo4KGMGER TazA== 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=zDOBxple5XSlHjCojMI7Wp7mume0YjNsi/vXdisk9TgYCzhLQlVw13763nvCv8In00 KwHPnwBLhtCYzDiliv8Ja7TxLxwUP+yU1dC26EQ2Lu9JgxVSR8mVdoh+EozU2JUMdlm4 xVZaojLUWc4+welZCajwewyxWgjLbuEgTRZ+X39Uf7Vvc015qTBMsgjBiAwLJtlfM3Kh maBxvBZYYeAeM6E1zm1pUTdDvZL4JvRXtRthPsym/qjI+2OLIOrKZq3Z7m/26IdMtU/A wDGRpD4YHTSmHACYULMKsBEFxvCYsWx5lWQU/6RoaNA8vRmY2vL5YcXc3Rb1feO1AFLx QPyQ== X-Gm-Message-State: ACrzQf15tJXp/KWK3QK1SQGzIohNytUkRgvZx3utGKsssKEWpwIGQiho WwsdGyl4JqiCikyhz0JpcRHv2/KIb0gztKP+ X-Google-Smtp-Source: AMsMyM6DmaNxlhsln9K/Vlpk7qEUBBjgsCH6qQuLuo8itZXNTR7lv2qrYKk3V6iK5nO+nEDOdG0SQQ== X-Received: by 2002:a17:902:8a97:b0:178:1939:c721 with SMTP id p23-20020a1709028a9700b001781939c721mr20942085plo.108.1667325492024; Tue, 01 Nov 2022 10:58:12 -0700 (PDT) Received: from sitan-pc.localdomain ([123.117.239.249]) by smtp.gmail.com with ESMTPSA id x6-20020a626306000000b00561b3ee73f6sm7013347pfb.144.2022.11.01.10.58.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 10:58:11 -0700 (PDT) From: nyanmisaka To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Nov 2022 01:58:06 +0800 Message-Id: <20221101175807.21696-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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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}, -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".