Anton Baskanov : amstream: Implement AMDirectDrawStream::NewSegment.
Alexandre Julliard
julliard at winehq.org
Tue Oct 6 15:33:11 CDT 2020
Module: wine
Branch: master
Commit: 6bfa705e3cf9cab2bb5025bc6f218195e79a20aa
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bfa705e3cf9cab2bb5025bc6f218195e79a20aa
Author: Anton Baskanov <baskanov at gmail.com>
Date: Tue Oct 6 09:09:49 2020 +0700
amstream: Implement AMDirectDrawStream::NewSegment.
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 | 24 +++++++--
dlls/amstream/tests/amstream.c | 120 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 140 insertions(+), 4 deletions(-)
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index befdd093b0..6ea99d4915 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -58,6 +58,7 @@ struct ddraw_stream
AM_MEDIA_TYPE mt;
struct format format;
FILTER_STATE state;
+ REFERENCE_TIME segment_start;
BOOL eos;
BOOL flushing;
CONDITION_VARIABLE update_queued_cv;
@@ -1192,9 +1193,18 @@ static HRESULT WINAPI ddraw_sink_EndFlush(IPin *iface)
static HRESULT WINAPI ddraw_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate)
{
- FIXME("iface %p, start %s, stop %s, rate %0.16e, stub!\n",
- iface, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate);
- return E_NOTIMPL;
+ struct ddraw_stream *stream = impl_from_IPin(iface);
+
+ TRACE("stream %p, start %s, stop %s, rate %0.16e\n",
+ stream, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate);
+
+ EnterCriticalSection(&stream->cs);
+
+ stream->segment_start = start;
+
+ LeaveCriticalSection(&stream->cs);
+
+ return S_OK;
}
static const IPinVtbl ddraw_sink_vtbl =
@@ -1288,6 +1298,8 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample *
BITMAPINFOHEADER *bitmap_info;
REFERENCE_TIME start_time = 0;
REFERENCE_TIME end_time = 0;
+ STREAM_TIME start_stream_time;
+ STREAM_TIME end_stream_time;
BYTE *top_down_pointer;
int top_down_stride;
BYTE *pointer;
@@ -1313,6 +1325,9 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample *
top_down_stride = top_down ? stride : -stride;
top_down_pointer = top_down ? pointer : pointer + stride * (bitmap_info->biHeight - 1);
+ start_stream_time = start_time + stream->segment_start;
+ end_stream_time = end_time + stream->segment_start;
+
for (;;)
{
if (stream->state == State_Stopped)
@@ -1329,7 +1344,8 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample *
{
struct ddraw_sample *sample = LIST_ENTRY(list_head(&stream->update_queue), struct ddraw_sample, entry);
- sample->update_hr = process_update(sample, top_down_stride, top_down_pointer, start_time, end_time);
+ sample->update_hr = process_update(sample, top_down_stride, top_down_pointer,
+ start_stream_time, end_stream_time);
remove_queued_update(sample);
LeaveCriticalSection(&stream->cs);
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index 88f98a8b19..285dc0f054 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -5315,6 +5315,125 @@ static void test_ddrawstream_begin_flush_end_flush(void)
ok(!ref, "Got outstanding refcount %d.\n", ref);
}
+static void test_ddrawstream_new_segment(void)
+{
+ static const BYTE test_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+ IAMMultiMediaStream *mmstream = create_ammultimediastream();
+ IDirectDrawStreamSample *stream_sample;
+ IDirectDrawMediaStream *ddraw_stream;
+ IMemInputPin *mem_input_pin;
+ IMediaSample *media_sample;
+ IMediaFilter *media_filter;
+ struct testfilter source;
+ STREAM_TIME start_time;
+ STREAM_TIME end_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 = IMediaStream_QueryInterface(stream, &IID_IMemInputPin, (void **)&mem_input_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");
+ hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&media_filter);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ testfilter_init(&source);
+ hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IMediaFilter_SetSyncSource(media_filter, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ video_info = rgb32_video_info;
+ video_info.bmiHeader.biWidth = 3;
+ video_info.bmiHeader.biHeight = 1;
+ 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);
+
+ hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &stream_sample);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IPin_NewSegment(pin, 11111111, 22222222, 1.0);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0);
+ ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr);
+
+ media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data));
+ start_time = 12345678;
+ end_time = 23456789;
+ hr = IMediaSample_SetTime(media_sample, &start_time, &end_time);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = IMemInputPin_Receive(mem_input_pin, media_sample);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ IMediaSample_Release(media_sample);
+
+ start_time = 0xdeadbeefdeadbeef;
+ end_time = 0xdeadbeefdeadbeef;
+ hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
+ ok(end_time == 34567900, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+
+ hr = IPin_NewSegment(pin, 11111111, 22222222, 2.0);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0);
+ ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr);
+
+ media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data));
+ start_time = 12345678;
+ end_time = 23456789;
+ hr = IMediaSample_SetTime(media_sample, &start_time, &end_time);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = IMemInputPin_Receive(mem_input_pin, media_sample);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ IMediaSample_Release(media_sample);
+
+ start_time = 0xdeadbeefdeadbeef;
+ end_time = 0xdeadbeefdeadbeef;
+ hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
+ ok(end_time == 34567900, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+
+ hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ IGraphBuilder_Disconnect(graph, pin);
+ IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface);
+
+ ref = IDirectDrawStreamSample_Release(stream_sample);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ ref = IAMMultiMediaStream_Release(mmstream);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ IMediaFilter_Release(media_filter);
+ ref = IGraphBuilder_Release(graph);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ IPin_Release(pin);
+ IMemInputPin_Release(mem_input_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();
@@ -7838,6 +7957,7 @@ START_TEST(amstream)
test_ddrawstream_set_format();
test_ddrawstream_receive();
test_ddrawstream_begin_flush_end_flush();
+ test_ddrawstream_new_segment();
test_ddrawstreamsample_get_media_stream();
test_ddrawstreamsample_update();
More information about the wine-cvs
mailing list