From patchwork Sat May 21 15:25:36 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Trystan Mata <trystan.mata@tytanium.xyz>
X-Patchwork-Id: 35879
Delivered-To: ffmpegpatchwork2@gmail.com
Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1111103pzb;
        Sat, 21 May 2022 08:25:56 -0700 (PDT)
X-Google-Smtp-Source: 
 ABdhPJyJRtI2vnjCiZ446YWCRYDHiqQBfa19jH6B47Mh/URKkCw9eJPWpvS47wkR5qDbWZdACoZ/
X-Received: by 2002:a17:906:58ca:b0:6fe:c53a:68f6 with SMTP id
 e10-20020a17090658ca00b006fec53a68f6mr1226051ejs.10.1653146756112;
        Sat, 21 May 2022 08:25:56 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1653146756; cv=none;
        d=google.com; s=arc-20160816;
        b=Y9ydRp/d7C+BYQx3ucVLexa5s8jSzmf+mqMhQ1pqwiQ1MnbSEYi1xmwHCksM1YRsax
         HwD/remgKpSYcfVUtEn7RJAIsdhYpf7ObIzC5oZ5d5YUf5WEUCK/bKK4Zkj6IB7LoVQP
         tG/NU+7qxZUjqnnCrs6o1nS1+Eq76meG8aD0LBLhjmRQQgWDK7BY87IO5U6NXsJ2VYtB
         59MVZCMRkhzH8Y3Pic2hDNZbMxx6tSdQHlntNVivwCs7BPlk2dTkP5DqdtgUXAGvPZDK
         jGqQLR6Q1AhdSzuLuvkodMR/7UQz6cFFrKmDqOCKR4Xg4AuYjWv39eDE1w6JgQ/iOqVz
         wZlQ==
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=tALAD6qzzX9B+iJXhK/thtHORDXguSXn9SGFGi6Ng8k=;
        b=FuLMtCr8DVXzvT9oKuZBRcHAt/rDPA4B5AlGu7mgeunTFkxyYvMhFCrLh1Cg+rmX+r
         6gif3noUmU98j85bbMLrO5fSikzmvMion0x6XO9faV6zNJhfG18Q5S5tF9cDaHkwoNvt
         9vS88+yYcL1jx8RDl4Mc5gmQ3/Bczo1sf20H0U8PzBJNdTmmbhwn15thAHN2wk/6Pgqt
         rcdDMvCrbHv3WunWpXgB2Xm4JLRMti7AebpOec90j9GChgIwxOYbQpQAp9GCYQZGN6Ff
         zrsw70e1x4yTGBfIxwymlb9oWwDZ4T/kSFdqobL9f/pwWXyMPr6AtWJRvhPYgImOqxA6
         v/kA==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=neutral (body hash did not verify) header.i=@tytanium.xyz
 header.s=mail header.b=KaIU21tF;
       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: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100])
        by mx.google.com with ESMTP id
 hv9-20020a17090760c900b006dffb6427bdsi11815755ejc.269.2022.05.21.08.25.54;
        Sat, 21 May 2022 08:25:56 -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=KaIU21tF;
       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 284AD68B460;
	Sat, 21 May 2022 18:25:50 +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 9E86F68B35A
 for <ffmpeg-devel@ffmpeg.org>; Sat, 21 May 2022 18:25:43 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tytanium.xyz;
 s=mail; t=1653146736; 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=USDVDgoLNItwLQ6z5z0Xb8ZxP9HvvVX8L2M+W4MiEII=;
 b=KaIU21tFA8B9s3Is9vHF82k3i76s3fNK+4YWN6oEuaBN2/WuNAkn2bzuWAtarEkzquDt2V
 i7KgMkSpfo3ibD2X8bd0ptiKwxFz4z7jEQPrcDvtKcUy89lGNIywagftO7qS/gJppQ5eim
 FvJQSa2rT/e11Q7FtRtKMj/IfzQjy3g=
Message-ID: <d11d8d4e-d48c-a231-cfaa-1f9cbbf82dee@tytanium.xyz>
Date: Sat, 21 May 2022 17:25:36 +0200
MIME-Version: 1.0
From: Trystan Mata <trystan.mata@tytanium.xyz>
To: ffmpeg-devel@ffmpeg.org
Content-Language: en-US
Subject: [FFmpeg-devel] [PATCH v4] 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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
X-TUID: VMR7qwZfPzSZ

Changes since the v3:
  - Library handle and function pointer are no longer in MFContext.
  - If UWP is enabled, avcodec will be linked directly against MFPlat.DLL.
  - MediaFoundation functions are now called like MFTEnumEx, like Martin
    Storsjö suggested in his review of the v3.

I forgot to mention it on earlier versions, this patch addresses
https://trac.ffmpeg.org/ticket/9788.

Maybe I again sent the patch the wrong way, sorry again if this is the case.

// Trystan

From 271ea405ba6d9e093c044ac5ec2a5651c401fa6a Mon Sep 17 00:00:00 2001
From: Trystan Mata <trystan.mata@tytanium.xyz>
Date: Sat, 21 May 2022 16:26:56 +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.

LoadLibrary is not available on UWP target.

This commit adresses https://trac.ffmpeg.org/ticket/9788

Signed-off-by: Trystan Mata <trystan.mata@tytanium.xyz>
---
 configure             |   5 +-
 libavcodec/mf_utils.c | 106 ++++++++++++++++++++++++++++++++++--------
 libavcodec/mf_utils.h |  19 ++++++--
 libavcodec/mfenc.c    |  23 ++++++++-
 4 files changed, 129 insertions(+), 24 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 <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
 #endif
 EOF
 
+# mediafoundation requires linking directly to mfplat and mfuuid if building
+# for uwp target
+enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -lstrmiids" || mediafoundation_extralibs="-lole32 -lstrmiids"
+
 enabled libdrm &&
     check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h" drmModeGetFB2
 
diff --git a/libavcodec/mf_utils.c b/libavcodec/mf_utils.c
index eeabd0ce0b..b8756cccea 100644
--- a/libavcodec/mf_utils.c
+++ b/libavcodec/mf_utils.c
@@ -24,6 +24,7 @@
 
 #include "mf_utils.h"
 #include "libavutil/pixdesc.h"
+#include "compat/w32dlfcn.h"
 
 HRESULT ff_MFGetAttributeSize(IMFAttributes *pattr, REFGUID guid,
                               UINT32 *pw, UINT32 *ph)
