26 Feb
2017
26 Feb
'17
4:52 p.m.
Author: akhaldi
Date: Sun Feb 26 16:52:09 2017
New Revision: 73938
URL: http://svn.reactos.org/svn/reactos?rev=73938&view=rev
Log:
[QUARTZ] Sync with Wine Staging 2.2. CORE-12823
e2a4974 quartz: Downgrade FIXME->WARN.
c6a4811 quartz: Clean up another trace for consistency.
ff36b5c quartz: A couple of spelling fixes in comments.
ac59a68 quartz: Don't write past end of d3d9 buffer.
478feea quartz: Keep This/iface order in TRACEs for consistency.
97405fc quartz: Add tests for IBasicVideo.
5cdb0b5 quartz: Use wine_dbgstr_longlong() to trace REFERENCE_TIME.
89d4e14 quartz: Take MP3 padding bit into account when calculating the block size.
Modified:
trunk/reactos/dll/directx/wine/quartz/filesource.c
trunk/reactos/dll/directx/wine/quartz/filtergraph.c
trunk/reactos/dll/directx/wine/quartz/mpegsplit.c
trunk/reactos/dll/directx/wine/quartz/vmr9.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Sun Feb 26 16:52:09
2017
@@ -521,7 +521,7 @@
{
AsyncReader *This = impl_from_IBaseFilter(iface);
- TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart);
+ TRACE("(%s)\n", wine_dbgstr_longlong(tStart));
This->filter.state = State_Running;
Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Sun Feb 26 16:52:09
2017
@@ -708,6 +708,9 @@
IPin_QueryDirection(ppin, &pindir);
hr = IPin_ConnectedTo(ppin, &pConnectedTo);
+
+ TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo);
+
if (FAILED(hr)) {
TRACE("Querying connected to failed: %x\n", hr);
return hr;
@@ -721,7 +724,7 @@
IPin_Release(pConnectedTo);
if (FAILED(hr))
WARN("Reconnecting pins failed, pins are not connected now..\n");
- TRACE("(%p->%p) -- %p %p -> %x\n", iface, This, ppin, pConnectedTo,
hr);
+ TRACE("-> %08x\n", hr);
return hr;
}
@@ -744,7 +747,7 @@
HRESULT hr = S_OK;
int i;
- TRACE("(%p/%p)->() live sources not handled properly!\n", iface, This);
+ TRACE("(%p/%p)->() live sources not handled properly!\n", This, iface);
EnterCriticalSection(&This->cs);
@@ -2354,7 +2357,7 @@
if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat))
{
- FIXME("Unhandled time format %s\n", debugstr_guid(pFormat));
+ WARN("Unhandled time format %s\n", debugstr_guid(pFormat));
return S_FALSE;
}
@@ -5278,8 +5281,7 @@
IFilterGraphImpl *This = impl_from_IMediaFilter(iface);
if (tStart)
- FIXME("Run called with non-null tStart: %x%08x\n",
- (int)(tStart>>32), (int)tStart);
+ FIXME("Run called with non-null tStart: %s\n",
wine_dbgstr_longlong(tStart));
return MediaControl_Run(&This->IMediaControl_iface);
}
@@ -5298,7 +5300,7 @@
HRESULT hr = S_OK;
int i;
- TRACE("(%p/%p)->(%p)\n", iface, This, pClock);
+ TRACE("(%p/%p)->(%p)\n", This, iface, pClock);
EnterCriticalSection(&This->cs);
{
@@ -5346,7 +5348,7 @@
{
IFilterGraphImpl *This = impl_from_IMediaFilter(iface);
- TRACE("(%p/%p)->(%p)\n", iface, This, ppClock);
+ TRACE("(%p/%p)->(%p)\n", This, iface, ppClock);
if (!ppClock)
return E_POINTER;
Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] Sun Feb 26 16:52:09
2017
@@ -353,6 +353,7 @@
int freq_index;
int mode_ext;
int emphasis;
+ int padding;
int lsf = 1;
int mpeg1;
int layer;
@@ -377,6 +378,7 @@
layer = 4-((header[1]>>1)&0x3);
bitrate_index = ((header[2]>>4)&0xf);
+ padding = ((header[2]>>1)&0x1);
freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6);
mode = ((header[3]>>6)&0x3);
mode_ext = ((header[3]>>4)&0x3);
@@ -405,12 +407,12 @@
if (layer == 3)
format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 /
- (format->nSamplesPerSec<<lsf) + 1;
+ (format->nSamplesPerSec<<lsf) + padding;
else if (layer == 2)
format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 /
- format->nSamplesPerSec + 1;
+ format->nSamplesPerSec + padding;
else
- format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 /
format->nSamplesPerSec + 1);
+ format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 /
format->nSamplesPerSec + padding);
format->wBitsPerSample = 0;
Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Sun Feb 26 16:52:09 2017
@@ -242,9 +242,9 @@
lock.pBits = (char *)lock.pBits + (height * lock.Pitch);
while (height--)
{
+ lock.pBits = (char *)lock.pBits - lock.Pitch;
memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8);
data = data + width * bmiHeader->biBitCount / 8;
- lock.pBits = (char *)lock.pBits - lock.Pitch;
}
}
else if (lock.Pitch != width * bmiHeader->biBitCount / 8)
@@ -3010,7 +3010,7 @@
TRACE("(%p/%p)->(...)\n", iface, This);
- /* No AddRef taken here or the base VMR9 filter would never be destroied */
+ /* No AddRef taken here or the base VMR9 filter would never be destroyed */
This->SurfaceAllocatorNotify = allocnotify;
return S_OK;
}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 16:52:09 2017
@@ -39,7 +39,7 @@
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23
reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.23
-reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.23
+reactos/dll/directx/wine/quartz # Synced to WineStaging-2.2
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4
reactos/dll/win32/activeds # Synced to WineStaging-1.9.11