From patchwork Wed Jan 12 22:49:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Fabian 'Xaymar' Dirks X-Patchwork-Id: 33283 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5047317iog; Wed, 12 Jan 2022 14:50:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJypEWzWIpQKDc8oVPlxSMLmwy12aMW0tWUHzWSZqHNQBM7dPSyEvbZ8ezRlN2jOFxMhL8FO X-Received: by 2002:a05:6402:4249:: with SMTP id g9mr1586354edb.321.1642027824723; Wed, 12 Jan 2022 14:50:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642027824; cv=none; d=google.com; s=arc-20160816; b=nuIYiMxH8UTy7LtNW+7oG1r3kCjfbPMjRepX+UredJ17YQSvD6yfjT0ZCBZC5Md++C xUBOuFBqTqoggbSeODlUnGYjBZWYcXT5I0rIXjP5EfO3kD7EtdebYKPuWrz421rOaSd1 ENiwDclZRkQH/X/pMefsEG1jAftkh3ZHLp1+0woiDS7mABYv+JSTMtb3qrwiYEYVIhl9 1V9aFCO5AU1iLW8pyL69QlyAdFWKHQQ3YX9v4m2UGP75dly9GJvtimfT15KTbHPn8+Fr hD/xlIpLdJ7mdMzeoMP4CdvEG2y7HqD7y0lRhn+8H48LwetV3OJzWw8SBI23RSl6KQz3 +KwA== 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:dkim-signature:delivered-to; bh=h/vsjq/GxiJMISY9YbOMIbxRL96u8I00kgmH/sf6xbg=; b=c3yQMNq/yUVhdfxI5ewaUrljubZJ0rR9WR758EqzOXBn56zEBXFW/Q9VfYBGUhhDeA qz4qLqDUYtjW4f6TgB7FUl0zZoJFzMWLi495FW9Km8o+7SxrG4x72Z1mBrgSf17EUSmf B4a16kz//WMupt5wN1ZQkt602ovu/ewHHklQSTNfbc9QvSVEIS+q9NfFOTAbhcY0abMX hPArlTKoMyfSo4j1pE8ceu7owvP1bviVvuKdk7kcnD2fJUKG+2R55eAJ8bb0nlonjhSK 1NG7WxlO9Cm5hB9vqGdBf/Avsu7KgMyCMaQgnpWK1iCTPvCuYgdXmJFcIA03GTfsp40O l9iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xaymar.com header.s=2021 header.b=D1zSTERH; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=xaymar.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh8si563270ejc.733.2022.01.12.14.50.24; Wed, 12 Jan 2022 14:50:24 -0800 (PST) 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=@xaymar.com header.s=2021 header.b=D1zSTERH; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=xaymar.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13D8368AED0; Thu, 13 Jan 2022 00:49:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.xaymar.com (xaymar.com [95.217.118.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1394968A744 for ; Thu, 13 Jan 2022 00:49:45 +0200 (EET) Received: from localhost.localdomain (unknown [IPv6:2a02:8106:c:6a00:ccbc:cf2c:5bb9:d3cf]) by mail.xaymar.com (Postfix) with ESMTPSA id 5639961346; Wed, 12 Jan 2022 23:49:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xaymar.com; s=2021; t=1642027784; bh=jCMcoq2J8mxwWESCN67o5ifaZ8XsMjzR1Z5VPEB5KWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1zSTERHLdeJDQs2xtLHqs0IGU1JJygXyF5btYIfQlEbEsvdbn6le1CcDBA+1jDOi 6NHrydNYuWYsFQ7ORqj6e3hkwCBLa0EjT+tyufjRNJMfZGtpY1nhogCTmU6VcBU4ug 3/zpC/KJMHzdmP4zmN96y5oY1g+U81WbqsMG2nwat/C/r+NEZyBXcTBlC9GJptjR9B oQh+6fjvibXTLxBGG3+SdQ7VhG9Ku5erA+Q5FLpaJSmzo/vl/adffwtksp5MkjSFgx ibipyhlc54tAQapOBEq0pS7+vxKqgsgtNgsChtn1qv9+vTV4JpVe2iSrfe9qyvv73w wZjYQHpgrgGABD+rngKNG2G+MkEJv7+KBRlkexEMB2ABt+Xyqcc1DkR1ARAHF7YQEk L+eBOV37ISLHlmh5edy+u/ctD74GtIZsNKVmLWV2Y47YIRswdna2B8eK+Lj2rATNWW B/qpFR8M21n7xamjlUPTN7J6j35fh39/4KfN7bFMeFTPGK6KbUDXUfJ738q0z/TkIY T7Ppi10+iyBiOZ4e6Xty5MxPPtpW7wkt3CJKVuUZQg03Xx2MP9n1HjNnUnisvHkGfE KB+MCcz1oqc62Dx+NqcJl6wMN3Wl00qZkZ6sA+aqcgGdWmfQx6p7fKLIf8aaJMPRTX MgjZ2KxGPFmeDLta8paM= From: Michael Fabian 'Xaymar' Dirks To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:49:23 +0100 Message-Id: <4c5c5017d96a602ad4d6ead5bd1122d0a7b7ac33.1642027745.git.michael.dirks@xaymar.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <96117e46dbb4032a02d92c178ea4cc979203a0d3.1642027745.git.michael.dirks@xaymar.com> References: <96117e46dbb4032a02d92c178ea4cc979203a0d3.1642027745.git.michael.dirks@xaymar.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/amfenc: Add "High Motion Quality Boost" 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 Cc: Michael Fabian 'Xaymar' Dirks Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: W2HrnwraGR7Z This option was missing from amfenc, and is now available. --- libavcodec/amfenc.h | 3 +++ libavcodec/amfenc_h264.c | 2 ++ libavcodec/amfenc_hevc.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h index 951e529362..f47e6a1200 100644 --- a/libavcodec/amfenc.h +++ b/libavcodec/amfenc.h @@ -108,6 +108,9 @@ typedef struct AmfContext { int me_quarter_pel; int aud; + // Unclear options, have different behavior based on codec. + int hmqb; + // HEVC - specific options int gops_per_idr; diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index afac97a968..87a3bb6a73 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -86,6 +86,7 @@ static const AVOption options[] = { { "filler_data", "Filler Data Enable", OFFSET(filler_data), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "vbaq", "Enable VBAQ", OFFSET(enable_vbaq), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "frame_skipping", "Rate Control Based Frame Skip", OFFSET(skip_frame), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "hmqb", "High Motion Quality Boost", OFFSET(hmqb), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, /// QP Values { "qp_i", "Quantization Parameter for I-Frame", OFFSET(qp_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE }, @@ -331,6 +332,7 @@ static av_cold int amf_encode_init_h264(AVCodecContext *avctx) AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_ENFORCE_HRD, !!ctx->enforce_hrd); AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_FILLER_DATA_ENABLE, !!ctx->filler_data); AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, !!ctx->skip_frame); + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HIGH_MOTION_QUALITY_BOOST_ENABLE, !!ctx->hmqb); if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP) { AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_ENABLE_VBAQ, 0); if (ctx->enable_vbaq) diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index b7fee950f6..565be9bad9 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -74,6 +74,7 @@ static const AVOption options[] = { { "gops_per_idr", "GOPs per IDR 0-no IDR will be inserted", OFFSET(gops_per_idr), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, VE }, { "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, { "vbaq", "Enable VBAQ", OFFSET(enable_vbaq), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, + { "hmqb", "High Motion Quality Boost", OFFSET(hmqb), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "enforce_hrd", "Enforce HRD", OFFSET(enforce_hrd), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, { "filler_data", "Filler Data Enable", OFFSET(filler_data), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, { "max_au_size", "Maximum Access Unit Size for rate control (in bits)", OFFSET(max_au_size), AV_OPT_TYPE_INT,{ .i64 = 0 }, 0, INT_MAX, VE}, @@ -231,7 +232,6 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) } } - AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD, ctx->rate_control_mode); if (avctx->rc_buffer_size) { AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_VBV_BUFFER_SIZE, avctx->rc_buffer_size); @@ -253,6 +253,7 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) } else { AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_ENABLE_VBAQ, !!ctx->enable_vbaq); } + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_HIGH_MOTION_QUALITY_BOOST_ENABLE, !!ctx->hmqb); AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_MOTION_HALF_PIXEL, ctx->me_half_pel); AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_MOTION_QUARTERPIXEL, ctx->me_quarter_pel);