@@ -47,9 +48,83 @@ 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.
+// 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.
+#if !HAVE_UWP
+static HMODULE mf_library = NULL;
+
+int ff_mf_load_library(void *log)
+{
+    mf_library = win32_dlopen("mfplat.dll");
+
+    if (!mf_library) {
+        av_log(log, AV_LOG_ERROR, "DLL mfplat.dll failed to open\n");
+        return AVERROR_UNKNOWN;
+    }
+
+    return 0;
+}
+
+void ff_mf_unload_library(void)
+{
+    FreeLibrary(mf_library);
+    mf_library = NULL;
+}
+
+#define GET_MF_FUNCTION(ptr, func_name) \
+    ptr = (void *)GetProcAddress(mf_library, #func_name ""); \
+    if (!ptr) \
+        return E_FAIL;
+#else
+// In UWP (which lacks LoadLibrary), just link directly against
+// the functions - this requires building with new/complete enough
+// import libraries.
+#define GET_MF_FUNCTION(ptr, func_name) \
+    ptr = func_name; \
+    if (!ptr) \
+        return E_FAIL;
+#endif
+
+HRESULT ff_MFStartup(ULONG Version, DWORD dwFlags)
+{
+    HRESULT (WINAPI *MFStartup_ptr)(ULONG Version, DWORD dwFlags) = NULL;
+    GET_MF_FUNCTION(MFStartup_ptr, MFStartup);
+    return MFStartup_ptr(Version, dwFlags);
+}
+
+HRESULT ff_MFShutdown(void)
+{
+    HRESULT (WINAPI *MFShutdown_ptr)(void) = NULL;
+    GET_MF_FUNCTION(MFShutdown_ptr, MFShutdown);
+    return MFShutdown_ptr();
+}
+
+HRESULT ff_MFCreateSample(IMFSample **ppIMFSample)
+{
+    HRESULT (WINAPI *MFCreateSample_ptr)(IMFSample **ppIMFSample) = NULL;
+    GET_MF_FUNCTION(MFCreateSample_ptr, MFCreateSample);
+    return MFCreateSample_ptr(ppIMFSample);
+}
+
+HRESULT ff_MFCreateAlignedMemoryBuffer(DWORD cbMaxLength, DWORD cbAligment,
+                                       IMFMediaBuffer **ppBuffer)
+{
+    HRESULT (WINAPI *MFCreateAlignedMemoryBuffer_ptr)(DWORD cbMaxLength,
+                                                      DWORD cbAligment,
+                                                      IMFMediaBuffer **ppBuffer) = NULL;
+    GET_MF_FUNCTION(MFCreateAlignedMemoryBuffer_ptr, MFCreateAlignedMemoryBuffer);
+    return MFCreateAlignedMemoryBuffer_ptr(cbMaxLength, cbAligment, ppBuffer);
+}
+
+HRESULT ff_MFCreateMediaType(IMFMediaType **ppMFType)
+{
+    HRESULT (WINAPI *MFCreateMediaType_ptr)(IMFMediaType **ppMFType) = NULL;
+    GET_MF_FUNCTION(MFCreateMediaType_ptr, MFCreateMediaType);
+    return MFCreateMediaType_ptr(ppMFType);
+}
+
+// MFTEnumEx is 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,
@@ -60,18 +135,7 @@ HRESULT ff_MFTEnumEx(GUID guidCategory, UINT32 Flags,
                                     const MFT_REGISTER_TYPE_INFO *pOutputType,
                                     IMFActivate ***pppMFTActivate,
                                     UINT32 *pnumMFTActivate) = NULL;
-#if !HAVE_UWP
-    HANDLE lib = GetModuleHandleW(L"mfplat.dll");
-    if (lib)
-        MFTEnumEx_ptr = (void *)GetProcAddress(lib, "MFTEnumEx");
-#else
-    // In UWP (which lacks GetModuleHandle), just link directly against
-    // the functions - this requires building with new/complete enough
-    // import libraries.
-    MFTEnumEx_ptr = MFTEnumEx;
-#endif
-    if (!MFTEnumEx_ptr)
-        return E_FAIL;
+    GET_MF_FUNCTION(MFTEnumEx_ptr, MFTEnumEx);
     return MFTEnumEx_ptr(guidCategory,
                          Flags,
                          pInputType,
@@ -112,13 +176,13 @@ IMFSample *ff_create_memory_sample(void *fill_data, size_t size, size_t align)
     IMFSample *sample;
     IMFMediaBuffer *buffer;
 
-    hr = MFCreateSample(&sample);
+    hr = ff_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 = ff_MFCreateAlignedMemoryBuffer(size, align - 1, &buffer);
     if (FAILED(hr))
         return NULL;
 
@@ -561,7 +625,7 @@ static int init_com_mf(void *log)
         return AVERROR(ENOSYS);
     }
 
-    hr = MFStartup(MF_VERSION, MFSTARTUP_FULL);
+    hr = ff_MFStartup(MF_VERSION, MFSTARTUP_FULL);
     if (FAILED(hr)) {
         av_log(log, AV_LOG_ERROR, "could not initialize MediaFoundation\n");
         CoUninitialize();
@@ -573,7 +637,7 @@ static int init_com_mf(void *log)
 
 static void uninit_com_mf(void)
 {
-    MFShutdown();
+    ff_MFShutdown();
     CoUninitialize();
 }
 
@@ -673,6 +737,10 @@ error_uninit_mf:
 
 void ff_free_mf(IMFTransform **mft)
 {
+#if !HAVE_UWP
+    if (!mf_library)
+        return;
+#endif
     if (*mft)
         IMFTransform_Release(*mft);
     *mft = NULL;
diff --git a/libavcodec/mf_utils.h b/libavcodec/mf_utils.h
index d514723c3b..6384bc2133 100644
--- a/libavcodec/mf_utils.h
+++ b/libavcodec/mf_utils.h
@@ -50,9 +50,22 @@ 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.
+// 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.
+#if !HAVE_UWP
+int ff_mf_load_library(void *log);
+void ff_mf_unload_library(void);
+#endif
+
+HRESULT ff_MFCreateSample(IMFSample **ppIMFSample);
+HRESULT ff_MFCreateAlignedMemoryBuffer(DWORD cbMaxLength, DWORD cbAligment,
+                                       IMFMediaBuffer **ppBuffer);
+HRESULT ff_MFStartup(ULONG Version, DWORD dwFlags);
+HRESULT ff_MFShutdown(void);
+HRESULT ff_MFCreateMediaType(IMFMediaType **ppMFType);
+
+// MFTEnumEx is 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,
diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
index 280941cf2e..fbfb4534fd 100644
--- a/libavcodec/mfenc.c
+++ b/libavcodec/mfenc.c
@@ -777,7 +777,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 = ff_MFCreateMediaType(&out_type);
         if (FAILED(hr)) {
             ret = AVERROR(ENOMEM);
             goto done;
@@ -1034,7 +1034,11 @@ static int mf_create(void *log, IMFTransform **mft, const AVCodec *codec, int us
     return 0;
 }
 
+#if !HAVE_UWP
+static int mf_init_encoder(AVCodecContext *avctx)
+#else
 static int mf_init(AVCodecContext *avctx)
+#endif
 {
     MFContext *c = avctx->priv_data;
     HRESULT hr;
@@ -1134,6 +1138,10 @@ static int mf_close(AVCodecContext *avctx)
 
     ff_free_mf(&c->mft);
 
+#if !HAVE_UWP
+    ff_mf_unload_library();
+#endif
+
     av_frame_free(&c->frame);
 
     av_freep(&avctx->extradata);
@@ -1142,6 +1150,19 @@ static int mf_close(AVCodecContext *avctx)
     return 0;
 }
 
+static int mf_init(AVCodecContext *avctx)
+{
+    int ret;
+
+    if ((ret = ff_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