wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Jacek Caban : qcap: Added AVICompressorIn_Receive implementation.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 93722745337761992ca7a5bbf5a4b59aa5e5d826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93722745337761992ca7a5bbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 15:29:01 2014 +0100 qcap: Added AVICompressorIn_Receive implementation. --- dlls/qcap/avico.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 4720ae3..2e44282 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -489,8 +489,87 @@ static const BasePinFuncTable AVICompressorInputBasePinVtbl = { static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *pSample) { AVICompressor *This = impl_from_BasePin(&base->pin); - FIXME("(%p)->(%p)\n", This, pSample); - return E_NOTIMPL; + VIDEOINFOHEADER *src_videoinfo; + REFERENCE_TIME start, stop; + IMediaSample *out_sample; + AM_MEDIA_TYPE *mt; + IMediaSample2 *sample2; + DWORD comp_flags = 0; + BOOL is_preroll; + BOOL sync_point; + BYTE *ptr, *buf; + DWORD res; + HRESULT hres; + + TRACE("(%p)->(%p)\n", base, pSample); + + if(!This->hic) { + FIXME("Driver not loaded\n"); + return E_UNEXPECTED; + } + + hres = IMediaSample_QueryInterface(pSample, &IID_IMediaSample2, (void**)&sample2); + if(SUCCEEDED(hres)) { + FIXME("Use IMediaSample2\n"); + IMediaSample2_Release(sample2); + } + + is_preroll = IMediaSample_IsPreroll(pSample) == S_OK; + sync_point = IMediaSample_IsSyncPoint(pSample) == S_OK; + + hres = IMediaSample_GetTime(pSample, &start, &stop); + if(FAILED(hres)) { + WARN("GetTime failed: %08x\n", hres); + return hres; + } + + hres = IMediaSample_GetMediaType(pSample, &mt); + if(FAILED(hres)) + return hres; + + hres = IMediaSample_GetPointer(pSample, &ptr); + if(FAILED(hres)) { + WARN("GetPointer failed: %08x\n", hres); + return hres; + } + + hres = BaseOutputPinImpl_GetDeliveryBuffer(This->out, &out_sample, &start, &stop, 0); + if(FAILED(hres)) + return hres; + + hres = IMediaSample_GetPointer(out_sample, &buf); + if(FAILED(hres)) + return hres; + + if((This->driver_flags & VIDCF_TEMPORAL) && !(This->driver_flags & VIDCF_FASTTEMPORALC)) + FIXME("Unsupported temporal compression\n"); + + src_videoinfo = (VIDEOINFOHEADER*)This->in->pin.mtCurrent.pbFormat; + res = ICCompress(This->hic, sync_point ? ICCOMPRESS_KEYFRAME : 0, &This->videoinfo->bmiHeader, buf, + &src_videoinfo->bmiHeader, ptr, 0, &comp_flags, This->frame_cnt, 0, 0, NULL, NULL); + if(res != ICERR_OK) { + WARN("ICCompress failed: %d\n", res); + IMediaSample_Release(out_sample); + return E_FAIL; + } + + IMediaSample_SetActualDataLength(out_sample, This->videoinfo->bmiHeader.biSizeImage); + IMediaSample_SetPreroll(out_sample, is_preroll); + IMediaSample_SetSyncPoint(out_sample, (comp_flags&AVIIF_KEYFRAME) != 0); + IMediaSample_SetDiscontinuity(out_sample, (IMediaSample_IsDiscontinuity(pSample) == S_OK)); + + if (IMediaSample_GetMediaTime(pSample, &start, &stop) == S_OK) + IMediaSample_SetMediaTime(out_sample, &start, &stop); + else + IMediaSample_SetMediaTime(out_sample, NULL, NULL); + + hres = BaseOutputPinImpl_Deliver(This->out, out_sample); + if(FAILED(hres)) + WARN("Deliver failed: %08x\n", hres); + + IMediaSample_Release(out_sample); + This->frame_cnt++; + return hres; } static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = {

1 0

Jacek Caban : msrle32: Properly set compression output flags.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: d190b0c61efa31a10f1cffe1e1b4933520d32c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d190b0c61efa31a10f1cffe1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:17:11 2014 +0100 msrle32: Properly set compression output flags. --- dlls/msrle32/msrle32.c | 13 ++++++++----- dlls/msrle32/tests/msrle.c | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 50b44b2..aba94a0 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1420,6 +1420,7 @@ static LRESULT CompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) { + BOOL is_key; int i; TRACE("(%p,%p,%u)\n",pi,lpic,dwSize); @@ -1475,15 +1476,15 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) pi->nPrevFrame = lpic->lFrameNum; } + is_key = (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0; + for (i = 0; i < 3; i++) { lpic->lpbiOutput->biSizeImage = 0; if (lpic->lpbiOutput->biBitCount == 4) - MSRLE32_CompressRLE4(pi, lpic->lpbiInput, lpic->lpInput, - lpic->lpbiOutput, lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); + MSRLE32_CompressRLE4(pi, lpic->lpbiInput, lpic->lpInput, lpic->lpbiOutput, lpic->lpOutput, is_key); else - MSRLE32_CompressRLE8(pi, lpic->lpbiInput, lpic->lpInput, - lpic->lpbiOutput, lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); + MSRLE32_CompressRLE8(pi, lpic->lpbiInput, lpic->lpInput, lpic->lpbiOutput, lpic->lpOutput, is_key); if (lpic->dwFrameSize == 0 || lpic->lpbiOutput->biSizeImage < lpic->dwFrameSize) @@ -1500,7 +1501,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) if (lpic->dwFrameSize == 0 || lpic->lpbiOutput->biSizeImage < lpic->dwFrameSize) { WARN("switched to keyframe, was small enough!\n"); - *lpic->lpdwFlags |= ICCOMPRESS_KEYFRAME; + is_key = TRUE; *lpic->lpckid = MAKEAVICKID(cktypeDIBbits, StreamFromFOURCC(*lpic->lpckid)); break; @@ -1522,6 +1523,8 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) pi->nPrevFrame = lpic->lFrameNum; } + /* FIXME: What is AVIIF_TWOCC? */ + *lpic->lpdwFlags |= AVIIF_TWOCC | (is_key ? AVIIF_KEYFRAME : 0); return ICERR_OK; } diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 1b7e680..5ab0b6a 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -92,7 +92,7 @@ static void test_encode(void) res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); - todo_wine ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); HeapFree(GetProcessHeap(), 0, output_header);

