forked from Mirrors/wine-wine
quartz: Use strmbase_dump_media_type() where appropriate.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>stable
parent
b33f058308
commit
c4e3f4180d
|
@ -8,7 +8,6 @@ C_SRCS = \
|
||||||
acmwrapper.c \
|
acmwrapper.c \
|
||||||
avidec.c \
|
avidec.c \
|
||||||
dsoundrender.c \
|
dsoundrender.c \
|
||||||
enummedia.c \
|
|
||||||
enummoniker.c \
|
enummoniker.c \
|
||||||
enumregfilters.c \
|
enumregfilters.c \
|
||||||
filesource.c \
|
filesource.c \
|
||||||
|
|
|
@ -240,7 +240,6 @@ static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir
|
||||||
bmi = &format2->bmiHeader;
|
bmi = &format2->bmiHeader;
|
||||||
else
|
else
|
||||||
goto failed;
|
goto failed;
|
||||||
TRACE("Fourcc: %s\n", debugstr_an((const char *)&pmt->subtype.Data1, 4));
|
|
||||||
|
|
||||||
This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, bmi, NULL, ICMODE_DECOMPRESS);
|
This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, bmi, NULL, ICMODE_DECOMPRESS);
|
||||||
if (This->hvid)
|
if (This->hvid)
|
||||||
|
|
|
@ -400,20 +400,9 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam
|
||||||
|
|
||||||
static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TYPE * pmt)
|
static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TYPE * pmt)
|
||||||
{
|
{
|
||||||
WAVEFORMATEX* format;
|
|
||||||
|
|
||||||
if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio))
|
if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio))
|
||||||
return S_FALSE;
|
return S_FALSE;
|
||||||
|
|
||||||
format = (WAVEFORMATEX*)pmt->pbFormat;
|
|
||||||
TRACE("Format = %p\n", format);
|
|
||||||
TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM);
|
|
||||||
TRACE("nChannels = %d\n", format->nChannels);
|
|
||||||
TRACE("nSamplesPerSec = %d\n", format->nSamplesPerSec);
|
|
||||||
TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec);
|
|
||||||
TRACE("nBlockAlign = %d\n", format->nBlockAlign);
|
|
||||||
TRACE("wBitsPerSample = %d\n", format->wBitsPerSample);
|
|
||||||
|
|
||||||
if (!IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_PCM))
|
if (!IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_PCM))
|
||||||
return S_FALSE;
|
return S_FALSE;
|
||||||
|
|
||||||
|
@ -451,12 +440,6 @@ static HRESULT WINAPI DSoundRender_CompleteConnect(BaseRenderer * iface, IPin *
|
||||||
DSBUFFERDESC buf_desc;
|
DSBUFFERDESC buf_desc;
|
||||||
|
|
||||||
TRACE("(%p)->(%p)\n", This, pReceivePin);
|
TRACE("(%p)->(%p)\n", This, pReceivePin);
|
||||||
dump_AM_MEDIA_TYPE(pmt);
|
|
||||||
|
|
||||||
TRACE("MajorType %s\n", debugstr_guid(&pmt->majortype));
|
|
||||||
TRACE("SubType %s\n", debugstr_guid(&pmt->subtype));
|
|
||||||
TRACE("Format %s\n", debugstr_guid(&pmt->formattype));
|
|
||||||
TRACE("Size %d\n", pmt->cbFormat);
|
|
||||||
|
|
||||||
format = (WAVEFORMATEX*)pmt->pbFormat;
|
format = (WAVEFORMATEX*)pmt->pbFormat;
|
||||||
|
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
/*
|
|
||||||
* Implementation of IEnumMediaTypes Interface
|
|
||||||
*
|
|
||||||
* Copyright 2003 Robert Shearman
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "quartz_private.h"
|
|
||||||
|
|
||||||
#include "wine/debug.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
|
|
||||||
|
|
||||||
void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt)
|
|
||||||
{
|
|
||||||
if (!pmt)
|
|
||||||
return;
|
|
||||||
TRACE("\t%s\n\t%s\n\t...\n\t%s\n", qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), qzdebugstr_guid(&pmt->formattype));
|
|
||||||
}
|
|
|
@ -474,6 +474,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
|
||||||
AsyncReader *This = impl_from_IFileSourceFilter(iface);
|
AsyncReader *This = impl_from_IFileSourceFilter(iface);
|
||||||
|
|
||||||
TRACE("%p->(%s, %p)\n", This, debugstr_w(pszFileName), pmt);
|
TRACE("%p->(%s, %p)\n", This, debugstr_w(pszFileName), pmt);
|
||||||
|
strmbase_dump_media_type(pmt);
|
||||||
|
|
||||||
if (!pszFileName)
|
if (!pszFileName)
|
||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
|
@ -645,7 +646,6 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
|
||||||
TRACE("%p->(%p, %p)\n", This, pReceivePin, pmt);
|
TRACE("%p->(%p, %p)\n", This, pReceivePin, pmt);
|
||||||
dump_AM_MEDIA_TYPE(pmt);
|
|
||||||
|
|
||||||
/* FIXME: call queryacceptproc */
|
/* FIXME: call queryacceptproc */
|
||||||
|
|
||||||
|
|
|
@ -830,6 +830,7 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
|
||||||
TRACE("(%p/%p)->(%p, %p, %p)\n", This, iface, ppinIn, ppinOut, pmt);
|
TRACE("(%p/%p)->(%p, %p, %p)\n", This, iface, ppinIn, ppinOut, pmt);
|
||||||
|
strmbase_dump_media_type(pmt);
|
||||||
|
|
||||||
/* FIXME: check pins are in graph */
|
/* FIXME: check pins are in graph */
|
||||||
|
|
||||||
|
@ -1834,6 +1835,7 @@ static HRESULT WINAPI FilterGraph2_ReconnectEx(IFilterGraph2 *iface, IPin *ppin,
|
||||||
IFilterGraphImpl *This = impl_from_IFilterGraph2(iface);
|
IFilterGraphImpl *This = impl_from_IFilterGraph2(iface);
|
||||||
|
|
||||||
TRACE("(%p/%p)->(%p %p): stub !!!\n", This, iface, ppin, pmt);
|
TRACE("(%p/%p)->(%p %p): stub !!!\n", This, iface, ppin, pmt);
|
||||||
|
strmbase_dump_media_type(pmt);
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
@ -5461,6 +5463,7 @@ static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *pOutputPi
|
||||||
IFilterGraphImpl *This = impl_from_IGraphConfig(iface);
|
IFilterGraphImpl *This = impl_from_IGraphConfig(iface);
|
||||||
|
|
||||||
FIXME("(%p)->(%p, %p, %p, %p, %p, %x): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags);
|
FIXME("(%p)->(%p, %p, %p, %p, %p, %x): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags);
|
||||||
|
strmbase_dump_media_type(pmtFirstConnection);
|
||||||
|
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,8 +62,6 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG siz
|
||||||
extern const char * qzdebugstr_guid(const GUID * id) DECLSPEC_HIDDEN;
|
extern const char * qzdebugstr_guid(const GUID * id) DECLSPEC_HIDDEN;
|
||||||
extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN;
|
extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN;
|
|
||||||
|
|
||||||
BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) DECLSPEC_HIDDEN;
|
BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
#endif /* __QUARTZ_PRIVATE_INCLUDED__ */
|
#endif /* __QUARTZ_PRIVATE_INCLUDED__ */
|
||||||
|
|
|
@ -176,14 +176,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data,
|
||||||
return VFW_E_RUNTIME_ERROR;
|
return VFW_E_RUNTIME_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACE("biSize = %d\n", bmiHeader->biSize);
|
|
||||||
TRACE("biWidth = %d\n", bmiHeader->biWidth);
|
|
||||||
TRACE("biHeight = %d\n", bmiHeader->biHeight);
|
|
||||||
TRACE("biPlanes = %d\n", bmiHeader->biPlanes);
|
|
||||||
TRACE("biBitCount = %d\n", bmiHeader->biBitCount);
|
|
||||||
TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4));
|
|
||||||
TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage);
|
|
||||||
|
|
||||||
if (!This->baseControlWindow.baseWindow.hDC) {
|
if (!This->baseControlWindow.baseWindow.hDC) {
|
||||||
ERR("Cannot get DC from window!\n");
|
ERR("Cannot get DC from window!\n");
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
|
@ -214,14 +214,6 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *
|
||||||
return VFW_E_RUNTIME_ERROR;
|
return VFW_E_RUNTIME_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACE("biSize = %d\n", bmiHeader->biSize);
|
|
||||||
TRACE("biWidth = %d\n", bmiHeader->biWidth);
|
|
||||||
TRACE("biHeight = %d\n", bmiHeader->biHeight);
|
|
||||||
TRACE("biPlanes = %d\n", bmiHeader->biPlanes);
|
|
||||||
TRACE("biBitCount = %d\n", bmiHeader->biBitCount);
|
|
||||||
TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4));
|
|
||||||
TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage);
|
|
||||||
|
|
||||||
width = bmiHeader->biWidth;
|
width = bmiHeader->biWidth;
|
||||||
height = bmiHeader->biHeight;
|
height = bmiHeader->biHeight;
|
||||||
|
|
||||||
|
@ -342,7 +334,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY
|
||||||
VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat;
|
VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat;
|
||||||
|
|
||||||
This->bmiheader = format->bmiHeader;
|
This->bmiheader = format->bmiHeader;
|
||||||
TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight);
|
|
||||||
This->VideoWidth = format->bmiHeader.biWidth;
|
This->VideoWidth = format->bmiHeader.biWidth;
|
||||||
This->VideoHeight = format->bmiHeader.biHeight;
|
This->VideoHeight = format->bmiHeader.biHeight;
|
||||||
SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight);
|
SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight);
|
||||||
|
@ -352,8 +343,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY
|
||||||
VIDEOINFOHEADER2 *format = (VIDEOINFOHEADER2 *)pmt->pbFormat;
|
VIDEOINFOHEADER2 *format = (VIDEOINFOHEADER2 *)pmt->pbFormat;
|
||||||
|
|
||||||
This->bmiheader = format->bmiHeader;
|
This->bmiheader = format->bmiHeader;
|
||||||
|
|
||||||
TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight);
|
|
||||||
This->VideoWidth = format->bmiHeader.biWidth;
|
This->VideoWidth = format->bmiHeader.biWidth;
|
||||||
This->VideoHeight = format->bmiHeader.biHeight;
|
This->VideoHeight = format->bmiHeader.biHeight;
|
||||||
SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight);
|
SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight);
|
||||||
|
|
Loading…
Reference in New Issue