April 2011 - Wine-commits - list.winehq.org

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_SetPixelFormat.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 3c8edfe9dc823780157b7f8d79b2424a467fbb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8edfe9dc823780157b7f8d7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 12:09:25 2011 -0500 windowscodecs: Implement TiffFrameEncode_SetPixelFormat. --- dlls/windowscodecs/tiffformat.c | 57 +++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 65a65a5..52dcf3c 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1116,6 +1116,30 @@ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +struct tiff_encode_format { + const WICPixelFormatGUID *guid; + int photometric; + int bps; + int samples; + int bpp; + int extra_sample; + int extra_sample_type; + int reverse_bgr; +}; + +static const struct tiff_encode_format formats[] = { + {&GUID_WICPixelFormat24bppBGR, 2, 8, 3, 24, 0, 0, 1}, + {&GUID_WICPixelFormatBlackWhite, 1, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat4bppGray, 1, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppGray, 1, 8, 1, 8, 0, 0, 0}, + {&GUID_WICPixelFormat32bppBGRA, 2, 8, 4, 32, 1, 2, 1}, + {&GUID_WICPixelFormat32bppPBGRA, 2, 8, 4, 32, 1, 1, 1}, + {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, + {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, + {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {0} +}; + typedef struct TiffEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; @@ -1138,6 +1162,8 @@ typedef struct TiffFrameEncode { TiffEncoder *parent; /* fields below are protected by parent->lock */ BOOL initialized; + BOOL info_written; + const struct tiff_encode_format *format; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1232,8 +1258,33 @@ static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + int i; + + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->info_written) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + for (i=0; formats[i].guid; i++) + { + if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!formats[i].guid) i = 0; + + This->format = &formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, @@ -1460,6 +1511,8 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->ref = 1; result->parent = This; result->initialized = FALSE; + result->info_written = FALSE; + result->format = NULL; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_SetSize.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: eaf61d8361a5a05b7d03a69f17a837640c1a5316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf61d8361a5a05b7d03a69f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 12:15:42 2011 -0500 windowscodecs: Implement TiffFrameEncode_SetSize. --- dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 52dcf3c..22e9912 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1164,6 +1164,7 @@ typedef struct TiffFrameEncode { BOOL initialized; BOOL info_written; const struct tiff_encode_format *format; + UINT width, height; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1244,8 +1245,23 @@ static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->info_written) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->width = uiWidth; + This->height = uiHeight; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, @@ -1513,6 +1529,8 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->initialized = FALSE; result->info_written = FALSE; result->format = NULL; + result->width = 0; + result->height = 0; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_SetResolution.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 28fc658da81b06827381b247d84699aa0f7a2809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fc658da81b06827381b247d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 14:37:05 2011 -0500 windowscodecs: Implement TiffFrameEncode_SetResolution. --- dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 22e9912..a44e80e 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1165,6 +1165,7 @@ typedef struct TiffFrameEncode { BOOL info_written; const struct tiff_encode_format *format; UINT width, height; + double xres, yres; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1267,8 +1268,23 @@ static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->info_written) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->xres = dpiX; + This->yres = dpiY; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, @@ -1531,6 +1547,8 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->format = NULL; result->width = 0; result->height = 0; + result->xres = 0.0; + result->yres = 0.0; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_WritePixels.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 518f4fd6de5578fe09f976d64ab29e070f8e659f URL: http://source.winehq.org/git/wine.git/?a=commit;h=518f4fd6de5578fe09f976d64… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 15:55:16 2011 -0500 windowscodecs: Implement TiffFrameEncode_WritePixels. --- dlls/windowscodecs/tiffformat.c | 95 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a44e80e..0968a42 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -64,7 +64,9 @@ MAKE_FUNCPTR(TIFFReadDirectory); MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); +MAKE_FUNCPTR(TIFFSetField); MAKE_FUNCPTR(TIFFWriteDirectory); +MAKE_FUNCPTR(TIFFWriteScanline); #undef MAKE_FUNCPTR static void *load_libtiff(void) @@ -93,7 +95,9 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFReadEncodedStrip); LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); + LOAD_FUNCPTR(TIFFSetField); LOAD_FUNCPTR(TIFFWriteDirectory); + LOAD_FUNCPTR(TIFFWriteScanline); #undef LOAD_FUNCPTR } @@ -1166,6 +1170,7 @@ typedef struct TiffFrameEncode { const struct tiff_encode_format *format; UINT width, height; double xres, yres; + UINT lines_written; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1343,8 +1348,93 @@ static HRESULT WINAPI TiffFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + BYTE *row_data, *swapped_data = NULL; + UINT i, j, line_size; + + TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || !This->width || !This->height || !This->format) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + if (lineCount == 0 || lineCount + This->lines_written > This->height) + { + LeaveCriticalSection(&This->parent->lock); + return E_INVALIDARG; + } + + line_size = ((This->width * This->format->bpp)+7)/8; + + if (This->format->reverse_bgr) + { + swapped_data = HeapAlloc(GetProcessHeap(), 0, line_size); + if (!swapped_data) + { + LeaveCriticalSection(&This->parent->lock); + return E_OUTOFMEMORY; + } + } + + if (!This->info_written) + { + pTIFFSetField(This->parent->tiff, TIFFTAG_PHOTOMETRIC, (uint16)This->format->photometric); + pTIFFSetField(This->parent->tiff, TIFFTAG_PLANARCONFIG, (uint16)1); + pTIFFSetField(This->parent->tiff, TIFFTAG_BITSPERSAMPLE, (uint16)This->format->bps); + pTIFFSetField(This->parent->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)This->format->samples); + + if (This->format->extra_sample) + { + uint16 extra_samples; + extra_samples = This->format->extra_sample_type; + + pTIFFSetField(This->parent->tiff, TIFFTAG_EXTRASAMPLES, (uint16)1, &extra_samples); + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_IMAGEWIDTH, (uint32)This->width); + pTIFFSetField(This->parent->tiff, TIFFTAG_IMAGELENGTH, (uint32)This->height); + + if (This->xres != 0.0 && This->yres != 0.0) + { + pTIFFSetField(This->parent->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16)2); /* Inch */ + pTIFFSetField(This->parent->tiff, TIFFTAG_XRESOLUTION, (float)This->xres); + pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); + } + + This->info_written = TRUE; + } + + for (i=0; i<lineCount; i++) + { + row_data = pbPixels + i * cbStride; + + if (This->format->reverse_bgr && This->format->bps == 8) + { + memcpy(swapped_data, row_data, line_size); + for (j=0; j<line_size; j += This->format->samples) + { + BYTE temp; + temp = swapped_data[j]; + swapped_data[j] = swapped_data[j+2]; + swapped_data[j+2] = temp; + } + row_data = swapped_data; + } + + pTIFFWriteScanline(This->parent->tiff, (tdata_t)row_data, i+This->lines_written, 0); + } + + This->lines_written += lineCount; + + LeaveCriticalSection(&This->parent->lock); + + HeapFree(GetProcessHeap(), 0, swapped_data); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, @@ -1549,6 +1639,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->height = 0; result->xres = 0.0; result->yres = 0.0; + result->lines_written = 0; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameDecode_WriteSource.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 75a010581aba81792bd7dc66a25a0b5a38f2a062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a010581aba81792bd7dc66a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 14:41:45 2011 -0500 windowscodecs: Implement TiffFrameDecode_WriteSource. --- dlls/windowscodecs/tiffformat.c | 71 +++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 0968a42..78b3146 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1440,8 +1440,75 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + WICRect rc; + WICPixelFormatGUID guid; + UINT stride; + BYTE *pixeldata; + + TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); + + if (!This->initialized || !This->width || !This->height) + return WINCODEC_ERR_WRONGSTATE; + + if (!This->format) + { + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); + if (FAILED(hr)) return hr; + } + + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) + { + /* FIXME: should use WICConvertBitmapSource to convert */ + ERR("format %s unsupported\n", debugstr_guid(&guid)); + return E_FAIL; + } + + if (This->xres == 0.0 || This->yres == 0.0) + { + double xres, yres; + hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); + if (FAILED(hr)) return hr; + } + + if (!prc) + { + UINT width, height; + hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = width; + rc.Height = height; + prc = &rc; + } + + if (prc->Width != This->width) return E_INVALIDARG; + + stride = (This->format->bpp * This->width + 7)/8; + + pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); + if (!pixeldata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, + stride*prc->Height, pixeldata); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, + stride*prc->Height, pixeldata); + } + + HeapFree(GetProcessHeap(), 0, pixeldata); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_Commit(IWICBitmapFrameEncode *iface)

1 0

Aric Stewart : wineqtdecoder: Optimizations for audio extraction.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: d07f46e8a8d68e310ef135d02b0b68842033ba3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07f46e8a8d68e310ef135d02… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 6 13:36:13 2011 -0500 wineqtdecoder: Optimizations for audio extraction. --- dlls/wineqtdecoder/qtsplitter.c | 58 +++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8a3da5a..384e9c8 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -356,6 +356,9 @@ static OSErr QT_Create_Extract_Session(QTSplitter *filter) { AudioStreamBasicDescription aDesc; OSErr err; + WAVEFORMATEX* pvi; + + pvi = (WAVEFORMATEX*)filter->pAudio_Pin->pmt->pbFormat; err = MovieAudioExtractionBegin(filter->pQTMovie, 0, &filter->aSession); if (err != noErr) @@ -381,11 +384,11 @@ kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, aDesc.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger + kAudioFormatFlagIsPacked; aDesc.mFramesPerPacket = 1; - aDesc.mChannelsPerFrame = 2; - aDesc.mBitsPerChannel = 16; + aDesc.mChannelsPerFrame = pvi->nChannels; + aDesc.mBitsPerChannel = pvi->wBitsPerSample; + aDesc.mSampleRate = pvi->nSamplesPerSec; aDesc.mBytesPerFrame = (aDesc.mBitsPerChannel * aDesc.mChannelsPerFrame) / 8; aDesc.mBytesPerPacket = aDesc.mBytesPerFrame * aDesc.mFramesPerPacket; - aDesc.mSampleRate = 48000; err = MovieAudioExtractionSetProperty(filter->aSession, kQTPropertyClass_MovieAudioExtraction_Audio, @@ -408,17 +411,17 @@ kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, ERR("Unhandled Frames per packet %li\n",aDesc.mFramesPerPacket); err = -1; } - if (aDesc.mChannelsPerFrame != 2) + if (aDesc.mChannelsPerFrame != pvi->nChannels) { ERR("Unhandled channel count %li\n",aDesc.mChannelsPerFrame); err = -1; } - if (aDesc.mBitsPerChannel != 16) + if (aDesc.mBitsPerChannel != pvi->wBitsPerSample) { ERR("Unhandled bits per channel %li\n",aDesc.mBitsPerChannel); err = -1; } - if (aDesc.mSampleRate != 48000) + if (aDesc.mSampleRate != pvi->nSamplesPerSec) { ERR("Unhandled sample rate %f\n",aDesc.mSampleRate); err = -1; @@ -463,8 +466,6 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) LONGLONG tStart=0, tStop=0; float time; - MoviesTask(This->pQTMovie,0); - QTVisualContextTask(This->vContext); GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); if (next_time == -1) @@ -497,26 +498,9 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) UInt32 frames; WAVEFORMATEX* pvi; float duration; - static int audio_frame_size = 0; pvi = (WAVEFORMATEX*)This->pAudio_Pin->pmt->pbFormat; - if (audio_frame_size == 0) - audio_frame_size = (pvi->wBitsPerSample * pvi->nChannels) / 8; - - tr.value = SInt64ToWide(movie_time); - - err = MovieAudioExtractionSetProperty(This->aSession, - kQTPropertyClass_MovieAudioExtraction_Movie, - kQTMovieAudioExtractionMoviePropertyID_CurrentTime, - sizeof(TimeRecord), &tr); - - if (err != noErr) - { - ERR("Failed to set audio media time\n"); - goto audio_error; - } - hr = BaseOutputPinImpl_GetDeliveryBuffer((BaseOutputPin*)This->pAudio_Pin, &sample, NULL, NULL, 0); if (FAILED(hr)) @@ -539,7 +523,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) TRACE("Need audio for %f seconds (%li frames)\n",duration,frames); data_size = IMediaSample_GetSize(sample); - if (data_size < frames * audio_frame_size ) + if (data_size < frames * pvi->nBlockAlign) FIXME("Audio buffer is too small\n"); aData.mNumberBuffers = 1; @@ -550,7 +534,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) err = MovieAudioExtractionFillBuffer(This->aSession, &frames, &aData, &flags); TRACE("Got %i frames\n",(int)frames); - IMediaSample_SetActualDataLength(sample, frames * audio_frame_size); + IMediaSample_SetActualDataLength(sample, frames * pvi->nBlockAlign); IMediaSample_SetMediaTime(sample, &tStart, &tStop); if (tStart) @@ -850,6 +834,12 @@ static HRESULT QT_Process_Audio_Track(QTSplitter* filter, Track trk) PIN_INFO piOutput; HRESULT hr = S_OK; static const WCHAR szwAudioOut[] = {'A','u','d','i','o',0}; + Media audioMedia; + + SoundDescriptionHandle aDesc = (SoundDescriptionHandle) NewHandle(sizeof(SoundDescription)); + + audioMedia = GetTrackMedia(trk); + GetMediaSampleDescription(audioMedia, 1, (SampleDescriptionHandle)aDesc); ZeroMemory(&amt, sizeof(amt)); amt.formattype = FORMAT_WaveFormatEx; @@ -864,12 +854,20 @@ static HRESULT QT_Process_Audio_Track(QTSplitter* filter, Track trk) pvi->cbSize = sizeof(WAVEFORMATEX); pvi->wFormatTag = WAVE_FORMAT_PCM; - pvi->nChannels = 2; - pvi->nSamplesPerSec = 48000; - pvi->wBitsPerSample = 16; + pvi->nChannels = ((SoundDescription)**aDesc).numChannels; + if (pvi->nChannels < 1 || pvi->nChannels > 2) + pvi->nChannels = 2; + pvi->nSamplesPerSec = (((SoundDescription)**aDesc).sampleRate/65536); + if (pvi->nSamplesPerSec < 8000 || pvi->nChannels > 48000) + pvi->nSamplesPerSec = 44100; + pvi->wBitsPerSample = ((SoundDescription)**aDesc).sampleSize; + if (pvi->wBitsPerSample < 8 || pvi->wBitsPerSample > 32) + pvi->wBitsPerSample = 16; pvi->nBlockAlign = (pvi->nChannels * pvi->wBitsPerSample) / 8; pvi->nAvgBytesPerSec = pvi->nSamplesPerSec * pvi->nBlockAlign; + DisposeHandle((Handle)aDesc); + piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = (IBaseFilter *)filter; lstrcpyW(piOutput.achName,szwAudioOut);

1 0

Aric Stewart : wineqtdecoder: Tweak required for processing MPEG streams.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: a9e400b66abbeb32942c7f63f6607fee6ececbaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e400b66abbeb32942c7f63f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 6 13:36:24 2011 -0500 wineqtdecoder: Tweak required for processing MPEG streams. --- dlls/wineqtdecoder/qtsplitter.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 384e9c8..2a44cfd 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -460,6 +460,9 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) WaitForSingleObject(This->runEvent, -1); This->state = State_Running; + /* Prime the pump: Needed for MPEG streams */ + GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); + GetMovieTime(This->pQTMovie, &tr); do {

1 0

Philipp Middendorf : dsound: Handle 8 channel audio input.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: f5721560f5530513feeed681b8303749a7bbab98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5721560f5530513feeed681b… Author: Philipp Middendorf <pmidden(a)gmx.net> Date: Wed Apr 6 18:06:57 2011 +0200 dsound: Handle 8 channel audio input. --- dlls/dsound/mixer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 846278e..5ed8d90 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -295,6 +295,7 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf if (device->pwfx->nChannels == dsb->pwfx->nChannels || (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6) || + (device->pwfx->nChannels == 8 && dsb->pwfx->nChannels == 2) || (device->pwfx->nChannels == 6 && dsb->pwfx->nChannels == 2)) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); if (device->pwfx->nChannels == 2 || dsb->pwfx->nChannels == 2)

1 0

Piotr Caban : msvcp100: Fix spec file.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 890ecdad24b507cea552d51ba34320efff4c4a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890ecdad24b507cea552d51ba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 6 23:06:58 2011 +0200 msvcp100: Fix spec file. --- dlls/msvcp100/msvcp100.spec | 3897 ++++++------------------------------------- 1 files changed, 489 insertions(+), 3408 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=890ecdad24b507cea552d…

1 0

Alexandre Julliard : server: Fix a memory leak.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 9c8bbcd1cdb2725fb6595fa65a538d65290fce09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8bbcd1cdb2725fb6595fa65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 20:00:40 2011 +0200 server: Fix a memory leak. --- server/queue.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 14086eb..bda45bb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1339,12 +1339,12 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg if (!win || !(thread = get_window_thread(win))) { if (input) update_input_key_state( input->desktop, input->keystate, msg ); - free( msg ); + free_message( msg ); return; } input = thread->queue->input; - if (msg->msg == WM_MOUSEMOVE && merge_message( input, msg )) free( msg ); + if (msg->msg == WM_MOUSEMOVE && merge_message( input, msg )) free_message( msg ); else { msg->unique_id = 0; /* will be set once we return it to the app */

1 0