1 0

Jacek Caban : msrle32: Get rid of no longer needed lDist argument in MSRLE32_CompressRLE8Line.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 331cb13b2f1dbd655c3eb2733ed5db3970e6cf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331cb13b2f1dbd655c3eb2733… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:17:00 2014 +0100 msrle32: Get rid of no longer needed lDist argument in MSRLE32_CompressRLE8Line. --- dlls/msrle32/msrle32.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index d22b412..50b44b2 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -456,8 +456,7 @@ static INT MSRLE32_CompressRLE4Line(const CodecInfo *pi, const WORD *lpP, static INT MSRLE32_CompressRLE8Line(const CodecInfo *pi, const WORD *lpP, const WORD *lpC, LPCBITMAPINFOHEADER lpbi, - const BYTE *lpIn, LONG lDist, - INT x, LPBYTE *ppOut, + const BYTE *lpIn, INT x, LPBYTE *ppOut, DWORD *lpSizeImage) { LPBYTE lpOut = *ppOut; @@ -471,13 +470,13 @@ static INT MSRLE32_CompressRLE8Line(const CodecInfo *pi, const WORD *lpP, pos = x; clr = lpC[pos++]; for (count = 1; pos < lpbi->biWidth; count++) { - if (ColorCmp(clr, lpC[pos++]) > lDist) + if (ColorCmp(clr, lpC[pos++]) > 0) break; } if (count < 2) { /* add some more pixels for absoluting if possible */ - count += countDiffRLE8(lpP, lpC - 1, lpC, pos-1, lDist, lpbi->biWidth); + count += countDiffRLE8(lpP, lpC - 1, lpC, pos-1, 0, lpbi->biWidth); assert(count > 0); @@ -719,7 +718,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, + x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } while (x < lpbiOut->biWidth); @@ -801,7 +800,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skip the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, + x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); }

1 0

Jacek Caban : msrle32: Append EOI instead of replacing EOL.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: cb767f738d636b23290220f5988e3724d619b64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb767f738d636b23290220f59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:49 2014 +0100 msrle32: Append EOI instead of replacing EOL. --- dlls/msrle32/msrle32.c | 10 ++++++---- dlls/msrle32/tests/msrle.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 645e323..d22b412 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -256,7 +256,7 @@ static LONG MSRLE32_GetMaxCompressedSize(LPCBITMAPINFOHEADER lpbi) } size = (2 + a * (2 + ((a + 2) & ~2)) + b * (2 + ((b + 2) & ~2))); - return size * lpbi->biHeight; + return size * lpbi->biHeight + 2; } /* lpP => current pos in previous frame @@ -820,14 +820,16 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, } } - /* add EOL -- will be changed to EOI */ + /* add EOL */ lpbiOut->biSizeImage += 2; *((LPWORD)lpOut) = 0; lpOut += sizeof(WORD); } - /* change EOL to EOI -- end of image */ - lpOut[-1] = 1; + /* add EOI -- end of image */ + lpbiOut->biSizeImage += 2; + *lpOut++ = 0; + *lpOut++ = 1; assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); return ICERR_OK; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 58dcc41..1b7e680 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -24,13 +24,40 @@ #include "wine/test.h" +static void test_output(const BYTE *output, int out_size, const BYTE *expect, int size) +{ + char buf[512], *ptr; + int i; + + i = out_size == size && !memcmp(output, expect, size); + ok(i, "Unexpected output\n"); + if(i) + return; + + for(i=0, ptr=buf; i<out_size; i++) + ptr += sprintf(ptr, "%x ", output[i]); + trace("Got: %s\n", buf); + for(i=0, ptr=buf; i<size; i++) + ptr += sprintf(ptr, "%x ", expect[i]); + trace("Exp: %s\n", buf); +} + static void test_encode(void) { - DWORD quality; + BITMAPINFOHEADER *output_header; + DWORD output_size, flags, quality; + BYTE buf[64]; ICINFO info; HIC hic; LRESULT res; + struct { BITMAPINFOHEADER header; RGBQUAD map[256]; } + input_header = { {sizeof(BITMAPINFOHEADER), 32, 1, 1, 8, 0, 32*8, 0, 0, 256, 256}, + {{255,0,0}, {0,255,0}, {0,0,255}, {255,255,255}}}; + + static BYTE input1[32] = {1,2,3,3,3,3,2,3,1}; + static const BYTE output1[] = {1,1,1,2,4,3,0,3,2,3,1,0,23,0,0,0,0,1}; + hic = ICOpen(FCC('V','I','D','C'), FCC('m','r','l','e'), ICMODE_COMPRESS); ok(hic != NULL, "ICOpen failed\n"); @@ -55,6 +82,20 @@ static void test_encode(void) res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + output_size = ICCompressGetFormatSize(hic, &input_header.header); + ok(output_size == 1064, "output_size = %d\n", output_size); + + output_header = HeapAlloc(GetProcessHeap(), 0, output_size); + ICCompressGetFormat(hic, &input_header.header, output_header); + + flags = 0; + res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); + ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); + test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); + todo_wine ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + + HeapFree(GetProcessHeap(), 0, output_header); + ICClose(hic); }

