Zebediah Figura : amstream: Reimplement IPin::EnumMediaTypes() for the primary video stream.
Alexandre Julliard
julliard at winehq.org
Tue Sep 3 16:34:07 CDT 2019
Module: wine
Branch: master
Commit: 98c591b2ba53b24e64b001f09d30bb2f66fd2587
URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c591b2ba53b24e64b001f09d30bb2f66fd2587
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Sep 2 20:24:04 2019 -0500
amstream: Reimplement IPin::EnumMediaTypes() for the primary video stream.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/amstream/ddrawstream.c | 146 ++++++++++++++++++++++++++++++++++++++++-
dlls/amstream/tests/amstream.c | 24 +++----
2 files changed, 157 insertions(+), 13 deletions(-)
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 4c00b95..c497d8b 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -448,6 +448,130 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStreamImpl_IDirect
DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetTimePerFrame
};
+struct enum_media_types
+{
+ IEnumMediaTypes IEnumMediaTypes_iface;
+ LONG refcount;
+ unsigned int index;
+};
+
+static const IEnumMediaTypesVtbl enum_media_types_vtbl;
+
+static struct enum_media_types *impl_from_IEnumMediaTypes(IEnumMediaTypes *iface)
+{
+ return CONTAINING_RECORD(iface, struct enum_media_types, IEnumMediaTypes_iface);
+}
+
+static HRESULT WINAPI enum_media_types_QueryInterface(IEnumMediaTypes *iface, REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IEnumMediaTypes))
+ {
+ IEnumMediaTypes_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI enum_media_types_AddRef(IEnumMediaTypes *iface)
+{
+ struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
+ ULONG refcount = InterlockedIncrement(&enum_media_types->refcount);
+ TRACE("%p increasing refcount to %u.\n", enum_media_types, refcount);
+ return refcount;
+}
+
+static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface)
+{
+ struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
+ ULONG refcount = InterlockedDecrement(&enum_media_types->refcount);
+ TRACE("%p decreasing refcount to %u.\n", enum_media_types, refcount);
+ if (!refcount)
+ heap_free(enum_media_types);
+ return refcount;
+}
+
+static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, AM_MEDIA_TYPE **mts, ULONG *ret_count)
+{
+ struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
+
+ TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count);
+
+ if (!ret_count)
+ return E_POINTER;
+
+ if (count && !enum_media_types->index)
+ {
+ mts[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE));
+ memset(mts[0], 0, sizeof(AM_MEDIA_TYPE));
+ mts[0]->majortype = MEDIATYPE_Video;
+ mts[0]->subtype = MEDIASUBTYPE_RGB8;
+ mts[0]->bFixedSizeSamples = TRUE;
+ mts[0]->lSampleSize = 10000;
+ ++enum_media_types->index;
+ *ret_count = 1;
+ return count == 1 ? S_OK : S_FALSE;
+ }
+
+ *ret_count = 0;
+ return count ? S_FALSE : S_OK;
+}
+
+static HRESULT WINAPI enum_media_types_Skip(IEnumMediaTypes *iface, ULONG count)
+{
+ struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
+
+ TRACE("iface %p, count %u.\n", iface, count);
+
+ enum_media_types->index += count;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI enum_media_types_Reset(IEnumMediaTypes *iface)
+{
+ struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ enum_media_types->index = 0;
+ return S_OK;
+}
+
+static HRESULT WINAPI enum_media_types_Clone(IEnumMediaTypes *iface, IEnumMediaTypes **out)
+{
+ struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
+ struct enum_media_types *object;
+
+ TRACE("iface %p, out %p.\n", iface, out);
+
+ if (!(object = heap_alloc(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl;
+ object->refcount = 1;
+ object->index = enum_media_types->index;
+
+ *out = &object->IEnumMediaTypes_iface;
+ return S_OK;
+}
+
+static const IEnumMediaTypesVtbl enum_media_types_vtbl =
+{
+ enum_media_types_QueryInterface,
+ enum_media_types_AddRef,
+ enum_media_types_Release,
+ enum_media_types_Next,
+ enum_media_types_Skip,
+ enum_media_types_Reset,
+ enum_media_types_Clone,
+};
+
static inline DirectDrawMediaStreamInputPin *impl_from_DirectDrawMediaStreamInputPin_IPin(IPin *iface)
{
return CONTAINING_RECORD(iface, DirectDrawMediaStreamInputPin, pin.pin.IPin_iface);
@@ -475,6 +599,26 @@ static ULONG WINAPI DirectDrawMediaStreamInputPin_IPin_Release(IPin *iface)
return IAMMediaStream_Release(&This->parent->IAMMediaStream_iface);
}
+static HRESULT WINAPI ddraw_pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types)
+{
+ struct enum_media_types *object;
+
+ TRACE("iface %p, enum_media_types %p.\n", iface, enum_media_types);
+
+ if (!enum_media_types)
+ return E_POINTER;
+
+ if (!(object = heap_alloc(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl;
+ object->refcount = 1;
+ object->index = 0;
+
+ *enum_media_types = &object->IEnumMediaTypes_iface;
+ return S_OK;
+}
+
static const IPinVtbl DirectDrawMediaStreamInputPin_IPin_Vtbl =
{
DirectDrawMediaStreamInputPin_IPin_QueryInterface,
@@ -489,7 +633,7 @@ static const IPinVtbl DirectDrawMediaStreamInputPin_IPin_Vtbl =
BasePinImpl_QueryDirection,
BasePinImpl_QueryId,
BasePinImpl_QueryAccept,
- BasePinImpl_EnumMediaTypes,
+ ddraw_pin_EnumMediaTypes,
BasePinImpl_QueryInternalConnections,
BaseInputPinImpl_EndOfStream,
BaseInputPinImpl_BeginFlush,
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index 75862e7..c224d00 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -1648,7 +1648,7 @@ static void test_enum_media_types(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL);
- todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr);
+ ok(hr == E_POINTER, "Got hr %#x.\n", hr);
hr = IEnumMediaTypes_Next(enum1, 0, mts, &count);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -1660,15 +1660,15 @@ static void test_enum_media_types(void)
CoTaskMemFree(mts[0]);
hr = IEnumMediaTypes_Next(enum1, 1, mts, &count);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
- todo_wine ok(!count, "Got count %u.\n", count);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(!count, "Got count %u.\n", count);
hr = IEnumMediaTypes_Reset(enum1);
ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IEnumMediaTypes_Next(enum1, 2, mts, &count);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
- todo_wine ok(count == 1, "Got count %u.\n", count);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(count == 1, "Got count %u.\n", count);
CoTaskMemFree(mts[0]);
hr = IEnumMediaTypes_Reset(enum1);
@@ -1681,8 +1681,8 @@ static void test_enum_media_types(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IEnumMediaTypes_Next(enum1, 1, mts, &count);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
- todo_wine ok(!count, "Got count %u.\n", count);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(!count, "Got count %u.\n", count);
hr = IEnumMediaTypes_Next(enum2, 1, mts, &count);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -1801,18 +1801,18 @@ static void test_media_types(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL);
- todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr);
+ ok(hr == E_POINTER, "Got hr %#x.\n", hr);
hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(count == 1, "Got count %u.\n", count);
ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n",
wine_dbgstr_guid(&pmt->majortype));
- todo_wine ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB8), "Got subtype %s\n",
+ ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB8), "Got subtype %s\n",
wine_dbgstr_guid(&pmt->subtype));
- todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples);
+ ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples);
ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression);
- todo_wine ok(pmt->lSampleSize == 10000, "Got sample size %u.\n", pmt->lSampleSize);
+ ok(pmt->lSampleSize == 10000, "Got sample size %u.\n", pmt->lSampleSize);
ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n",
wine_dbgstr_guid(&pmt->formattype));
ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk);
@@ -1854,7 +1854,7 @@ static void test_media_types(void)
CoTaskMemFree(pmt);
hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
IEnumMediaTypes_Release(enummt);
IPin_Release(pin);
More information about the wine-cvs
mailing list