Anton Baskanov : amstream: Implement MediaStreamFilter::IsFormatSupported.
Alexandre Julliard
julliard at winehq.org
Wed Nov 18 15:47:59 CST 2020
Module: wine
Branch: master
Commit: 16874608d6ba65029a1e72672c35e4e576a39e84
URL: https://source.winehq.org/git/wine.git/?a=commit;h=16874608d6ba65029a1e72672c35e4e576a39e84
Author: Anton Baskanov <baskanov at gmail.com>
Date: Wed Nov 18 00:48:22 2020 +0700
amstream: Implement MediaStreamFilter::IsFormatSupported.
Signed-off-by: Anton Baskanov <baskanov at gmail.com>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/amstream/filter.c | 20 ++++++++++++++++++--
dlls/amstream/tests/amstream.c | 20 ++++++++++++++++++--
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c
index 5fd5b2afdbc..3c0436a294f 100644
--- a/dlls/amstream/filter.c
+++ b/dlls/amstream/filter.c
@@ -848,9 +848,25 @@ static HRESULT WINAPI filter_seeking_CheckCapabilities(IMediaSeeking *iface, DWO
static HRESULT WINAPI filter_seeking_IsFormatSupported(IMediaSeeking *iface, const GUID *format)
{
- FIXME("iface %p, format %s, stub!\n", iface, debugstr_guid(format));
+ struct filter *filter = impl_from_IMediaSeeking(iface);
+ IMediaSeeking *seeking;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("filter %p, format %s.\n", filter, debugstr_guid(format));
+
+ EnterCriticalSection(&filter->cs);
+
+ seeking = get_seeking(filter->seekable_stream);
+
+ LeaveCriticalSection(&filter->cs);
+
+ if (!seeking)
+ return E_NOTIMPL;
+
+ hr = IMediaSeeking_IsFormatSupported(seeking, format);
+ IMediaSeeking_Release(seeking);
+
+ return hr;
}
static HRESULT WINAPI filter_seeking_QueryPreferredFormat(IMediaSeeking *iface, GUID *format)
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index 9a4d5066714..47b92cc8a1a 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -981,6 +981,7 @@ struct testfilter
HRESULT init_stream_hr;
HRESULT cleanup_stream_hr;
HRESULT wait_state_hr;
+ HRESULT is_format_supported_hr;
};
static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface)
@@ -1168,8 +1169,12 @@ static HRESULT WINAPI testsource_seeking_CheckCapabilities(IMediaSeeking *iface,
static HRESULT WINAPI testsource_seeking_IsFormatSupported(IMediaSeeking *iface, const GUID *format)
{
- ok(0, "Unexpected call.\n");
- return E_NOTIMPL;
+ struct testfilter *filter = impl_from_IMediaSeeking(iface);
+
+ ok(IsEqualGUID(format, &TIME_FORMAT_MEDIA_TIME),
+ "Got format %s.\n", wine_dbgstr_guid(format));
+
+ return filter->is_format_supported_hr;
}
static HRESULT WINAPI testsource_seeking_QueryPreferredFormat(IMediaSeeking *iface, GUID *format)
@@ -6409,11 +6414,22 @@ static void check_mediastreamfilter_get_stop_position(IMediaSeeking *seeking, st
ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop));
}
+static void check_mediastreamfilter_is_format_supported(IMediaSeeking *seeking, struct testfilter *source1,
+ struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr)
+{
+ HRESULT hr;
+
+ source2->is_format_supported_hr = source2_hr;
+ hr = IMediaSeeking_IsFormatSupported(seeking, &TIME_FORMAT_MEDIA_TIME);
+ ok(hr == expected_hr, "Got hr %#x.\n", hr);
+}
+
static void test_mediastreamfilter_seeking(void)
{
check_mediastreamfilter_seeking(check_mediastreamfilter_set_positions);
check_mediastreamfilter_seeking(check_mediastreamfilter_get_duration);
check_mediastreamfilter_seeking(check_mediastreamfilter_get_stop_position);
+ check_mediastreamfilter_seeking(check_mediastreamfilter_is_format_supported);
}
static void test_mediastreamfilter_get_current_stream_time(void)
More information about the wine-cvs
mailing list