1 0

Jacek Caban : msrle32: Get rid of ICM_GETQUALITY and ICM_SET_QUALITY that should not be supported .
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: f9be296be40e8a948a1d3821c49a195818e1a28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9be296be40e8a948a1d3821c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:31 2014 +0100 msrle32: Get rid of ICM_GETQUALITY and ICM_SET_QUALITY that should not be supported. --- dlls/msrle32/msrle32.c | 45 +++++++---------------------------------- dlls/msrle32/msrle_private.h | 1 - dlls/msrle32/tests/msrle.c | 9 ++++++++ 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 882b5d2..645e323 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -39,7 +39,6 @@ static HINSTANCE MSRLE32_hModule = 0; #define ABS(a) ((a) < 0 ? -(a) : (a)) #define SQR(a) ((a) * (a)) -#define QUALITY_to_DIST(q) (ICQUALITY_HIGH - q) static inline WORD ColorCmp(WORD clr1, WORD clr2) { UINT a = clr1 - clr2; @@ -547,7 +546,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBYTE lpOut, BOOL isKey) { LPWORD lpC; - LONG lLine, lInLine, lDist; + LONG lLine, lInLine; LPBYTE lpOutStart = lpOut; /* pre-conditions */ @@ -556,7 +555,6 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, assert(pi->pCurFrame != NULL); lpC = pi->pCurFrame; - lDist = QUALITY_to_DIST(pi->dwQuality); lInLine = DIBWIDTHBYTES(*lpbiIn); lLine = WIDTHBYTES(lpbiOut->biWidth * 16) / 2; @@ -569,7 +567,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE4Line(pi, NULL, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE4Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); } while (x < lpbiOut->biWidth); @@ -603,7 +601,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (jumpx == -1) jumpx = x; for (count = 0, pos = x; pos < lpbiOut->biWidth; pos++, count++) { - if (ColorCmp(lpP[pos], lpC[pos]) > lDist) + if (ColorCmp(lpP[pos], lpC[pos]) > 0) break; } @@ -663,7 +661,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skipped the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE4Line(pi, lpP, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE4Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); } } while (x < lpbiOut->biWidth); @@ -701,7 +699,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBYTE lpOut, BOOL isKey) { LPWORD lpC; - LONG lDist, lInLine, lLine; + LONG lInLine, lLine; LPBYTE lpOutStart = lpOut; assert(pi != NULL && lpbiOut != NULL); @@ -709,7 +707,6 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, assert(pi->pCurFrame != NULL); lpC = pi->pCurFrame; - lDist = QUALITY_to_DIST(pi->dwQuality); lInLine = DIBWIDTHBYTES(*lpbiIn); lLine = WIDTHBYTES(lpbiOut->biWidth * 16) / 2; @@ -722,7 +719,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } while (x < lpbiOut->biWidth); @@ -757,7 +754,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (jumpx == -1) jumpx = x; for (count = 0, pos = x; pos < lpbiOut->biWidth; pos++, count++) { - if (ColorCmp(lpP[pos], lpC[pos]) > lDist) + if (ColorCmp(lpP[pos], lpC[pos]) > 0) break; } @@ -804,7 +801,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skip the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } @@ -1144,7 +1141,6 @@ static CodecInfo* Open(LPICOPEN icinfo) pi->fccHandler = icinfo->fccHandler; pi->bCompress = FALSE; - pi->dwQuality = MSRLE32_DEFAULTQUALITY; pi->nPrevFrame = -1; pi->pPrevFrame = pi->pCurFrame = NULL; @@ -1195,21 +1191,6 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) return sizeof(ICINFO); } -static LRESULT SetQuality(CodecInfo *pi, LONG lQuality) -{ - /* pre-condition */ - assert(pi != NULL); - - if (lQuality == -1) - lQuality = MSRLE32_DEFAULTQUALITY; - else if (ICQUALITY_LOW > lQuality || lQuality > ICQUALITY_HIGH) - return ICERR_BADPARAM; - - pi->dwQuality = (DWORD)lQuality; - - return ICERR_OK; -} - static LRESULT Configure(const CodecInfo *pi, HWND hWnd) { /* pre-condition */ @@ -1494,8 +1475,6 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) } for (i = 0; i < 3; i++) { - SetQuality(pi, lpic->dwQuality); - lpic->lpbiOutput->biSizeImage = 0; if (lpic->lpbiOutput->biBitCount == 4) @@ -1850,14 +1829,6 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg, return ICERR_OK; } break; - case ICM_GETQUALITY: - if ((LPVOID)lParam1 != NULL) { - *((LPDWORD)lParam1) = pi->dwQuality; - return ICERR_OK; - } - break; - case ICM_SETQUALITY: - return SetQuality(pi, *(LPLONG)lParam1); case ICM_COMPRESS_GET_FORMAT: return CompressGetFormat(pi, (LPCBITMAPINFOHEADER)lParam1, (LPBITMAPINFOHEADER)lParam2); diff --git a/dlls/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h index 1ff6cbe..d182fef 100644 --- a/dlls/msrle32/msrle_private.h +++ b/dlls/msrle32/msrle_private.h @@ -46,7 +46,6 @@ typedef struct _CodecInfo { FOURCC fccHandler; - DWORD dwQuality; BOOL bCompress; LONG nPrevFrame; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 819cb34..58dcc41 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -46,6 +46,15 @@ static void test_encode(void) ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); ok(quality == 8500, "quality = %d\n", quality); + quality = 0xdeadbeef; + res = ICSendMessage(hic, ICM_GETQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_GETQUALITY) failed: %ld\n", res); + ok(quality == 0xdeadbeef, "quality = %d\n", quality); + + quality = ICQUALITY_HIGH; + res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + ICClose(hic); }

