From patchwork Wed May 25 10:54:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trystan Mata X-Patchwork-Id: 35922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp998658pzj; Wed, 25 May 2022 03:54:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyU0xndQMXtkB5YAkg2MBopiOdo+5xghls+1BKg64OKLOIl3rTACdhpXMzOdWGCUYuB97q X-Received: by 2002:a05:6402:3322:b0:42a:d1d2:f76e with SMTP id e34-20020a056402332200b0042ad1d2f76emr34242287eda.353.1653476055675; Wed, 25 May 2022 03:54:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653476055; cv=none; d=google.com; s=arc-20160816; b=WAFaOcQFo+3ZnJm9YQASsGi+2cbW6XS/Qm13FSbp/whXrj6SOatLEPKb3erIDpGxx2 Ug0hELljb7xoOz7SHqzWiQ1S3zm2XWi5DGEolEylAm07mea5iwK85SjnCjffXd4sORrE gF3yhjOP+vBVFaGUS3p4CFmhoN1SV40hhSIPAnPdL3DraUhCkgR2uW4uhj03y85FbgTM n/25CPpRuyLhgAoX9cbkvBXorEH97VmHLjeWJ2ceeDhInawEEdQkHgKIMvJVvEy/AgU6 T1gG5iKYp/sjqFv0Sh0ovbIKyo/JazIfG0ijn1ZdaYQ6MRPUgJCk9JkZ3KT2dbtBQeME fWWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:to:from:mime-version:date:message-id :dkim-signature:delivered-to; bh=Y0gKJwoQp34GsLecFPM5PEWpxH8BS54vOyXJazWr4iA=; b=vhui5lzXDbQzCylBsLuo23NaFCb++WxUzROYWs3oDYw6FEIXog6GKDzlVDrOE+1ClL xuzOKh/O6QIy6/KPouUgiA9dwui8HpM7IN5Y5rPvFXAEQfOZhsnC45gyBBeL2ne4Qq5L G4hCuE+KI3tQGWfLLi+epszT7hTmDUW8tcu5sjQMN30gnCcp9gpwQjs251x1t8iQTSQq 9ACT9tLuSKwQaTXhMMUg/d8dkUZpnEP527LcRDjwp0y26qpVcngyc/wJQ7VMynSCD+BZ d1nMq9Nb0isG0dt3oZWKhq62hbx6vombqZE07PBETgNnK2ZS1cj9GvH66ocTo6135l/p 5+8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tytanium.xyz header.s=mail header.b=yuXi9kAM; 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=tytanium.xyz Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp22-20020a1709073e1600b006fef7d43e6bsi8373193ejc.596.2022.05.25.03.54.14; Wed, 25 May 2022 03:54:15 -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=@tytanium.xyz header.s=mail header.b=yuXi9kAM; 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=tytanium.xyz Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A012D68B504; Wed, 25 May 2022 13:54:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from tytanium.xyz (82-64-195-121.subs.proxad.net [82.64.195.121]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 960BA68B284 for ; Wed, 25 May 2022 13:54:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tytanium.xyz; s=mail; t=1653476041; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references; bh=hEU7Bo8PIa/pXNXdM45aKFL93YBRuX4YaZEWCx09e6s=; b=yuXi9kAMZhSZ+fikZFgseF3Al9OmBub2zyjiELcPuXc7G71LT0ePxhyBU3OB+hsG9WlDGi dd1sbLafgDeJTOV+S5gqvTwEvN/FWrLa+6gFrUKGSx0EHGIxYwMGm95vTaIdsk8+cHHL5V v2hua38ANqsQqwury4SOSAOUu8zy8bM= Message-ID: <09de2d36-147f-a02d-987c-6fc34cdf110a@tytanium.xyz> Date: Wed, 25 May 2022 12:54:01 +0200 MIME-Version: 1.0 From: Trystan Mata To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v6] avcodec/mfenc: Dynamically load MFPlat.DLL 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: s0BB0CjMc8ez Changes since the v5: - Library handle and function pointer are back in MFContext. - MFTEnumEx has been move to it too. - dlopen and dlclose are preferred. This will avoid multiple look up on one context. And each context will have his own library handle. Also, sorry for the e-mail earlier sent twice. // Trystan From 1f6a42a758e9bd7fca49f22ce96c39b59b059dc2 Mon Sep 17 00:00:00 2001 From: Trystan Mata Date: Wed, 25 May 2022 10:58:08 +0200 Subject: [PATCH] avcodec/mfenc: Dynamically load MediaFoundation library Allows non-UWP builds of FFmpeg with MediaFoundation to work on N editions of Windows which are without MediaFoundation by default. On UWP target, FFmpeg is link directly against MediaFoundation since LoadLibrary is not available. This commit adresses https://trac.ffmpeg.org/ticket/9788 --- configure | 5 ++- libavcodec/mf_utils.c | 59 +++++++------------------- libavcodec/mf_utils.h | 35 ++++++++++------ libavcodec/mfenc.c | 96 +++++++++++++++++++++++++++++++++++++++---- 4 files changed, 128 insertions(+), 67 deletions(-) diff --git a/configure b/configure index f115b21064..432a0d163d 100755 --- a/configure +++ b/configure @@ -3130,7 +3130,6 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" # hardware-accelerated codecs mediafoundation_deps="mftransform_h MFCreateAlignedMemoryBuffer" -mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -lstrmiids" omx_deps="libdl pthreads" omx_rpi_select="omx" qsv_deps="libmfx" @@ -6876,6 +6875,10 @@ test_cpp <MFCreateSample(&sample); if (FAILED(hr)) return NULL; align = FFMAX(align, 16); // 16 is "recommended", even if not required - hr = MFCreateAlignedMemoryBuffer(size, align - 1, &buffer); + hr = f->MFCreateAlignedMemoryBuffer(size, align - 1, &buffer); if (FAILED(hr)) return NULL; @@ -548,7 +516,7 @@ const CLSID *ff_codec_to_mf_subtype(enum AVCodecID codec) } } -static int init_com_mf(void *log) +static int init_com_mf(void *log, MFFunctions *f) { HRESULT hr; @@ -561,7 +529,7 @@ static int init_com_mf(void *log) return AVERROR(ENOSYS); } - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + hr = f->MFStartup(MF_VERSION, MFSTARTUP_FULL); if (FAILED(hr)) { av_log(log, AV_LOG_ERROR, "could not initialize MediaFoundation\n"); CoUninitialize(); @@ -571,15 +539,16 @@ static int init_com_mf(void *log) return 0; } -static void uninit_com_mf(void) +static void uninit_com_mf(MFFunctions *f) { - MFShutdown(); + f->MFShutdown(); CoUninitialize(); } // Find and create a IMFTransform with the given input/output types. When done, // you should use ff_free_mf() to destroy it, which will also uninit COM. int ff_instantiate_mf(void *log, + MFFunctions *f, GUID category, MFT_REGISTER_TYPE_INFO *in_type, MFT_REGISTER_TYPE_INFO *out_type, @@ -594,7 +563,7 @@ int ff_instantiate_mf(void *log, IMFActivate *winner = 0; UINT32 flags; - ret = init_com_mf(log); + ret = init_com_mf(log, f); if (ret < 0) return ret; @@ -606,7 +575,7 @@ int ff_instantiate_mf(void *log, flags |= MFT_ENUM_FLAG_SYNCMFT; } - hr = ff_MFTEnumEx(category, flags, in_type, out_type, &activate, + hr = f->MFTEnumEx(category, flags, in_type, out_type, &activate, &num_activate); if (FAILED(hr)) goto error_uninit_mf; @@ -667,14 +636,14 @@ int ff_instantiate_mf(void *log, return 0; error_uninit_mf: - uninit_com_mf(); + uninit_com_mf(f); return AVERROR(ENOSYS); } -void ff_free_mf(IMFTransform **mft) +void ff_free_mf(MFFunctions *f, IMFTransform **mft) { if (*mft) IMFTransform_Release(*mft); *mft = NULL; - uninit_com_mf(); + uninit_com_mf(f); } diff --git a/libavcodec/mf_utils.h b/libavcodec/mf_utils.h index d514723c3b..3b12344f3e 100644 --- a/libavcodec/mf_utils.h +++ b/libavcodec/mf_utils.h @@ -41,6 +41,25 @@ #include "avcodec.h" +// Windows N editions does not provide MediaFoundation by default. +// So to avoid DLL loading error, MediaFoundation will be dynamically loaded +// except on UWP build since LoadLibrary is not available on it. +typedef struct MFFunctions { + HRESULT (WINAPI *MFStartup) (ULONG Version, DWORD dwFlags); + HRESULT (WINAPI *MFShutdown) (void); + HRESULT (WINAPI *MFCreateAlignedMemoryBuffer) (DWORD cbMaxLength, + DWORD cbAligment, + IMFMediaBuffer **ppBuffer); + HRESULT (WINAPI *MFCreateSample) (IMFSample **ppIMFSample); + HRESULT (WINAPI *MFCreateMediaType) (IMFMediaType **ppMFType); + // MFTEnumEx is missing in Windows Vista's mfplat.dll. + HRESULT (WINAPI *MFTEnumEx)(GUID guidCategory, UINT32 Flags, + const MFT_REGISTER_TYPE_INFO *pInputType, + const MFT_REGISTER_TYPE_INFO *pOutputType, + IMFActivate ***pppMFTActivate, + UINT32 *pnumMFTActivate); +} MFFunctions; + // These functions do exist in mfapi.h, but are only available within // __cplusplus ifdefs. HRESULT ff_MFGetAttributeSize(IMFAttributes *pattr, REFGUID guid, @@ -50,15 +69,6 @@ HRESULT ff_MFSetAttributeSize(IMFAttributes *pattr, REFGUID guid, #define ff_MFSetAttributeRatio ff_MFSetAttributeSize #define ff_MFGetAttributeRatio ff_MFGetAttributeSize -// MFTEnumEx was missing from mingw-w64's mfplat import library until -// mingw-w64 v6.0.0, thus wrap it and load it using GetProcAddress. -// It's also missing in Windows Vista's mfplat.dll. -HRESULT ff_MFTEnumEx(GUID guidCategory, UINT32 Flags, - const MFT_REGISTER_TYPE_INFO *pInputType, - const MFT_REGISTER_TYPE_INFO *pOutputType, - IMFActivate ***pppMFTActivate, UINT32 *pnumMFTActivate); - - // These do exist in mingw-w64's codecapi.h, but they aren't properly defined // by the header until after mingw-w64 v7.0.0. DEFINE_GUID(ff_CODECAPI_AVDecVideoThumbnailGenerationMode, 0x2efd8eee,0x1150,0x4328,0x9c,0xf5,0x66,0xdc,0xe9,0x33,0xfc,0xf4); @@ -150,7 +160,8 @@ char *ff_hr_str_buf(char *buf, size_t size, HRESULT hr); #define FF_VAL_VT_UI4(v) FF_VARIANT_VALUE(VT_UI4, .ulVal = (v)) #define FF_VAL_VT_BOOL(v) FF_VARIANT_VALUE(VT_BOOL, .boolVal = (v)) -IMFSample *ff_create_memory_sample(void *fill_data, size_t size, size_t align); +IMFSample *ff_create_memory_sample(MFFunctions *f, void *fill_data, + size_t size, size_t align); enum AVSampleFormat ff_media_type_to_sample_fmt(IMFAttributes *type); enum AVPixelFormat ff_media_type_to_pix_fmt(IMFAttributes *type); const GUID *ff_pix_fmt_to_guid(enum AVPixelFormat pix_fmt); @@ -160,10 +171,10 @@ char *ff_guid_str_buf(char *buf, size_t buf_size, const GUID *guid); void ff_attributes_dump(void *log, IMFAttributes *attrs); void ff_media_type_dump(void *log, IMFMediaType *type); const CLSID *ff_codec_to_mf_subtype(enum AVCodecID codec); -int ff_instantiate_mf(void *log, GUID category, +int ff_instantiate_mf(void *log, MFFunctions *f, GUID category, MFT_REGISTER_TYPE_INFO *in_type, MFT_REGISTER_TYPE_INFO *out_type, int use_hw, IMFTransform **res); -void ff_free_mf(IMFTransform **mft); +void ff_free_mf(MFFunctions *f, IMFTransform **mft); #endif diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index 280941cf2e..6eaea429da 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -29,9 +29,12 @@ #include "libavutil/time.h" #include "codec_internal.h" #include "internal.h" +#include "compat/w32dlfcn.h" typedef struct MFContext { AVClass *av_class; + HMODULE library; + MFFunctions functions; AVFrame *frame; int is_video, is_audio; GUID main_subtype; @@ -292,7 +295,8 @@ static IMFSample *mf_a_avframe_to_sample(AVCodecContext *avctx, const AVFrame *f bps = av_get_bytes_per_sample(avctx->sample_fmt) * avctx->ch_layout.nb_channels; len = frame->nb_samples * bps; - sample = ff_create_memory_sample(frame->data[0], len, c->in_info.cbAlignment); + sample = ff_create_memory_sample(&c->functions, frame->data[0], len, + c->in_info.cbAlignment); if (sample) IMFSample_SetSampleDuration(sample, mf_to_mf_time(avctx, frame->nb_samples)); return sample; @@ -312,7 +316,8 @@ static IMFSample *mf_v_avframe_to_sample(AVCodecContext *avctx, const AVFrame *f if (size < 0) return NULL; - sample = ff_create_memory_sample(NULL, size, c->in_info.cbAlignment); + sample = ff_create_memory_sample(&c->functions, NULL, size, + c->in_info.cbAlignment); if (!sample) return NULL; @@ -422,7 +427,9 @@ static int mf_receive_sample(AVCodecContext *avctx, IMFSample **out_sample) } if (!c->out_stream_provides_samples) { - sample = ff_create_memory_sample(NULL, c->out_info.cbSize, c->out_info.cbAlignment); + sample = ff_create_memory_sample(&c->functions, NULL, + c->out_info.cbSize, + c->out_info.cbAlignment); if (!sample) return AVERROR(ENOMEM); } @@ -777,7 +784,7 @@ static int mf_choose_output_type(AVCodecContext *avctx) if (out_type) { av_log(avctx, AV_LOG_VERBOSE, "picking output type %d.\n", out_type_index); } else { - hr = MFCreateMediaType(&out_type); + hr = c->functions.MFCreateMediaType(&out_type); if (FAILED(hr)) { ret = AVERROR(ENOMEM); goto done; @@ -1005,7 +1012,8 @@ err: return res; } -static int mf_create(void *log, IMFTransform **mft, const AVCodec *codec, int use_hw) +static int mf_create(void *log, MFFunctions *f, IMFTransform **mft, + const AVCodec *codec, int use_hw) { int is_audio = codec->type == AVMEDIA_TYPE_AUDIO; const CLSID *subtype = ff_codec_to_mf_subtype(codec->id); @@ -1028,13 +1036,13 @@ static int mf_create(void *log, IMFTransform **mft, const AVCodec *codec, int us category = MFT_CATEGORY_VIDEO_ENCODER; } - if ((ret = ff_instantiate_mf(log, category, NULL, ®, use_hw, mft)) < 0) + if ((ret = ff_instantiate_mf(log, f, category, NULL, ®, use_hw, mft)) < 0) return ret; return 0; } -static int mf_init(AVCodecContext *avctx) +static int mf_init_encoder(AVCodecContext *avctx) { MFContext *c = avctx->priv_data; HRESULT hr; @@ -1058,7 +1066,7 @@ static int mf_init(AVCodecContext *avctx) c->main_subtype = *subtype; - if ((ret = mf_create(avctx, &c->mft, avctx->codec, use_hw)) < 0) + if ((ret = mf_create(avctx, &c->functions, &c->mft, avctx->codec, use_hw)) < 0) return ret; if ((ret = mf_unlock_async(avctx)) < 0) @@ -1122,6 +1130,56 @@ static int mf_init(AVCodecContext *avctx) return 0; } +#if !HAVE_UWP +#define LOAD_MF_FUNCTION(context, func_name) \ + context->functions.func_name = (void *)GetProcAddress(context->library, #func_name ""); \ + if (!context->functions.func_name) \ + { \ + av_log(context, AV_LOG_ERROR, "DLL mfplat.dll failed to find function "\ + #func_name "\n"); \ + return AVERROR_UNKNOWN; \ + } +#else +// In UWP (which lacks LoadLibrary), just link directly against +// the functions - this requires building with new/complete enough +// import libraries. +#define LOAD_MF_FUNCTION(context, func_name) \ + context->functions.func_name = func_name; \ + if (!context->functions.func_name) \ + { \ + av_log(context, AV_LOG_ERROR, "Failed to find function " #func_name \ + "\n"); \ + return AVERROR_UNKNOWN; \ + } +#endif + +// Windows N editions does not provide MediaFoundation by default. +// So to avoid DLL loading error, MediaFoundation is dynamically loaded except +// on UWP build since LoadLibrary is not available on it. +static int mf_load_library(AVCodecContext *avctx) +{ + MFContext *c = avctx->priv_data; + +#if !HAVE_UWP + c->library = dlopen("mfplat.dll", 0); + + if (!c->library) { + av_log(c, AV_LOG_ERROR, "DLL mfplat.dll failed to open\n"); + return AVERROR_UNKNOWN; + } +#endif + + LOAD_MF_FUNCTION(c, MFStartup); + LOAD_MF_FUNCTION(c, MFShutdown); + LOAD_MF_FUNCTION(c, MFCreateAlignedMemoryBuffer); + LOAD_MF_FUNCTION(c, MFCreateSample); + LOAD_MF_FUNCTION(c, MFCreateMediaType); + // MFTEnumEx is missing in Windows Vista's mfplat.dll. + LOAD_MF_FUNCTION(c, MFTEnumEx); + + return 0; +} + static int mf_close(AVCodecContext *avctx) { MFContext *c = avctx->priv_data; @@ -1132,7 +1190,15 @@ static int mf_close(AVCodecContext *avctx) if (c->async_events) IMFMediaEventGenerator_Release(c->async_events); - ff_free_mf(&c->mft); +#if !HAVE_UWP + if (c->library) + ff_free_mf(&c->functions, &c->mft); + + dlclose(c->library); + c->library = NULL; +#else + ff_free_mf(&c->functions, &c->mft); +#endif av_frame_free(&c->frame); @@ -1142,6 +1208,18 @@ static int mf_close(AVCodecContext *avctx) return 0; } +static int mf_init(AVCodecContext *avctx) +{ + int ret; + if ((ret = mf_load_library(avctx)) == 0) { + if ((ret = mf_init_encoder(avctx)) == 0) { + return 0; + } + } + mf_close(avctx); + return ret; +} + #define OFFSET(x) offsetof(MFContext, x) #define MF_ENCODER(MEDIATYPE, NAME, ID, OPTS, EXTRA) \ -- 2.36.1