amstream: Implement AMAudioStream::BeginFlush() and ::EndFlush().
Signed-off-by: Anton Baskanov <baskanov@gmail.com> Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
d1197ffaeb
commit
ae1ca7029a
|
@ -56,6 +56,7 @@ struct audio_stream
|
||||||
WAVEFORMATEX format;
|
WAVEFORMATEX format;
|
||||||
FILTER_STATE state;
|
FILTER_STATE state;
|
||||||
BOOL eos;
|
BOOL eos;
|
||||||
|
BOOL flushing;
|
||||||
struct list receive_queue;
|
struct list receive_queue;
|
||||||
struct list update_queue;
|
struct list update_queue;
|
||||||
};
|
};
|
||||||
|
@ -1084,7 +1085,7 @@ static HRESULT WINAPI audio_sink_EndOfStream(IPin *iface)
|
||||||
|
|
||||||
EnterCriticalSection(&stream->cs);
|
EnterCriticalSection(&stream->cs);
|
||||||
|
|
||||||
if (stream->eos)
|
if (stream->eos || stream->flushing)
|
||||||
{
|
{
|
||||||
LeaveCriticalSection(&stream->cs);
|
LeaveCriticalSection(&stream->cs);
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
@ -1101,14 +1102,34 @@ static HRESULT WINAPI audio_sink_EndOfStream(IPin *iface)
|
||||||
|
|
||||||
static HRESULT WINAPI audio_sink_BeginFlush(IPin *iface)
|
static HRESULT WINAPI audio_sink_BeginFlush(IPin *iface)
|
||||||
{
|
{
|
||||||
FIXME("iface %p, stub!\n", iface);
|
struct audio_stream *stream = impl_from_IPin(iface);
|
||||||
return E_NOTIMPL;
|
|
||||||
|
TRACE("stream %p.\n", stream);
|
||||||
|
|
||||||
|
EnterCriticalSection(&stream->cs);
|
||||||
|
|
||||||
|
stream->flushing = TRUE;
|
||||||
|
stream->eos = FALSE;
|
||||||
|
flush_receive_queue(stream);
|
||||||
|
|
||||||
|
LeaveCriticalSection(&stream->cs);
|
||||||
|
|
||||||
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI audio_sink_EndFlush(IPin *iface)
|
static HRESULT WINAPI audio_sink_EndFlush(IPin *iface)
|
||||||
{
|
{
|
||||||
FIXME("iface %p, stub!\n", iface);
|
struct audio_stream *stream = impl_from_IPin(iface);
|
||||||
return E_NOTIMPL;
|
|
||||||
|
TRACE("stream %p.\n", stream);
|
||||||
|
|
||||||
|
EnterCriticalSection(&stream->cs);
|
||||||
|
|
||||||
|
stream->flushing = FALSE;
|
||||||
|
|
||||||
|
LeaveCriticalSection(&stream->cs);
|
||||||
|
|
||||||
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI audio_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate)
|
static HRESULT WINAPI audio_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate)
|
||||||
|
@ -1219,6 +1240,11 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample *
|
||||||
LeaveCriticalSection(&stream->cs);
|
LeaveCriticalSection(&stream->cs);
|
||||||
return VFW_E_WRONG_STATE;
|
return VFW_E_WRONG_STATE;
|
||||||
}
|
}
|
||||||
|
if (stream->flushing)
|
||||||
|
{
|
||||||
|
LeaveCriticalSection(&stream->cs);
|
||||||
|
return S_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
hr = IMediaSample_GetPointer(sample, &pointer);
|
hr = IMediaSample_GetPointer(sample, &pointer);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
|
|
|
@ -3084,6 +3084,129 @@ static void test_audiostream_initialize(void)
|
||||||
ok(!ref, "Got outstanding refcount %d.\n", ref);
|
ok(!ref, "Got outstanding refcount %d.\n", ref);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_audiostream_begin_flush_end_flush(void)
|
||||||
|
{
|
||||||
|
static const WAVEFORMATEX format =
|
||||||
|
{
|
||||||
|
.wFormatTag = WAVE_FORMAT_PCM,
|
||||||
|
.nChannels = 1,
|
||||||
|
.nSamplesPerSec = 11025,
|
||||||
|
.wBitsPerSample = 16,
|
||||||
|
.nBlockAlign = 2,
|
||||||
|
.nAvgBytesPerSec = 2 * 11025,
|
||||||
|
};
|
||||||
|
|
||||||
|
const AM_MEDIA_TYPE mt =
|
||||||
|
{
|
||||||
|
.majortype = MEDIATYPE_Audio,
|
||||||
|
.subtype = MEDIASUBTYPE_PCM,
|
||||||
|
.formattype = FORMAT_WaveFormatEx,
|
||||||
|
.cbFormat = sizeof(WAVEFORMATEX),
|
||||||
|
.pbFormat = (BYTE *)&format,
|
||||||
|
};
|
||||||
|
|
||||||
|
IAMMultiMediaStream *mmstream = create_ammultimediastream();
|
||||||
|
IAudioStreamSample *stream_sample;
|
||||||
|
IAudioMediaStream *audio_stream;
|
||||||
|
IMediaSample *media_sample;
|
||||||
|
struct testfilter source;
|
||||||
|
IAudioData *audio_data;
|
||||||
|
IGraphBuilder *graph;
|
||||||
|
IMediaStream *stream;
|
||||||
|
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_PrimaryAudio, 0, &stream);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_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 = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
hr = IAudioData_SetBuffer(audio_data, 16, NULL, 0);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &stream_sample);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
|
||||||
|
hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt);
|
||||||
|
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 = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
ref = get_refcount(media_sample);
|
||||||
|
ok(ref == 2, "Got unexpected refcount %d.\n", ref);
|
||||||
|
|
||||||
|
hr = IPin_EndOfStream(pin);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
|
||||||
|
hr = IPin_BeginFlush(pin);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
|
||||||
|
ref = IMediaSample_Release(media_sample);
|
||||||
|
ok(!ref, "Got outstanding refcount %d.\n", ref);
|
||||||
|
|
||||||
|
hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample);
|
||||||
|
ok(hr == S_FALSE, "Got hr %#x.\n", hr);
|
||||||
|
|
||||||
|
ref = IMediaSample_Release(media_sample);
|
||||||
|
ok(!ref, "Got outstanding refcount %d.\n", ref);
|
||||||
|
|
||||||
|
hr = IAudioStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0);
|
||||||
|
ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr);
|
||||||
|
|
||||||
|
hr = IPin_EndOfStream(pin);
|
||||||
|
ok(hr == E_FAIL, "Got hr %#x.\n", hr);
|
||||||
|
|
||||||
|
hr = IPin_EndFlush(pin);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
|
||||||
|
hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
ref = IMediaSample_Release(media_sample);
|
||||||
|
ok(ref == 1, "Got outstanding refcount %d.\n", ref);
|
||||||
|
|
||||||
|
hr = IPin_EndOfStream(pin);
|
||||||
|
ok(hr == S_OK, "Got hr %#x.\n", hr);
|
||||||
|
|
||||||
|
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 = IAudioStreamSample_Release(stream_sample);
|
||||||
|
ok(!ref, "Got outstanding refcount %d.\n", ref);
|
||||||
|
ref = IAudioData_Release(audio_data);
|
||||||
|
ok(!ref, "Got outstanding refcount %d.\n", ref);
|
||||||
|
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);
|
||||||
|
IAudioMediaStream_Release(audio_stream);
|
||||||
|
ref = IMediaStream_Release(stream);
|
||||||
|
ok(!ref, "Got outstanding refcount %d.\n", ref);
|
||||||
|
}
|
||||||
|
|
||||||
static void CALLBACK apc_func(ULONG_PTR param)
|
static void CALLBACK apc_func(ULONG_PTR param)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -3820,6 +3943,7 @@ START_TEST(amstream)
|
||||||
test_audiostream_end_of_stream();
|
test_audiostream_end_of_stream();
|
||||||
test_audiostream_receive();
|
test_audiostream_receive();
|
||||||
test_audiostream_initialize();
|
test_audiostream_initialize();
|
||||||
|
test_audiostream_begin_flush_end_flush();
|
||||||
|
|
||||||
test_audiostreamsample_update();
|
test_audiostreamsample_update();
|
||||||
test_audiostreamsample_completion_status();
|
test_audiostreamsample_completion_status();
|
||||||
|
|
Loading…
Reference in New Issue