Commit b6a7a385 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

mfreadwrite/writer: Update some stats on MEStreamSinkRequestSample.

parent 080fe842
...@@ -60,6 +60,7 @@ struct sink_writer ...@@ -60,6 +60,7 @@ struct sink_writer
IMFPresentationClock *clock; IMFPresentationClock *clock;
IMFMediaSink *sink; IMFMediaSink *sink;
enum writer_state state; enum writer_state state;
HRESULT status;
MF_SINK_WRITER_STATISTICS stats; MF_SINK_WRITER_STATISTICS stats;
CRITICAL_SECTION cs; CRITICAL_SECTION cs;
...@@ -419,7 +420,9 @@ static HRESULT WINAPI sink_writer_GetStatistics(IMFSinkWriter *iface, DWORD inde ...@@ -419,7 +420,9 @@ static HRESULT WINAPI sink_writer_GetStatistics(IMFSinkWriter *iface, DWORD inde
EnterCriticalSection(&writer->cs); EnterCriticalSection(&writer->cs);
if (index == MF_SINK_WRITER_ALL_STREAMS) if (FAILED(writer->status))
hr = writer->status;
else if (index == MF_SINK_WRITER_ALL_STREAMS)
*stats = writer->stats; *stats = writer->stats;
else if ((stream = sink_writer_get_stream(writer, index))) else if ((stream = sink_writer_get_stream(writer, index)))
*stats = stream->stats; *stats = stream->stats;
...@@ -483,12 +486,28 @@ static HRESULT WINAPI sink_writer_callback_GetParameters(IMFAsyncCallback *iface ...@@ -483,12 +486,28 @@ static HRESULT WINAPI sink_writer_callback_GetParameters(IMFAsyncCallback *iface
return E_NOTIMPL; return E_NOTIMPL;
} }
static struct stream *sink_writer_get_stream_for_stream_sink(struct sink_writer *writer, IMFStreamSink *stream_sink)
{
size_t i;
for (i = 0; i < writer->streams.count; ++i)
{
if (writer->streams.items[i].stream_sink == stream_sink)
return &writer->streams.items[i];
}
return NULL;
}
static HRESULT WINAPI sink_writer_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) static HRESULT WINAPI sink_writer_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
{ {
struct sink_writer *writer = impl_from_events_callback_IMFAsyncCallback(iface);
IMFStreamSink *stream_sink; IMFStreamSink *stream_sink;
MediaEventType event_type; MediaEventType event_type;
struct stream *stream;
IMFMediaEvent *event; IMFMediaEvent *event;
HRESULT hr; LONGLONG timestamp;
HRESULT status, hr;
TRACE("%p, %p.\n", iface, result); TRACE("%p, %p.\n", iface, result);
...@@ -498,9 +517,36 @@ static HRESULT WINAPI sink_writer_events_callback_Invoke(IMFAsyncCallback *iface ...@@ -498,9 +517,36 @@ static HRESULT WINAPI sink_writer_events_callback_Invoke(IMFAsyncCallback *iface
return hr; return hr;
IMFMediaEvent_GetType(event, &event_type); IMFMediaEvent_GetType(event, &event_type);
IMFMediaEvent_GetStatus(event, &status);
TRACE("Got event %lu.\n", event_type); TRACE("Got event %lu.\n", event_type);
EnterCriticalSection(&writer->cs);
if (writer->status == S_OK && FAILED(status))
writer->status = status;
if (writer->status == S_OK && (stream = sink_writer_get_stream_for_stream_sink(writer, stream_sink)))
{
switch (event_type)
{
case MEStreamSinkRequestSample:
timestamp = MFGetSystemTime();
writer->stats.llLastSinkSampleRequest = timestamp;
writer->stats.dwNumOutstandingSinkSampleRequests++;
stream->stats.llLastSinkSampleRequest = timestamp;
stream->stats.dwNumOutstandingSinkSampleRequests++;
break;
default:
;
}
}
LeaveCriticalSection(&writer->cs);
IMFMediaEvent_Release(event); IMFMediaEvent_Release(event);
IMFStreamSink_BeginGetEvent(stream_sink, iface, (IUnknown *)stream_sink); IMFStreamSink_BeginGetEvent(stream_sink, iface, (IUnknown *)stream_sink);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment