From patchwork Thu Mar 28 12:34:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Samuelson X-Patchwork-Id: 47580 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1288098pzb; Thu, 28 Mar 2024 05:38:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVs9MEWBjHjB9bjKDoEvBjaw/7getEH74+Xj8LLikyNp4RtIEKTPnaJse/FdUKNL7pTnwi+gOf+9EuvoJCguaXnvfACrZDuD/Fndg== X-Google-Smtp-Source: AGHT+IGO2URnQwnBn52QWNphhkD4ncvMumZKi4WscDZ8BZT6kDCD5WujxX+x44Uz3m0tloK4C7vD X-Received: by 2002:a50:d688:0:b0:56b:b8c8:53e4 with SMTP id r8-20020a50d688000000b0056bb8c853e4mr1679025edi.4.1711629484854; Thu, 28 Mar 2024 05:38:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711629484; cv=none; d=google.com; s=arc-20160816; b=o7baHKQZeBcHkf+1JFqsRhaNUDsp41O0ltT1EoEi9n3O5iS5y5OydCD/1yaxmNnOfS VP8tdtGIISoPS76e32QX05eYP6IVUoMEe8TAgAJU8HAQZPzG9fH0YOJhlbR0Dd5KFph1 PufCMm/GVvaQnjoy1AOjNnlcvXfwBLn0muNaMM8oYQYPmCfIYjADILHMNX1y6ltL574W ZzurEQ8xtHKXUd1xG/6F0JB+YLZOfrAE2t4VYJgnRSt3vz50NzftYpMxSoQqu3APomxr Nvx+Ugk6Yy28TidHt+4Hs1n1zS9yeceOLq/gcmYwzqU5vgKbpkLTAIgM6COyW+diGHHH 46ng== 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=T26C33r4e+ZOyD8pD8gKoOdN443VDY1QwL/MWSdvwNI=; fh=QKFI4dMj83J2pxOiuhiYCo6Z/ly20dID22f33yRIZqE=; b=twUGFbu+FTBMx9TX6ohaZQyBHEoQ5/sjUe+11e92X/KoRXTQm6yk5jLtUSmbyznrpV EiaJj5QKm+CGtJI9mU+LDFKDyWvYC7NmkjXC8MiEHhDuiCC2QluafPE1njj7ij069QCY 74W8s2QKDPXAeLQZAUGfPyL0USd+Y35ECtujFttf4ooXKUS1RkX7kAa1Cak82EkXmYQr mpE+rZS++xDJ3VBwsmCYz1yw1Vst9Nle02MM8yQU1GPpucMMNBOe6VtAP3c68Tg4WBnT z67hPMUANtfyaUjiTeN71XiS5nlu8dmDJKuiz+xL9gnODz+Dc5rdategs+9IhZ936PeC BOKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=OOVxRF2c; 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 dz8-20020a0564021d4800b0056c3f7450f1si745356edb.502.2024.03.28.05.38.04; Thu, 28 Mar 2024 05:38:04 -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=20230601 header.b=OOVxRF2c; 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 5A5E268D681; Thu, 28 Mar 2024 14:38:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 992EA68C25D for ; Thu, 28 Mar 2024 14:37:53 +0200 (EET) Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-6e50e8dcc72so405778a34.3 for ; Thu, 28 Mar 2024 05:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711629472; x=1712234272; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IdZXk6o+UccINVcrwOJ0v2WIbiaUNtJ9Ju9iL8WondE=; b=OOVxRF2cyNi1qL3k9HTEJmx3u0ZkfH+Li3o6zQqeVOGn7rVdgOqIpPx/53vbUvC5bt 90bXC8EC5Eziz3zaYppVjoCb8OVonH7jXF/OLeCaPa7BQ7N+GBbDrnojGEXdH8XRcbGa 0IQGf55VaEUNTJK0BZ+HoWgKtk0LdxQsd/xU7IzpU/AHZK2+0oar3G0A6TLKDF34ijBp trRSTnzHiZgpMasHLtoScel5atnzrAwSlPAX5QW5xIB2Hb7toNGWVIo138B56YhGFtZE Pwa7hTdVn8N91mYxqBhEzTV6KleuMI9zUHT3UDkECoKwJMNQXe8o8lMdEk3ujyl0X/44 Mrkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711629472; x=1712234272; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IdZXk6o+UccINVcrwOJ0v2WIbiaUNtJ9Ju9iL8WondE=; b=m1Rrh5rzFqAAXc/pnf9z6fb/nw0cj1SZ8WZ6fC3Y2ss+ZgpGYYRO+9I+8OPIEtKAOI zAsSkqjZk7z6Sa/3hOrIqC1Lgm5p7YLAhT1aAWmLSbao2Q7maRr9G3xqFHsb4+ZNosYD T+vwkELcl8BjbTHmIEZZdjJBTNl9+ngdgNnA+1c4NqZMJiUIBLdQmU5cBtXjiwkF947W s7WaLGQLyi80gUrGMm3RtbCbVM+LJtPixlwCiMQ6SAS4tw8eGNviacM9d18aPBgdfJZ3 DJUoceT4scySoB1x3m+Y+qFX0a4VIo1k17buqvIjnrJjWV1+kCWF1TwK/O9FWzRY8I4l amSg== X-Gm-Message-State: AOJu0Yyuu2KwQ7qDRbzQOZAvdpHCKgKgqJdYDxU7JgLB7hW3PWVZqG8/ ysaI3QGc6FV7Ve4ond7Y+TBZ31rEnNHqiGNlHeY7VKxQYaiR+zMZ3ZB3wTZz X-Received: by 2002:a9d:7852:0:b0:6e6:c0ca:1115 with SMTP id c18-20020a9d7852000000b006e6c0ca1115mr2739462otm.15.1711629471705; Thu, 28 Mar 2024 05:37:51 -0700 (PDT) Received: from localhost.localdomain (174-082-139-008.res.spectrum.com. [174.82.139.8]) by smtp.gmail.com with ESMTPSA id n6-20020a9d7406000000b006e6fec80231sm218553otk.67.2024.03.28.05.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 05:37:51 -0700 (PDT) From: Mark Samuelson To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 07:34:30 -0500 Message-ID: <20240328123711.205-1-samuelsonm@gmail.com> X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mfenc: expose more properties of the media foundation encoder 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: Mark Samuelson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XuioXxtJPNTc Thank you for the notes, here is a new patch that incorporates your suggestions. You are right, the default value of 12 for gop_size is suprising, I didn't know about it before now. --- libavcodec/mf_utils.h | 5 +++++ libavcodec/mfenc.c | 33 +++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/libavcodec/mf_utils.h b/libavcodec/mf_utils.h index aebfb9ad21..387c005f38 100644 --- a/libavcodec/mf_utils.h +++ b/libavcodec/mf_utils.h @@ -97,6 +97,11 @@ DEFINE_GUID(ff_CODECAPI_AVEncH264CABACEnable, 0xee6cad62, 0xd305, 0x4248, 0xa DEFINE_GUID(ff_CODECAPI_AVEncVideoForceKeyFrame, 0x398c1b98, 0x8353, 0x475a, 0x9e, 0xf2, 0x8f, 0x26, 0x5d, 0x26, 0x3, 0x45); DEFINE_GUID(ff_CODECAPI_AVEncMPVDefaultBPictureCount, 0x8d390aac, 0xdc5c, 0x4200, 0xb5, 0x7f, 0x81, 0x4d, 0x04, 0xba, 0xba, 0xb2); DEFINE_GUID(ff_CODECAPI_AVScenarioInfo, 0xb28a6e64,0x3ff9,0x446a,0x8a,0x4b,0x0d,0x7a,0x53,0x41,0x32,0x36); +DEFINE_GUID(ff_CODECAPI_AVEncCommonBufferSize, 0x0db96574, 0xb6a4, 0x4c8b, 0x81, 0x06, 0x37, 0x73, 0xde, 0x03, 0x10, 0xcd); +DEFINE_GUID(ff_CODECAPI_AVEncCommonMaxBitRate, 0x9651eae4, 0x39b9, 0x4ebf, 0x85, 0xef, 0xd7, 0xf4, 0x44, 0xec, 0x74, 0x65); +DEFINE_GUID(ff_CODECAPI_AVEncCommonQualityVsSpeed, 0x98332df8, 0x03cd, 0x476b, 0x89, 0xfa, 0x3f, 0x9e, 0x44, 0x2d, 0xec, 0x9f); +DEFINE_GUID(ff_CODECAPI_AVEncMPVGOPSize, 0x95f31b26, 0x95a4, 0x41aa, 0x93, 0x03, 0x24, 0x6a, 0x7f, 0xc6, 0xee, 0xf1); +DEFINE_GUID(ff_CODECAPI_AVEncVideoEncodeQP, 0x2cb5696b, 0x23fb, 0x4ce1, 0xa0, 0xf9, 0xef, 0x5b, 0x90, 0xfd, 0x55, 0xca); DEFINE_GUID(ff_MF_SA_D3D11_BINDFLAGS, 0xeacf97ad, 0x065c, 0x4408, 0xbe, 0xe3, 0xfd, 0xcb, 0xfd, 0x12, 0x8b, 0xe2); DEFINE_GUID(ff_MF_SA_D3D11_USAGE, 0xe85fe442, 0x2ca3, 0x486e, 0xa9, 0xc7, 0x10, 0x9d, 0xda, 0x60, 0x98, 0x80); diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index 9225692c51..cad531bd7d 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -695,6 +695,21 @@ FF_ENABLE_DEPRECATION_WARNINGS if (c->opt_enc_quality >= 0) ICodecAPI_SetValue(c->codec_api, &ff_CODECAPI_AVEncCommonQuality, FF_VAL_VT_UI4(c->opt_enc_quality)); + if (avctx->rc_max_rate > 0) + ICodecAPI_SetValue(c->codec_api, &ff_CODECAPI_AVEncCommonMaxBitRate, FF_VAL_VT_UI4(avctx->rc_max_rate)); + + if (avctx->gop_size > 0) + ICodecAPI_SetValue(c->codec_api, &ff_CODECAPI_AVEncMPVGOPSize, FF_VAL_VT_UI4(avctx->gop_size)); + + if(avctx->rc_buffer_size > 0) + ICodecAPI_SetValue(c->codec_api, &ff_CODECAPI_AVEncCommonBufferSize, FF_VAL_VT_UI4(avctx->rc_buffer_size)); + + if(avctx->compression_level >= 0) + ICodecAPI_SetValue(c->codec_api, &ff_CODECAPI_AVEncCommonQualityVsSpeed, FF_VAL_VT_UI4(avctx->compression_level)); + + if(avctx->global_quality > 0) + ICodecAPI_SetValue(c->codec_api, &ff_CODECAPI_AVEncVideoEncodeQP, FF_VAL_VT_UI4(avctx->global_quality )); + // Always set the number of b-frames. Qualcomm's HEVC encoder on SD835 // defaults this to 1, and that setting is buggy with many of the // rate control modes. (0 or 2 b-frames works fine with most rate @@ -1223,7 +1238,7 @@ static int mf_init(AVCodecContext *avctx) #define OFFSET(x) offsetof(MFContext, x) -#define MF_ENCODER(MEDIATYPE, NAME, ID, OPTS, FMTS, CAPS) \ +#define MF_ENCODER(MEDIATYPE, NAME, ID, OPTS, FMTS, CAPS, DEFAULTS) \ static const AVClass ff_ ## NAME ## _mf_encoder_class = { \ .class_name = #NAME "_mf", \ .item_name = av_default_item_name, \ @@ -1243,6 +1258,7 @@ static int mf_init(AVCodecContext *avctx) FMTS \ CAPS \ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ + .defaults = DEFAULTS, \ }; #define AFMTS \ @@ -1252,9 +1268,9 @@ static int mf_init(AVCodecContext *avctx) .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID | \ AV_CODEC_CAP_DR1 | AV_CODEC_CAP_VARIABLE_FRAME_SIZE, -MF_ENCODER(AUDIO, aac, AAC, NULL, AFMTS, ACAPS); -MF_ENCODER(AUDIO, ac3, AC3, NULL, AFMTS, ACAPS); -MF_ENCODER(AUDIO, mp3, MP3, NULL, AFMTS, ACAPS); +MF_ENCODER(AUDIO, aac, AAC, NULL, AFMTS, ACAPS, NULL); +MF_ENCODER(AUDIO, ac3, AC3, NULL, AFMTS, ACAPS, NULL); +MF_ENCODER(AUDIO, mp3, MP3, NULL, AFMTS, ACAPS, NULL); #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption venc_opts[] = { @@ -1283,6 +1299,11 @@ static const AVOption venc_opts[] = { {NULL} }; +static const FFCodecDefault defaults[] = { + { "g", "0" }, + { NULL }, +}; + #define VFMTS \ .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, \ AV_PIX_FMT_YUV420P, \ @@ -1291,5 +1312,5 @@ static const AVOption venc_opts[] = { .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID | \ AV_CODEC_CAP_DR1, -MF_ENCODER(VIDEO, h264, H264, venc_opts, VFMTS, VCAPS); -MF_ENCODER(VIDEO, hevc, HEVC, venc_opts, VFMTS, VCAPS); +MF_ENCODER(VIDEO, h264, H264, venc_opts, VFMTS, VCAPS, defaults); +MF_ENCODER(VIDEO, hevc, HEVC, venc_opts, VFMTS, VCAPS, defaults);