Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_SetPixelFormat.

Alexandre Julliard julliard at winehq.org
Tue Apr 17 13:31:48 CDT 2012


Module: wine
Branch: master
Commit: 68d9ea4d833d1939bdf7b351845b2d0b9a713eda
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=68d9ea4d833d1939bdf7b351845b2d0b9a713eda

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Wed Apr 11 15:50:30 2012 -0500

windowscodecs: Implement JpegEncoder_Frame_SetPixelFormat.

---

 dlls/windowscodecs/jpegformat.c |   45 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c
index 0149043..57008fd 100644
--- a/dlls/windowscodecs/jpegformat.c
+++ b/dlls/windowscodecs/jpegformat.c
@@ -701,6 +701,21 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
     return ret;
 }
 
+typedef struct jpeg_compress_format {
+    const WICPixelFormatGUID *guid;
+    int bpp;
+    int num_components;
+    J_COLOR_SPACE color_space;
+    int swap_rgb;
+} jpeg_compress_format;
+
+static const jpeg_compress_format compress_formats[] = {
+    { &GUID_WICPixelFormat24bppBGR, 24, 3, JCS_RGB, 1 },
+    { &GUID_WICPixelFormat32bppCMYK, 32, 4, JCS_CMYK },
+    { &GUID_WICPixelFormat8bppGray, 8, 1, JCS_GRAYSCALE },
+    { 0 }
+};
+
 typedef struct JpegEncoder {
     IWICBitmapEncoder IWICBitmapEncoder_iface;
     IWICBitmapFrameEncode IWICBitmapFrameEncode_iface;
@@ -713,6 +728,7 @@ typedef struct JpegEncoder {
     int frame_initialized;
     int started_compress;
     UINT width, height;
+    const jpeg_compress_format *format;
     IStream *stream;
     CRITICAL_SECTION lock;
     BYTE dest_buffer[1024];
@@ -865,8 +881,32 @@ static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *ifa
 static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface,
     WICPixelFormatGUID *pPixelFormat)
 {
-    FIXME("(%p,%s): stub\n", iface, debugstr_guid(pPixelFormat));
-    return E_NOTIMPL;
+    JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface);
+    int i;
+    TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat));
+
+    EnterCriticalSection(&This->lock);
+
+    if (!This->frame_initialized || This->started_compress)
+    {
+        LeaveCriticalSection(&This->lock);
+        return WINCODEC_ERR_WRONGSTATE;
+    }
+
+    for (i=0; compress_formats[i].guid; i++)
+    {
+        if (memcmp(compress_formats[i].guid, pPixelFormat, sizeof(GUID)) == 0)
+            break;
+    }
+
+    if (!compress_formats[i].guid) i = 0;
+
+    This->format = &compress_formats[i];
+    memcpy(pPixelFormat, This->format->guid, sizeof(GUID));
+
+    LeaveCriticalSection(&This->lock);
+
+    return S_OK;
 }
 
 static HRESULT WINAPI JpegEncoder_Frame_SetColorContexts(IWICBitmapFrameEncode *iface,
@@ -1173,6 +1213,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
     This->frame_initialized = 0;
     This->started_compress = 0;
     This->width = This->height = 0;
+    This->format = NULL;
     This->stream = NULL;
     InitializeCriticalSection(&This->lock);
     This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock");




More information about the wine-cvs mailing list