1 0

Jacek Caban : msrle32: Use the same default quality as native.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 1ed45a7416bd377d854c62b8f62c07ae9490c42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed45a7416bd377d854c62b8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:20 2014 +0100 msrle32: Use the same default quality as native. --- dlls/msrle32/msrle_private.h | 2 +- dlls/msrle32/tests/msrle.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h index bf2aed0..1ff6cbe 100644 --- a/dlls/msrle32/msrle_private.h +++ b/dlls/msrle32/msrle_private.h @@ -34,7 +34,7 @@ #define IDS_DESCRIPTION 101 #define IDS_ABOUT 102 -#define MSRLE32_DEFAULTQUALITY (75 * ICQUALITY_HIGH) / 100 +#define MSRLE32_DEFAULTQUALITY (85 * ICQUALITY_HIGH) / 100 #define FOURCC_RLE mmioFOURCC('R','L','E',' ') #define FOURCC_RLE4 mmioFOURCC('R','L','E','4') diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 04cf64f..819cb34 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -20,11 +20,13 @@ #include <windows.h> #include <vfw.h> #include <aviriff.h> +#include <stdio.h> #include "wine/test.h" static void test_encode(void) { + DWORD quality; ICINFO info; HIC hic; LRESULT res; @@ -39,6 +41,11 @@ static void test_encode(void) todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); + quality = 0xdeadbeef; + res = ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); + ok(quality == 8500, "quality = %d\n", quality); + ICClose(hic); }

