gdiplus: Disable PNG encoding filters.

This speeds up the encoding process, sometimes at the cost of increased PNG file sizes. PNGs created using gdiplus on Windows 10 have filters disabled, too, according to pngcheck. The application "ZusiDisplay" encodes finished frames in PNG format and sends them through a named pipe for "Zusi 3" to use as an in-game texture, so performance matters for that use case to improve "embedded display" FPS. Signed-off-by: Florian Will <florian.will@gmail.com> Signed-off-by: Esme Povirk <esme@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: Disable PNG encoding filters.
6090276b · Florian Will · Alexandre Julliard · 513feedf · 6090276b · 6090276b
Commit 6090276b authored Jan 24, 2022 by Florian Will Committed by Alexandre Julliard Jan 25, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 2 deletions

Makefile.in dlls/gdiplus/Makefile.in +1 -1

image.c dlls/gdiplus/image.c +15 -1

No files found.
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
 MODULE    = gdiplus.dll
 IMPORTLIB = gdiplus
-IMPORTS   = uuid shlwapi ole32 user32 gdi32
+IMPORTS   = uuid shlwapi ole32 oleaut32 user32 gdi32
 DELAYIMPORTS = windowscodecs

 C_SRCS = \

--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -4544,6 +4544,7 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image)
    GpBitmap *bitmap;
    IWICBitmapFrameEncode *frameencode;
    IPropertyBag2 *encoderoptions;
+    GUID container_format;
    HRESULT hr;
    UINT width, height;
    PixelFormat gdipformat=0;
@@ -4570,7 +4571,20 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image)

    if (SUCCEEDED(hr)) /* created frame */
    {
-        hr = IWICBitmapFrameEncode_Initialize(frameencode, encoderoptions);
+        hr = IWICBitmapEncoder_GetContainerFormat(encoder, &container_format);
+        if (SUCCEEDED(hr) && IsEqualGUID(&container_format, &GUID_ContainerFormatPng))
+        {
+            /* disable PNG filters for faster encoding */
+            PROPBAG2 filter_option = { .pstrName = (LPOLESTR) L"FilterOption" };
+            VARIANT filter_value;
+            VariantInit(&filter_value);
+            V_VT(&filter_value) = VT_UI1;
+            V_UI1(&filter_value) = WICPngFilterNone;
+            hr = IPropertyBag2_Write(encoderoptions, 1, &filter_option, &filter_value);
+        }
+
+        if (SUCCEEDED(hr))
+            hr = IWICBitmapFrameEncode_Initialize(frameencode, encoderoptions);

        if (SUCCEEDED(hr))
            hr = IWICBitmapFrameEncode_SetSize(frameencode, width, height);