Nikolay Sivov : mf: Implement dynamic stream management methods in SAR.
Alexandre Julliard
julliard at winehq.org
Tue Apr 7 15:27:16 CDT 2020
Module: wine
Branch: master
Commit: 56e03da60f372f795ca5e640f7605c2ed52d6e43
URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e03da60f372f795ca5e640f7605c2ed52d6e43
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Apr 7 10:54:57 2020 +0300
mf: Implement dynamic stream management methods in SAR.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/sar.c | 46 ++++++++++++++++++++++++++++++++++++++--------
dlls/mf/tests/mf.c | 35 ++++++++++++++++++++++++++++++++++-
2 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c
index 7acbd5d4cd..ca8800b06c 100644
--- a/dlls/mf/sar.c
+++ b/dlls/mf/sar.c
@@ -19,6 +19,7 @@
#define COBJMACROS
#include "mfidl.h"
+#include "mferror.h"
#include "mf_private.h"
#include "wine/debug.h"
@@ -30,6 +31,8 @@ struct audio_renderer
{
IMFMediaSink IMFMediaSink_iface;
LONG refcount;
+ BOOL is_shut_down;
+ CRITICAL_SECTION cs;
};
static struct audio_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface)
@@ -70,7 +73,10 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface)
TRACE("%p, refcount %u.\n", iface, refcount);
if (!refcount)
+ {
+ DeleteCriticalSection(&renderer->cs);
heap_free(renderer);
+ }
return refcount;
}
@@ -85,23 +91,37 @@ static HRESULT WINAPI audio_renderer_sink_GetCharacteristics(IMFMediaSink *iface
static HRESULT WINAPI audio_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD stream_sink_id,
IMFMediaType *media_type, IMFStreamSink **stream_sink)
{
- FIXME("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink);
+ struct audio_renderer *renderer = impl_from_IMFMediaSink(iface);
- return E_NOTIMPL;
+ TRACE("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink);
+
+ return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED;
}
static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, DWORD stream_sink_id)
{
- FIXME("%p, %#x.\n", iface, stream_sink_id);
+ struct audio_renderer *renderer = impl_from_IMFMediaSink(iface);
- return E_NOTIMPL;
+ TRACE("%p, %#x.\n", iface, stream_sink_id);
+
+ return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED;
}
static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface, DWORD *count)
{
- FIXME("%p, %p.\n", iface, count);
+ struct audio_renderer *renderer = impl_from_IMFMediaSink(iface);
- return E_NOTIMPL;
+ TRACE("%p, %p.\n", iface, count);
+
+ if (!count)
+ return E_POINTER;
+
+ if (renderer->is_shut_down)
+ return MF_E_SHUTDOWN;
+
+ *count = 1;
+
+ return S_OK;
}
static HRESULT WINAPI audio_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *iface, DWORD index,
@@ -136,9 +156,18 @@ static HRESULT WINAPI audio_renderer_sink_GetPresentationClock(IMFMediaSink *ifa
static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface)
{
- FIXME("%p.\n", iface);
+ struct audio_renderer *renderer = impl_from_IMFMediaSink(iface);
- return E_NOTIMPL;
+ TRACE("%p.\n", iface);
+
+ if (renderer->is_shut_down)
+ return MF_E_SHUTDOWN;
+
+ EnterCriticalSection(&renderer->cs);
+ renderer->is_shut_down = TRUE;
+ LeaveCriticalSection(&renderer->cs);
+
+ return S_OK;
}
static const IMFMediaSinkVtbl audio_renderer_sink_vtbl =
@@ -168,6 +197,7 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context,
renderer->IMFMediaSink_iface.lpVtbl = &audio_renderer_sink_vtbl;
renderer->refcount = 1;
+ InitializeCriticalSection(&renderer->cs);
*obj = (IUnknown *)&renderer->IMFMediaSink_iface;
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 46024d3fba..578c5bcaf7 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -2634,10 +2634,11 @@ static void test_sar(void)
IMFPresentationTimeSource *time_source;
IMFClockStateSink *state_sink;
IMFMediaSink *sink, *sink2;
+ IMFStreamSink *stream_sink;
IMFActivate *activate;
MFCLOCK_STATE state;
+ DWORD flags, count;
IMFClock *clock;
- DWORD flags;
HRESULT hr;
hr = CoInitialize(NULL);
@@ -2679,6 +2680,38 @@ if (SUCCEEDED(hr))
IMFPresentationTimeSource_Release(time_source);
}
+ hr = IMFMediaSink_AddStreamSink(sink, 123, NULL, &stream_sink);
+ ok(hr == MF_E_STREAMSINKS_FIXED, "Unexpected hr %#x.\n", hr);
+
+ hr = IMFMediaSink_RemoveStreamSink(sink, 0);
+ ok(hr == MF_E_STREAMSINKS_FIXED, "Unexpected hr %#x.\n", hr);
+
+ hr = IMFMediaSink_GetStreamSinkCount(sink, NULL);
+ ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);
+
+ hr = IMFMediaSink_GetStreamSinkCount(sink, &count);
+ ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(count == 1, "Unexpected count %u.\n", count);
+
+ /* Shutdown */
+ hr = IMFMediaSink_Shutdown(sink);
+ ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);
+
+ hr = IMFMediaSink_Shutdown(sink);
+ ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
+
+ hr = IMFMediaSink_AddStreamSink(sink, 123, NULL, &stream_sink);
+ ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
+
+ hr = IMFMediaSink_RemoveStreamSink(sink, 0);
+ ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
+
+ hr = IMFMediaSink_GetStreamSinkCount(sink, NULL);
+ ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);
+
+ hr = IMFMediaSink_GetStreamSinkCount(sink, &count);
+ ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
+
IMFMediaSink_Release(sink);
/* Activation */
More information about the wine-cvs
mailing list