Anton Baskanov : amstream: Implement AMDirectDrawStream::GetTimePerFrame.
Alexandre Julliard
julliard at winehq.org
Mon Nov 16 15:28:57 CST 2020
Module: wine
Branch: master
Commit: e5d12458429f4cd3982101ac6ff87d8134d362a0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d12458429f4cd3982101ac6ff87d8134d362a0
Author: Anton Baskanov <baskanov at gmail.com>
Date: Mon Nov 16 22:31:48 2020 +0700
amstream: Implement AMDirectDrawStream::GetTimePerFrame.
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/ddrawstream.c | 23 ++++++++++++++---
dlls/amstream/tests/amstream.c | 58 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 341fd4dff16..d6f07e1b10a 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -717,11 +717,28 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMedia
}
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface,
- STREAM_TIME *pFrameTime)
+ STREAM_TIME *frame_time)
{
- FIXME("(%p)->(%p) stub!\n", iface, pFrameTime);
+ struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface);
- return E_NOTIMPL;
+ TRACE("stream %p, frame_time %p.\n", stream, frame_time);
+
+ if (!frame_time)
+ return E_POINTER;
+
+ EnterCriticalSection(&stream->cs);
+
+ if (!stream->peer)
+ {
+ LeaveCriticalSection(&stream->cs);
+ return MS_E_NOSTREAM;
+ }
+
+ *frame_time = ((VIDEOINFO *)stream->mt.pbFormat)->AvgTimePerFrame;
+
+ LeaveCriticalSection(&stream->cs);
+
+ return S_OK;
}
static const struct IDirectDrawMediaStreamVtbl ddraw_IDirectDrawMediaStream_Vtbl =
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index f5014395832..c5fd5abe620 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -5623,6 +5623,63 @@ static void test_ddrawstream_new_segment(void)
ok(!ref, "Got outstanding refcount %d.\n", ref);
}
+static void test_ddrawstream_get_time_per_frame(void)
+{
+ IAMMultiMediaStream *mmstream = create_ammultimediastream();
+ IDirectDrawMediaStream *ddraw_stream;
+ struct testfilter source;
+ STREAM_TIME frame_time;
+ IGraphBuilder *graph;
+ IMediaStream *stream;
+ VIDEOINFO video_info;
+ AM_MEDIA_TYPE mt;
+ HRESULT hr;
+ ULONG ref;
+ IPin *pin;
+
+ hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(graph != NULL, "Expected non-NULL graph.\n");
+ testfilter_init(&source);
+ hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IDirectDrawMediaStream_GetTimePerFrame(ddraw_stream, NULL);
+ ok(hr == E_POINTER, "Got hr %#x.\n", hr);
+
+ hr = IDirectDrawMediaStream_GetTimePerFrame(ddraw_stream, &frame_time);
+ ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr);
+
+ video_info = rgb32_video_info;
+ video_info.AvgTimePerFrame = 12345678;
+ mt = rgb32_mt;
+ mt.pbFormat = (BYTE *)&video_info;
+ hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ frame_time = 0xdeadbeefdeadbeef;
+ hr = IDirectDrawMediaStream_GetTimePerFrame(ddraw_stream, &frame_time);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(frame_time == 12345678, "Got frame time %s.\n", wine_dbgstr_longlong(frame_time));
+
+ ref = IAMMultiMediaStream_Release(mmstream);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ ref = IGraphBuilder_Release(graph);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ IPin_Release(pin);
+ IDirectDrawMediaStream_Release(ddraw_stream);
+ ref = IMediaStream_Release(stream);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+}
+
static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid)
{
IAMMultiMediaStream *mmstream = create_ammultimediastream();
@@ -8813,6 +8870,7 @@ START_TEST(amstream)
test_ddrawstream_receive();
test_ddrawstream_begin_flush_end_flush();
test_ddrawstream_new_segment();
+ test_ddrawstream_get_time_per_frame();
test_ddrawstreamsample_get_media_stream();
test_ddrawstreamsample_update();
More information about the wine-cvs
mailing list