[PATCH 1/5] strmbase: Introduce a helper to trace reference time.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/filter.c | 2 +- dlls/strmbase/pin.c | 6 ++++-- dlls/strmbase/pospass.c | 6 +++--- dlls/strmbase/qualitycontrol.c | 32 ++++++++++++++------------------ dlls/strmbase/renderer.c | 3 ++- dlls/strmbase/strmbase_private.h | 18 ++++++++++++++++++ dlls/strmbase/transform.c | 5 +++-- 7 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 2de0a78f7a0..c9d15e31c78 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -153,7 +153,7 @@ HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + TRACE("iface %p, start %s.\n", iface, debugstr_time(start)); EnterCriticalSection(&filter->csFilter); filter->state = State_Running; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index cc7db119fae..42b150be673 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -346,7 +346,8 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); This->tStart = tStart; This->tStop = tStop; @@ -858,7 +859,8 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; - TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 2c5c274bba5..148d4fae3c5 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -743,7 +743,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_CurrentPosition(IMediaPosition * IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { @@ -797,7 +797,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_StopTime(IMediaPosition *iface, IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { @@ -833,7 +833,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_PrerollTime(IMediaPosition *ifac IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 139c4dfe862..b3e93b7baad 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,9 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -#define XTIME_FMT "%u.%03u" -#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) - HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { QualityControlImpl *This; @@ -80,9 +77,8 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se QualityControlImpl *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; - TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", - This, sender, qm.Type, qm.Proportion, - XTIME(qm.Late), XTIME(qm.TimeStamp)); + TRACE("iface %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + iface, sender, qm.Type, qm.Proportion, debugstr_time(qm.Late), debugstr_time(qm.TimeStamp)); if (This->tonotify) return IQualityControl_Notify(This->tonotify, This->self, qm); @@ -126,7 +122,6 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) { - TRACE("%p " XTIME_FMT "\n", This, XTIME(tStart)); This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; @@ -147,8 +142,8 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME { REFERENCE_TIME max_lateness = 200000; - TRACE("%p " XTIME_FMT " " XTIME_FMT " " XTIME_FMT "\n", - This, XTIME(jitter), XTIME(start), XTIME(stop)); + TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), + debugstr_time(start), debugstr_time(stop)); /* we can add a valid stop time */ if (stop >= start) @@ -217,12 +212,12 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) pt = priv->avg_pt; } - TRACE("start: " XTIME_FMT ", entered " XTIME_FMT ", left " XTIME_FMT ", pt: " XTIME_FMT ", " - "duration " XTIME_FMT ", jitter " XTIME_FMT "\n", XTIME(start), XTIME(entered), - XTIME(left), XTIME(pt), XTIME(duration), XTIME(jitter)); + TRACE("start %s, entered %s, left %s, pt %s, duration %s, jitter %s.\n", + debugstr_time(start), debugstr_time(entered), debugstr_time(left), + debugstr_time(pt), debugstr_time(duration), debugstr_time(jitter)); - TRACE("avg_duration: " XTIME_FMT ", avg_pt: " XTIME_FMT ", avg_rate: %g\n", - XTIME(priv->avg_duration), XTIME(priv->avg_pt), priv->avg_rate); + TRACE("average duration %s, average pt %s, average rate %.16e.\n", + debugstr_time(priv->avg_duration), debugstr_time(priv->avg_pt), priv->avg_rate); /* collect running averages. for first observations, we copy the * values */ @@ -274,7 +269,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) q.Proportion = 5000; q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; - TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate); + TRACE("Late: %s from %s, rate: %g\n", debugstr_time(q.Late), debugstr_time(q.TimeStamp), 1./priv->avg_rate); hr = IQualityControl_Notify(&priv->IQualityControl_iface, priv->self, q); priv->qos_handled = hr == S_OK; } @@ -302,8 +297,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s /* FIXME: This isn't correct; we don't drop samples, nor should. */ This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); - TRACE("Dropped: %i %i %i %i\n", This->is_dropped, (int)(start/10000), - (int)(stop/10000), (int)(This->current_jitter / 10000)); + TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, + debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); if (This->is_dropped) This->dropped++; else @@ -313,7 +308,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s return; IReferenceClock_GetTime(This->clock, &This->start); - TRACE("at: " XTIME_FMT "\n", XTIME(This->start)); + + TRACE("Starting at %s.\n", debugstr_time(This->start)); } void QualityControlRender_EndRender(QualityControlImpl *This) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7d8420e73c1..270a6f260f1 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -426,7 +426,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { BaseRenderer *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); + + TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); EnterCriticalSection(&This->csRenderLock); This->stream_start = tStart; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 4dd7caa9246..d0f50297655 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -32,6 +32,24 @@ #include "wine/list.h" #include "wine/strmbase.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + unsigned int i = 0, j = 0; + char buffer[22], rev[22]; + + while (time || i <= 8) + { + buffer[i++] = '0' + (time % 10); + time /= 10; + if (i == 7) buffer[i++] = '.'; + } + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + /* Quality Control */ typedef struct QualityControlImpl { IQualityControl IQualityControl_iface; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index abf5ed34b3c..bd70b8a90c6 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -254,7 +254,7 @@ static HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME HRESULT hr = S_OK; TransformFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); + TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); EnterCriticalSection(&This->csReceive); { @@ -453,7 +453,8 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC TransformFilter *pTransform = impl_from_sink_IPin(iface); HRESULT hr = S_OK; - TRACE("(%p)->(%s %s %e)\n", iface, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); EnterCriticalSection(&pTransform->filter.csFilter); if (pTransform->pFuncsTable->pfnNewSegment) -- 2.23.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/mediatype.c | 110 +++++++++++++++++++++++++++++++++++--- dlls/strmbase/pin.c | 21 ++------ dlls/strmbase/renderer.c | 4 ++ dlls/strmbase/transform.c | 1 + include/wine/strmbase.h | 2 + 5 files changed, 116 insertions(+), 22 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 931e00a5cba..7ab8b6e7083 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -18,16 +18,108 @@ * 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 <stdarg.h> -#define COBJMACROS -#include "dshow.h" - -#include "wine/strmbase.h" -#include "wine/debug.h" +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +static const struct +{ + const GUID *guid; + const char *name; +} +strmbase_guids[] = +{ +#define X(g) {&(g), #g} + X(GUID_NULL), + +#undef OUR_GUID_ENTRY +#define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) X(name), +#include "uuids.h" + +#undef X +}; + +static const char *strmbase_debugstr_guid(const GUID *guid) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(strmbase_guids); ++i) + { + if (IsEqualGUID(strmbase_guids[i].guid, guid)) + return wine_dbg_sprintf("%s", strmbase_guids[i].name); + } + + return debugstr_guid(guid); +} + +static const char *debugstr_fourcc(DWORD fourcc) +{ + char str[4] = {fourcc, fourcc >> 8, fourcc >> 16, fourcc >> 24}; + if (isprint(str[0]) && isprint(str[1]) && isprint(str[2]) && isprint(str[3])) + return wine_dbgstr_an(str, 4); + return wine_dbg_sprintf("%#x", fourcc); +} + +void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) +{ + if (!TRACE_ON(strmbase) || !mt) return; + + TRACE("Dumping media type %p: major type %s, subtype %s", + mt, strmbase_debugstr_guid(&mt->majortype), strmbase_debugstr_guid(&mt->subtype)); + if (mt->bFixedSizeSamples) TRACE(", fixed size samples"); + if (mt->bTemporalCompression) TRACE(", temporal compression"); + if (mt->lSampleSize) TRACE(", sample size %d", mt->lSampleSize); + if (mt->pUnk) TRACE(", pUnk %p", mt->pUnk); + TRACE(", format type %s.\n", strmbase_debugstr_guid(&mt->formattype)); + + if (!mt->pbFormat) return; + + TRACE("Dumping format %p: ", mt->pbFormat); + + if (IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) && mt->cbFormat >= sizeof(WAVEFORMATEX)) + { + WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; + + TRACE("tag %#x, %u channels, sample rate %u, %u bytes/sec, alignment %u, %u bits/sample.\n", + wfx->wFormatTag, wfx->nChannels, wfx->nSamplesPerSec, + wfx->nAvgBytesPerSec, wfx->nBlockAlign, wfx->wBitsPerSample); + + if (wfx->cbSize) + { + const unsigned char *extra = (const unsigned char *)(wfx + 1); + unsigned int i; + + TRACE(" Extra bytes:"); + for (i = 0; i < wfx->cbSize; ++i) + { + if (!(i % 16)) TRACE("\n "); + TRACE(" %02x", extra[i]); + } + TRACE("\n"); + } + } + else if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) && mt->cbFormat >= sizeof(VIDEOINFOHEADER)) + { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; + + TRACE("source %s, target %s, bitrate %u, error rate %u, %s sec/frame, ", + wine_dbgstr_rect(&vih->rcSource), wine_dbgstr_rect(&vih->rcTarget), + vih->dwBitRate, vih->dwBitErrorRate, debugstr_time(vih->AvgTimePerFrame)); + TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", + vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, + vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), + vih->bmiHeader.biSizeImage); + if (vih->bmiHeader.biXPelsPerMeter || vih->bmiHeader.biYPelsPerMeter) + TRACE(", resolution %dx%d", vih->bmiHeader.biXPelsPerMeter, vih->bmiHeader.biYPelsPerMeter); + if (vih->bmiHeader.biClrUsed) TRACE(", %d colours", vih->bmiHeader.biClrUsed); + if (vih->bmiHeader.biClrImportant) TRACE(", %d important colours", vih->bmiHeader.biClrImportant); + TRACE(".\n"); + } + else + TRACE("not implemented for this format type.\n"); +} + HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src) { *dest = *src; @@ -176,6 +268,12 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes *iface, *ret_count = 0; return E_OUTOFMEMORY; } + + if (TRACE_ON(strmbase)) + { + TRACE("Returning media type %u:\n", enummt->uIndex + i); + strmbase_dump_media_type(mts[i]); + } } if ((count != 1) || ret_count) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 42b150be673..2d981684184 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -135,19 +135,8 @@ out: return hr; } -static 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", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype), debugstr_guid(&pmt->formattype)); -} - static BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards) { - TRACE("pmt1: "); - dump_AM_MEDIA_TYPE(pmt1); - TRACE("pmt2: "); - dump_AM_MEDIA_TYPE(pmt2); return (((bWildcards && (IsEqualGUID(&pmt1->majortype, &GUID_NULL) || IsEqualGUID(&pmt2->majortype, &GUID_NULL))) || IsEqualGUID(&pmt1->majortype, &pmt2->majortype)) && ((bWildcards && (IsEqualGUID(&pmt1->subtype, &GUID_NULL) || IsEqualGUID(&pmt2->subtype, &GUID_NULL))) || IsEqualGUID(&pmt1->subtype, &pmt2->subtype))); } @@ -257,6 +246,7 @@ HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt if (This->peer) { CopyMediaType(pmt, &This->mtCurrent); + strmbase_dump_media_type(pmt); hr = S_OK; } else @@ -313,6 +303,7 @@ HRESULT WINAPI BasePinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) struct strmbase_pin *This = impl_from_IPin(iface); TRACE("(%p)->(%p)\n", iface, pmt); + strmbase_dump_media_type(pmt); return (This->pFuncsTable->pin_query_accept(This, pmt) == S_OK ? S_OK : S_FALSE); } @@ -369,7 +360,7 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const struct strmbase_source *This = impl_source_from_IPin(iface); TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); + strmbase_dump_media_type(pmt); if (!pReceivePin) return E_POINTER; @@ -400,7 +391,6 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, NULL)) { assert(pmtCandidate); - dump_AM_MEDIA_TYPE(pmtCandidate); if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype) && !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype)) assert(pmtCandidate->pbFormat); @@ -427,7 +417,7 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, &fetched)) { assert(pmtCandidate); - dump_AM_MEDIA_TYPE(pmtCandidate); + strmbase_dump_media_type(pmtCandidate); if ((!pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE)) && This->pFuncsTable->pfnAttemptConnection(This, pReceivePin, pmtCandidate) == S_OK) { @@ -653,7 +643,6 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This, IMemAllocator * pMemAlloc = NULL; TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); if ((hr = This->pFuncsTable->base.pin_query_accept(&This->pin, pmt)) != S_OK) return hr; @@ -744,7 +733,7 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP HRESULT hr = S_OK; TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); + strmbase_dump_media_type(pmt); EnterCriticalSection(&This->pin.filter->csFilter); { diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 270a6f260f1..3a5fa19ace6 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -51,6 +51,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin *iface, IPin HRESULT hr; TRACE("iface %p, peer %p, mt %p.\n", iface, peer, mt); + strmbase_dump_media_type(mt); EnterCriticalSection(&filter->filter.csFilter); hr = BaseInputPinImpl_ReceiveConnection(iface, peer, mt); @@ -322,6 +323,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp if (IMediaSample_GetMediaType(pSample, &pmt) == S_OK) { + TRACE("Format change.\n"); + strmbase_dump_media_type(pmt); + if (FAILED(This->pFuncsTable->pfnCheckMediaType(This, pmt))) { return VFW_E_TYPE_NOT_ACCEPTED; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index bd70b8a90c6..3fd9d8bd6f3 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -387,6 +387,7 @@ static HRESULT WINAPI TransformFilter_InputPin_ReceiveConnection(IPin * iface, I HRESULT hr = S_OK; TRACE("(%p)->(%p, %p)\n", iface, pReceivePin, pmt); + strmbase_dump_media_type(pmt); if (pTransform->pFuncsTable->pfnSetMediaType) hr = pTransform->pFuncsTable->pfnSetMediaType(pTransform, PINDIR_INPUT, pmt); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 99d680a365b..de5c875105a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -26,6 +26,8 @@ void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType); AM_MEDIA_TYPE * WINAPI CreateMediaType(AM_MEDIA_TYPE const * pSrc); void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType); +void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt); + /* Pin functions */ struct strmbase_pin -- 2.23.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/avidec.c | 1 - dlls/quartz/dsoundrender.c | 17 ----------------- dlls/quartz/enummedia.c | 32 -------------------------------- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 3 +++ dlls/quartz/quartz_private.h | 2 -- dlls/quartz/videorenderer.c | 8 -------- dlls/quartz/vmr9.c | 11 ----------- 9 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 dlls/quartz/enummedia.c diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index fd2397668d0..b79bed1949c 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ acmwrapper.c \ avidec.c \ dsoundrender.c \ - enummedia.c \ enummoniker.c \ enumregfilters.c \ filesource.c \ diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index ce38b6963ce..7352a28db80 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -240,7 +240,6 @@ static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir bmi = &format2->bmiHeader; else 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); if (This->hvid) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d3c382f1663..6ba6e4c7ae0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -400,20 +400,9 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TYPE * pmt) { - WAVEFORMATEX* format; - if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) 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)) return S_FALSE; @@ -451,12 +440,6 @@ static HRESULT WINAPI DSoundRender_CompleteConnect(BaseRenderer * iface, IPin * DSBUFFERDESC buf_desc; 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; diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c deleted file mode 100644 index b3acc5d4e25..00000000000 --- a/dlls/quartz/enummedia.c +++ /dev/null @@ -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)); -} diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 36b7e95ad6f..8a921954dd2 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -474,6 +474,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi AsyncReader *This = impl_from_IFileSourceFilter(iface); TRACE("%p->(%s, %p)\n", This, debugstr_w(pszFileName), pmt); + strmbase_dump_media_type(pmt); if (!pszFileName) return E_POINTER; @@ -645,7 +646,6 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc HRESULT hr; TRACE("%p->(%p, %p)\n", This, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); /* FIXME: call queryacceptproc */ diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b4d0164fd3a..24854d2c633 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -830,6 +830,7 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi HRESULT hr; TRACE("(%p/%p)->(%p, %p, %p)\n", This, iface, ppinIn, ppinOut, pmt); + strmbase_dump_media_type(pmt); /* 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); TRACE("(%p/%p)->(%p %p): stub !!!\n", This, iface, ppin, pmt); + strmbase_dump_media_type(pmt); return S_OK; } @@ -5461,6 +5463,7 @@ static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *pOutputPi IFilterGraphImpl *This = impl_from_IGraphConfig(iface); 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; } diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 1213aea352a..f3ba39fba9f 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -62,8 +62,6 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG siz extern const char * qzdebugstr_guid(const GUID * id) 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; #endif /* __QUARTZ_PRIVATE_INCLUDED__ */ diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87ff9f59bf3..43aef9ffbe7 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -176,14 +176,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, 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) { ERR("Cannot get DC from window!\n"); return E_FAIL; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 600e75945a8..0e04fef3662 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -214,14 +214,6 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * 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; height = bmiHeader->biHeight; @@ -342,7 +334,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; This->bmiheader = format->bmiHeader; - TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); This->VideoWidth = format->bmiHeader.biWidth; This->VideoHeight = format->bmiHeader.biHeight; 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; This->bmiheader = format->bmiHeader; - - TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); This->VideoWidth = format->bmiHeader.biWidth; This->VideoHeight = format->bmiHeader.biHeight; SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); -- 2.23.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/Makefile.in | 1 - dlls/qcap/avico.c | 2 -- dlls/qcap/avimux.c | 3 --- dlls/qcap/enummedia.c | 44 -------------------------------------- dlls/qcap/qcap_main.h | 2 -- dlls/qcap/smartteefilter.c | 1 - dlls/qcap/v4l.c | 2 -- dlls/qcap/vfwcapture.c | 11 ++++++---- 8 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 dlls/qcap/enummedia.c diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 12cc9171fb5..cb33e07c8d0 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ avimux.c \ capturegraph.c \ dllfunc.c \ - enummedia.c \ enumpins.c \ filter.c \ mediatype.c \ diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index ea98b2a6553..95e51f6e632 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -325,7 +325,6 @@ static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, HRESULT hres; TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pConnector, pmt); - dump_AM_MEDIA_TYPE(pmt); hres = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); if(FAILED(hres)) @@ -382,7 +381,6 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE DWORD res; TRACE("(%p)->(AM_MEDIA_TYPE(%p))\n", base, pmt); - dump_AM_MEDIA_TYPE(pmt); if(!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) return S_FALSE; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 596016cf77d..8f7fe132856 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1165,7 +1165,6 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base, HRESULT hr; TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", base, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); hr = IPin_QueryDirection(pReceivePin, &dir); if(hr==S_OK && dir!=PINDIR_INPUT) @@ -1260,7 +1259,6 @@ static HRESULT WINAPI AviMuxOut_Connect(IPin *iface, int i; TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); hr = BaseOutputPinImpl_Connect(iface, pReceivePin, pmt); if(FAILED(hr)) @@ -1537,7 +1535,6 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, HRESULT hr; TRACE("pin %p, pConnector %p, pmt %p.\n", avimuxin, pConnector, pmt); - dump_AM_MEDIA_TYPE(pmt); if(!pmt) return E_POINTER; diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c deleted file mode 100644 index 45552e16a46..00000000000 --- a/dlls/qcap/enummedia.c +++ /dev/null @@ -1,44 +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 <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(qcap); - -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", debugstr_guid(&pmt->majortype), - debugstr_guid(&pmt->subtype), debugstr_guid(&pmt->formattype)); -} diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index 0e767bd08c7..ab02dbb9ab5 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -39,6 +39,4 @@ extern IUnknown * WINAPI QCAP_createInfinitePinTeeFilter(IUnknown *pUnkOuter, HR extern IUnknown * WINAPI QCAP_createSmartTeeFilter(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createAudioInputMixerPropertyPage(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; - #endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 26f32559670..a4d0a435ef3 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -124,7 +124,6 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE { SmartTeeFilter *This = impl_from_strmbase_pin(base); TRACE("(%p, AM_MEDIA_TYPE(%p))\n", This, pmt); - dump_AM_MEDIA_TYPE(pmt); if (!pmt) return VFW_E_TYPE_NOT_ACCEPTED; /* We'll take any media type, but the output pins will later diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index c9102accb80..cdab38052b9 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -135,7 +135,6 @@ HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) { HRESULT hr; TRACE("device %p, mt %p.\n", device, mt); - dump_AM_MEDIA_TYPE(mt); if (!mt) return E_POINTER; @@ -251,7 +250,6 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) vi->bmiHeader.biXPelsPerMeter = 100; vi->bmiHeader.biYPelsPerMeter = 100; mT[0]->pbFormat = (void *)vi; - dump_AM_MEDIA_TYPE(mT[0]); return S_OK; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6fbe721a313..0be0914836b 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -205,7 +205,8 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) HRESULT hr; VfwCapture *This = impl_from_IAMStreamConfig(iface); - TRACE("(%p): %p->%p\n", iface, pmt, pmt ? pmt->pbFormat : NULL); + TRACE("filter %p, mt %p.\n", This, pmt); + strmbase_dump_media_type(pmt); if (This->filter.state != State_Stopped) { @@ -219,8 +220,6 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) return E_POINTER; } - dump_AM_MEDIA_TYPE(pmt); - if (This->source.pin.peer) { hr = IPin_QueryAccept(This->source.pin.peer, pmt); @@ -244,9 +243,13 @@ static HRESULT WINAPI AMStreamConfig_GetFormat( IAMStreamConfig *iface, AM_MEDIA_TYPE **pmt ) { VfwCapture *This = impl_from_IAMStreamConfig(iface); + HRESULT hr; TRACE("%p -> (%p)\n", iface, pmt); - return qcap_driver_get_format(This->driver_info, pmt); + hr = qcap_driver_get_format(This->driver_info, pmt); + if (SUCCEEDED(hr)) + strmbase_dump_media_type(*pmt); + return hr; } static HRESULT WINAPI -- 2.23.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gst_private.h | 3 --- dlls/winegstreamer/gstdemux.c | 2 +- dlls/winegstreamer/gsttffilter.c | 3 --- dlls/winegstreamer/main.c | 9 --------- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 596724cf261..122e4c1037e 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -35,9 +35,6 @@ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -/* enum media */ -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); - IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4a685b1bd5a..f20455c2be5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1976,7 +1976,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, HRESULT hr = S_OK; TRACE("filter %p, peer %p, mt %p.\n", filter, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); + strmbase_dump_media_type(pmt); mark_wine_thread(); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 1a40ec68568..8619cc6b3fb 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -509,7 +509,6 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if ( (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) && !IsEqualGUID(&amt->majortype, &MEDIATYPE_Stream)) || @@ -649,7 +648,6 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Video) || (!IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo) && @@ -885,7 +883,6 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) || !IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) || diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 5a8e05e8872..379f54ab4ec 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -412,15 +412,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return hr; } -/* GStreamer common functions */ - -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", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype), debugstr_guid(&pmt->formattype)); -} - static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx) { BOOL *status = param; -- 2.23.0
participants (1)
-
Zebediah Figura