mirror of
https://github.com/reactos/reactos.git
synced 2025-06-12 02:58:28 +00:00
[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. svn path=/trunk/; revision=73938
This commit is contained in:
parent
caa685ac17
commit
fe9810f5a4
5 changed files with 18 additions and 14 deletions
|
@ -521,7 +521,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart
|
||||||
{
|
{
|
||||||
AsyncReader *This = impl_from_IBaseFilter(iface);
|
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;
|
This->filter.state = State_Running;
|
||||||
|
|
||||||
|
|
|
@ -708,6 +708,9 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin)
|
||||||
|
|
||||||
IPin_QueryDirection(ppin, &pindir);
|
IPin_QueryDirection(ppin, &pindir);
|
||||||
hr = IPin_ConnectedTo(ppin, &pConnectedTo);
|
hr = IPin_ConnectedTo(ppin, &pConnectedTo);
|
||||||
|
|
||||||
|
TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo);
|
||||||
|
|
||||||
if (FAILED(hr)) {
|
if (FAILED(hr)) {
|
||||||
TRACE("Querying connected to failed: %x\n", hr);
|
TRACE("Querying connected to failed: %x\n", hr);
|
||||||
return hr;
|
return hr;
|
||||||
|
@ -721,7 +724,7 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin)
|
||||||
IPin_Release(pConnectedTo);
|
IPin_Release(pConnectedTo);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
WARN("Reconnecting pins failed, pins are not connected now..\n");
|
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;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -744,7 +747,7 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface)
|
||||||
HRESULT hr = S_OK;
|
HRESULT hr = S_OK;
|
||||||
int i;
|
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);
|
EnterCriticalSection(&This->cs);
|
||||||
|
|
||||||
|
@ -2354,7 +2357,7 @@ static HRESULT WINAPI MediaSeeking_IsFormatSupported(IMediaSeeking *iface, const
|
||||||
|
|
||||||
if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat))
|
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;
|
return S_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5278,8 +5281,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart
|
||||||
IFilterGraphImpl *This = impl_from_IMediaFilter(iface);
|
IFilterGraphImpl *This = impl_from_IMediaFilter(iface);
|
||||||
|
|
||||||
if (tStart)
|
if (tStart)
|
||||||
FIXME("Run called with non-null tStart: %x%08x\n",
|
FIXME("Run called with non-null tStart: %s\n", wine_dbgstr_longlong(tStart));
|
||||||
(int)(tStart>>32), (int)tStart);
|
|
||||||
|
|
||||||
return MediaControl_Run(&This->IMediaControl_iface);
|
return MediaControl_Run(&This->IMediaControl_iface);
|
||||||
}
|
}
|
||||||
|
@ -5298,7 +5300,7 @@ static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceC
|
||||||
HRESULT hr = S_OK;
|
HRESULT hr = S_OK;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
TRACE("(%p/%p)->(%p)\n", iface, This, pClock);
|
TRACE("(%p/%p)->(%p)\n", This, iface, pClock);
|
||||||
|
|
||||||
EnterCriticalSection(&This->cs);
|
EnterCriticalSection(&This->cs);
|
||||||
{
|
{
|
||||||
|
@ -5346,7 +5348,7 @@ static HRESULT WINAPI MediaFilter_GetSyncSource(IMediaFilter *iface, IReferenceC
|
||||||
{
|
{
|
||||||
IFilterGraphImpl *This = impl_from_IMediaFilter(iface);
|
IFilterGraphImpl *This = impl_from_IMediaFilter(iface);
|
||||||
|
|
||||||
TRACE("(%p/%p)->(%p)\n", iface, This, ppClock);
|
TRACE("(%p/%p)->(%p)\n", This, iface, ppClock);
|
||||||
|
|
||||||
if (!ppClock)
|
if (!ppClock)
|
||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
|
|
|
@ -353,6 +353,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade
|
||||||
int freq_index;
|
int freq_index;
|
||||||
int mode_ext;
|
int mode_ext;
|
||||||
int emphasis;
|
int emphasis;
|
||||||
|
int padding;
|
||||||
int lsf = 1;
|
int lsf = 1;
|
||||||
int mpeg1;
|
int mpeg1;
|
||||||
int layer;
|
int layer;
|
||||||
|
@ -377,6 +378,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade
|
||||||
|
|
||||||
layer = 4-((header[1]>>1)&0x3);
|
layer = 4-((header[1]>>1)&0x3);
|
||||||
bitrate_index = ((header[2]>>4)&0xf);
|
bitrate_index = ((header[2]>>4)&0xf);
|
||||||
|
padding = ((header[2]>>1)&0x1);
|
||||||
freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6);
|
freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6);
|
||||||
mode = ((header[3]>>6)&0x3);
|
mode = ((header[3]>>6)&0x3);
|
||||||
mode_ext = ((header[3]>>4)&0x3);
|
mode_ext = ((header[3]>>4)&0x3);
|
||||||
|
@ -405,12 +407,12 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade
|
||||||
|
|
||||||
if (layer == 3)
|
if (layer == 3)
|
||||||
format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 /
|
format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 /
|
||||||
(format->nSamplesPerSec<<lsf) + 1;
|
(format->nSamplesPerSec<<lsf) + padding;
|
||||||
else if (layer == 2)
|
else if (layer == 2)
|
||||||
format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 /
|
format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 /
|
||||||
format->nSamplesPerSec + 1;
|
format->nSamplesPerSec + padding;
|
||||||
else
|
else
|
||||||
format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + 1);
|
format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + padding);
|
||||||
|
|
||||||
format->wBitsPerSample = 0;
|
format->wBitsPerSample = 0;
|
||||||
|
|
||||||
|
|
|
@ -242,9 +242,9 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *
|
||||||
lock.pBits = (char *)lock.pBits + (height * lock.Pitch);
|
lock.pBits = (char *)lock.pBits + (height * lock.Pitch);
|
||||||
while (height--)
|
while (height--)
|
||||||
{
|
{
|
||||||
|
lock.pBits = (char *)lock.pBits - lock.Pitch;
|
||||||
memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8);
|
memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8);
|
||||||
data = 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)
|
else if (lock.Pitch != width * bmiHeader->biBitCount / 8)
|
||||||
|
@ -3010,7 +3010,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9
|
||||||
|
|
||||||
TRACE("(%p/%p)->(...)\n", iface, This);
|
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;
|
This->SurfaceAllocatorNotify = allocnotify;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
|
||||||
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23
|
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/msdmo # Synced to WineStaging-1.9.23
|
||||||
reactos/dll/directx/wine/qedit # 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/directx/wine/wined3d # Synced to WineStaging-1.9.4
|
||||||
|
|
||||||
reactos/dll/win32/activeds # Synced to WineStaging-1.9.11
|
reactos/dll/win32/activeds # Synced to WineStaging-1.9.11
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue