Zebediah Figura : winegstreamer: Move the IWMReaderTimecode implementation to the wm_reader object.
Alexandre Julliard
julliard at winehq.org
Thu Oct 21 16:04:15 CDT 2021
Module: wine
Branch: master
Commit: 37e9f0eadae9f62ccae8919a92686695927e9274
URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e9f0eadae9f62ccae8919a92686695927e9274
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Wed Oct 20 22:48:41 2021 -0500
winegstreamer: Move the IWMReaderTimecode implementation to the wm_reader object.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/gst_private.h | 1 +
dlls/winegstreamer/wm_asyncreader.c | 52 -----------------------------------
dlls/winegstreamer/wm_reader.c | 55 +++++++++++++++++++++++++++++++++++++
dlls/wmvcore/tests/wmvcore.c | 2 +-
4 files changed, 57 insertions(+), 53 deletions(-)
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index be72f6694c7..c757dfbefd8 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -120,6 +120,7 @@ struct wm_reader
IWMPacketSize2 IWMPacketSize2_iface;
IWMProfile3 IWMProfile3_iface;
IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface;
+ IWMReaderTimecode IWMReaderTimecode_iface;
LONG refcount;
const struct wm_reader_ops *ops;
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index 0a240ff55c5..12b96245707 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -30,7 +30,6 @@ struct async_reader
IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface;
IWMReaderStreamClock IWMReaderStreamClock_iface;
IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface;
- IWMReaderTimecode IWMReaderTimecode_iface;
IReferenceClock IReferenceClock_iface;
};
@@ -1143,53 +1142,6 @@ static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl =
negotiation_TryOutputProps
};
-static struct async_reader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface)
-{
- return CONTAINING_RECORD(iface, struct async_reader, IWMReaderTimecode_iface);
-}
-
-static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID riid, void **ppv)
-{
- struct async_reader *This = impl_from_IWMReaderTimecode(iface);
- return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
-}
-
-static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface)
-{
- struct async_reader *This = impl_from_IWMReaderTimecode(iface);
- return IWMReader_AddRef(&This->IWMReader_iface);
-}
-
-static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface)
-{
- struct async_reader *This = impl_from_IWMReaderTimecode(iface);
- return IWMReader_Release(&This->IWMReader_iface);
-}
-
-static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, WORD num, WORD *count)
-{
- struct async_reader *This = impl_from_IWMReaderTimecode(iface);
- FIXME("%p, %d, %p\n", This, num, count);
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface, WORD stream, WORD range,
- DWORD *start_timecode, DWORD *end_timecode)
-{
- struct async_reader *This = impl_from_IWMReaderTimecode(iface);
- FIXME("%p, %d, %d, %p, %p\n", This, stream, range, start_timecode, end_timecode);
- return E_NOTIMPL;
-}
-
-static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl =
-{
- timecode_QueryInterface,
- timecode_AddRef,
- timecode_Release,
- timecode_GetTimecodeRangeCount,
- timecode_GetTimecodeRangeBounds
-};
-
static struct async_reader *impl_from_IReferenceClock(IReferenceClock *iface)
{
return CONTAINING_RECORD(iface, struct async_reader, IReferenceClock_iface);
@@ -1291,9 +1243,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid)
if (IsEqualIID(iid, &IID_IWMReaderStreamClock))
return &reader->IWMReaderStreamClock_iface;
- if (IsEqualIID(iid, &IID_IWMReaderTimecode))
- return &reader->IWMReaderTimecode_iface;
-
if (IsEqualIID(iid, &IID_IWMReaderTypeNegotiation))
return &reader->IWMReaderTypeNegotiation_iface;
@@ -1332,7 +1281,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader)
object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl;
object->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl;
object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl;
- object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl;
object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl;
TRACE("Created async reader %p.\n", object);
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 1627dead3d6..963d33afe0f 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -57,6 +57,10 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi
{
*out = &reader->IWMReaderPlaylistBurn_iface;
}
+ else if (IsEqualIID(iid, &IID_IWMReaderTimecode))
+ {
+ *out = &reader->IWMReaderTimecode_iface;
+ }
else if (!(*out = reader->ops->query_interface(reader, iid)))
{
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
@@ -705,6 +709,56 @@ static const IWMReaderPlaylistBurnVtbl playlist_vtbl =
playlist_EndPlaylistBurn,
};
+static struct wm_reader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface)
+{
+ return CONTAINING_RECORD(iface, struct wm_reader, IWMReaderTimecode_iface);
+}
+
+static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID iid, void **out)
+{
+ struct wm_reader *reader = impl_from_IWMReaderTimecode(iface);
+
+ return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out);
+}
+
+static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface)
+{
+ struct wm_reader *reader = impl_from_IWMReaderTimecode(iface);
+
+ return IWMProfile3_AddRef(&reader->IWMProfile3_iface);
+}
+
+static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface)
+{
+ struct wm_reader *reader = impl_from_IWMReaderTimecode(iface);
+
+ return IWMProfile3_Release(&reader->IWMProfile3_iface);
+}
+
+static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface,
+ WORD stream_number, WORD *count)
+{
+ FIXME("iface %p, stream_number %u, count %p, stub!\n", iface, stream_number, count);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface,
+ WORD stream_number, WORD index, DWORD *start, DWORD *end)
+{
+ FIXME("iface %p, stream_number %u, index %u, start %p, end %p, stub!\n",
+ iface, stream_number, index, start, end);
+ return E_NOTIMPL;
+}
+
+static const IWMReaderTimecodeVtbl timecode_vtbl =
+{
+ timecode_QueryInterface,
+ timecode_AddRef,
+ timecode_Release,
+ timecode_GetTimecodeRangeCount,
+ timecode_GetTimecodeRangeBounds,
+};
+
void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops)
{
reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl;
@@ -712,6 +766,7 @@ void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops)
reader->IWMPacketSize2_iface.lpVtbl = &packet_size_vtbl;
reader->IWMProfile3_iface.lpVtbl = &profile_vtbl;
reader->IWMReaderPlaylistBurn_iface.lpVtbl = &playlist_vtbl;
+ reader->IWMReaderTimecode_iface.lpVtbl = &timecode_vtbl;
reader->refcount = 1;
reader->ops = ops;
}
diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c
index 5c9e9551495..79bcfef0d52 100644
--- a/dlls/wmvcore/tests/wmvcore.c
+++ b/dlls/wmvcore/tests/wmvcore.c
@@ -154,7 +154,7 @@ static void test_wmsyncreader_interfaces(void)
check_interface(reader, &IID_IWMProfile2, TRUE);
check_interface(reader, &IID_IWMProfile3, TRUE);
check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE);
- todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE);
+ check_interface(reader, &IID_IWMReaderTimecode, TRUE);
check_interface(reader, &IID_IWMSyncReader, TRUE);
check_interface(reader, &IID_IWMSyncReader2, TRUE);
More information about the wine-cvs
mailing list