1 0

Alexandre Julliard : makefiles: Get rid of the MAKE_TEST_RULES variable.
by Alexandre Julliard 02 Jan '14

02 Jan '14

1 0

Alexandre Julliard : makefiles: Get rid of the MAKE_IMPLIB_RULES variable.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: af6db67d6fdf5fbafcd2ce38b13235b6ab193927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6db67d6fdf5fbafcd2ce38b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 2 12:09:13 2014 +0100 makefiles: Get rid of the MAKE_IMPLIB_RULES variable. --- configure | 5 ----- configure.ac | 4 ---- dlls/adsiid/Makefile.in | 2 -- dlls/dxerr8/Makefile.in | 2 -- dlls/dxerr9/Makefile.in | 2 -- dlls/dxguid/Makefile.in | 2 -- dlls/strmbase/Makefile.in | 2 -- dlls/strmiids/Makefile.in | 2 -- dlls/uuid/Makefile.in | 2 -- dlls/winecrt0/Makefile.in | 2 -- 10 files changed, 0 insertions(+), 25 deletions(-) diff --git a/configure b/configure index b065c2f..859a892 100755 --- a/configure +++ b/configure @@ -627,7 +627,6 @@ LIBOBJS PORCFLAGS LINGUAS MAKE_TEST_RULES -MAKE_IMPLIB_RULES LDAPLIBS LIBRT LIBPOLL @@ -16528,10 +16527,6 @@ ac_config_commands="$ac_config_commands include/stamp-h" $as_echo_n "creating Makefile rules..." >&6 -MAKE_IMPLIB_RULES="" - - - MAKE_TEST_RULES=" RUNTESTFLAGS = -q -P wine " diff --git a/configure.ac b/configure.ac index ff596b0..fd72bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -2591,10 +2591,6 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */ AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD -dnl Import library rules - -AC_SUBST(MAKE_IMPLIB_RULES,"") - dnl Test rules AC_SUBST(MAKE_TEST_RULES," diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index a5b27d5..d741ea5 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -2,5 +2,3 @@ MODULE = libadsiid.a C_SRCS = \ adsiid.c - -@MAKE_IMPLIB_RULES@ diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index aa46a26..c056b1c 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -2,5 +2,3 @@ MODULE = libdxerr8.a C_SRCS = \ dxerr8.c - -@MAKE_IMPLIB_RULES@ diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index 57edb14..04fac1f 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -2,5 +2,3 @@ MODULE = libdxerr9.a C_SRCS = \ dxerr9.c - -@MAKE_IMPLIB_RULES@ diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index a47a51f..551bff9 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -5,5 +5,3 @@ C_SRCS = \ dx8guid.c \ dx9guid.c \ dxguid.c - -@MAKE_IMPLIB_RULES@ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 3ac7c56..a51691b 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -16,5 +16,3 @@ C_SRCS = \ transform.c \ video.c \ window.c - -@MAKE_IMPLIB_RULES@ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 744682e..baf7019 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -2,5 +2,3 @@ MODULE = libstrmiids.a C_SRCS = \ strmiids.c - -@MAKE_IMPLIB_RULES@ diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index bc35e69..6cabbc5 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -2,5 +2,3 @@ MODULE = libuuid.a C_SRCS = \ uuid.c - -@MAKE_IMPLIB_RULES@ diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 23dca02..6b7c3e8 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -14,5 +14,3 @@ C_SRCS = \ init.c \ register.c \ stub.c - -@MAKE_IMPLIB_RULES@

1 0

Alexandre Julliard : makefiles: Get rid of the MAKE_PROG_RULES variable.
by Alexandre Julliard 02 Jan '14

02 Jan '14

1 0

Alexandre Julliard : makefiles: Get rid of the MAKE_DLL_RULES variable.
by Alexandre Julliard 02 Jan '14

02 Jan '14

1 0

← Newer
1
...
75
76
77
78
79
80
81
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014