From: Alex Henrie alexhenrie24@gmail.com
--- libs/strmbase/filter.c | 2 +- libs/strmbase/mediatype.c | 4 ++-- libs/strmbase/pin.c | 4 ++-- libs/strmbase/renderer.c | 8 ++++---- libs/strmbase/seeking.c | 6 +++--- libs/strmbase/strmbase_private.h | 21 --------------------- 6 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index ee41611a198..8beff98623d 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -347,7 +347,7 @@ static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME start) struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK;
- TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), debugstr_time(start)); + TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), debugstr_reftime(start));
EnterCriticalSection(&filter->filter_cs);
diff --git a/libs/strmbase/mediatype.c b/libs/strmbase/mediatype.c index af813e2ffee..a4b05be6282 100644 --- a/libs/strmbase/mediatype.c +++ b/libs/strmbase/mediatype.c @@ -101,7 +101,7 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); if (vih->dwBitRate) TRACE("bitrate %lu, ", vih->dwBitRate); if (vih->dwBitErrorRate) TRACE("error rate %lu, ", vih->dwBitErrorRate); - TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + TRACE("%s sec/frame, ", debugstr_reftime(vih->AvgTimePerFrame)); TRACE("size %ldx%ld, %u planes, %u bpp, compression %s, image size %lu", vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), @@ -120,7 +120,7 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); if (vih->dwBitRate) TRACE("bitrate %lu, ", vih->dwBitRate); if (vih->dwBitErrorRate) TRACE("error rate %lu, ", vih->dwBitErrorRate); - TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + TRACE("%s sec/frame, ", debugstr_reftime(vih->AvgTimePerFrame)); if (vih->dwInterlaceFlags) TRACE("interlace flags %#lx, ", vih->dwInterlaceFlags); if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#lx, ", vih->dwCopyProtectFlags); TRACE("aspect ratio %lu/%lu, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 03330837477..8a4e86b73e4 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -650,7 +650,7 @@ static HRESULT WINAPI source_NewSegment(IPin * iface, REFERENCE_TIME start, REFE struct strmbase_source *pin = impl_source_from_IPin(iface);
TRACE("pin %p %s:%s, start %s, stop %s, rate %.16e.\n", pin, debugstr_w(pin->pin.filter->name), - debugstr_w(pin->pin.name), debugstr_time(start), debugstr_time(stop), rate); + debugstr_w(pin->pin.name), debugstr_reftime(start), debugstr_reftime(stop), rate);
return S_OK; } @@ -995,7 +995,7 @@ static HRESULT WINAPI sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFEREN newsegmentargs args;
TRACE("pin %p %s:%s, start %s, stop %s, rate %.16e.\n", pin, debugstr_w(pin->pin.filter->name), - debugstr_w(pin->pin.name), debugstr_time(start), debugstr_time(stop), rate); + debugstr_w(pin->pin.name), debugstr_reftime(start), debugstr_reftime(stop), rate);
if (pin->pFuncsTable->sink_new_segment) return pin->pFuncsTable->sink_new_segment(pin, start, stop, rate); diff --git a/libs/strmbase/renderer.c b/libs/strmbase/renderer.c index dc421f499ed..ec3909a2089 100644 --- a/libs/strmbase/renderer.c +++ b/libs/strmbase/renderer.c @@ -107,11 +107,11 @@ static void perform_qos(struct strmbase_renderer *filter, }
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)); + debugstr_reftime(start), debugstr_reftime(entered), debugstr_reftime(left), + debugstr_reftime(pt), debugstr_reftime(duration), debugstr_reftime(jitter));
TRACE("average duration %s, average pt %s, average rate %.16e.\n", - debugstr_time(filter->avg_duration), debugstr_time(filter->avg_pt), filter->avg_rate); + debugstr_reftime(filter->avg_duration), debugstr_reftime(filter->avg_pt), filter->avg_rate);
/* Collect running averages. For first observations, we copy the values. */ if (filter->avg_duration < 0) @@ -527,7 +527,7 @@ static HRESULT WINAPI quality_control_Notify(IQualityControl *iface, IBaseFilter HRESULT hr = S_FALSE;
TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n", - filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + filter, sender, q.Type, q.Proportion, debugstr_reftime(q.Late), debugstr_reftime(q.TimeStamp));
if (filter->qc_sink) return IQualityControl_Notify(filter->qc_sink, &filter->filter.IBaseFilter_iface, q); diff --git a/libs/strmbase/seeking.c b/libs/strmbase/seeking.c index 91e9ccedfb4..23e3af4f9e1 100644 --- a/libs/strmbase/seeking.c +++ b/libs/strmbase/seeking.c @@ -222,8 +222,8 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * LONGLONG llNewCurrent, llNewStop;
TRACE("iface %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", iface, - pCurrent ? debugstr_time(*pCurrent) : "<null>", dwCurrentFlags, - pStop ? debugstr_time(*pStop): "<null>", dwStopFlags); + pCurrent ? debugstr_reftime(*pCurrent) : "<null>", dwCurrentFlags, + pStop ? debugstr_reftime(*pStop): "<null>", dwStopFlags);
EnterCriticalSection(&This->cs);
@@ -235,7 +235,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * if (llNewStop != This->llStop) bChangeStop = TRUE;
- TRACE("Seeking from %s to %s.\n", debugstr_time(This->llCurrent), debugstr_time(llNewCurrent)); + TRACE("Seeking from %s to %s.\n", debugstr_reftime(This->llCurrent), debugstr_reftime(llNewCurrent));
This->llCurrent = llNewCurrent; This->llStop = llNewStop; diff --git a/libs/strmbase/strmbase_private.h b/libs/strmbase/strmbase_private.h index cf702a279c2..374b10e7d51 100644 --- a/libs/strmbase/strmbase_private.h +++ b/libs/strmbase/strmbase_private.h @@ -30,25 +30,4 @@ #include "wine/list.h" #include "wine/strmbase.h"
-static inline const char *debugstr_time(REFERENCE_TIME time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - #endif /* __WINE_STRMBASE_PRIVATE_H */