Commit ed2c300d authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

winegstreamer: Explicitly disable streams in parser_init_stream().

Allow the initial state of a stream to be enabled. Signed-off-by: 's avatarZebediah Figura <zfigura@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6f1b3cf9
......@@ -961,6 +961,24 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface)
filter->streaming = true;
for (i = 0; i < filter->source_count; ++i)
{
struct parser_source *source = filter->sources[i];
struct wg_format format;
bool ret;
if (source->pin.pin.peer)
{
ret = amt_to_wg_format(&source->pin.pin.mt, &format);
assert(ret);
wg_parser_stream_enable(source->wg_stream, &format);
}
else
{
wg_parser_stream_disable(source->wg_stream);
}
}
/* DirectShow retains the old seek positions, but resets to them every time
* it transitions from stopped -> paused. */
......@@ -1529,8 +1547,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface,
struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface);
unsigned int buffer_size = 16384;
ALLOCATOR_PROPERTIES ret_props;
struct wg_format format;
bool ret;
if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_VideoInfo))
{
......@@ -1545,10 +1561,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface,
buffer_size = format->nAvgBytesPerSec;
}
ret = amt_to_wg_format(&pin->pin.pin.mt, &format);
assert(ret);
wg_parser_stream_enable(pin->wg_stream, &format);
/* We do need to drop any buffers that might have been sent with the old
* caps, but this will be handled in parser_init_stream(). */
......@@ -1558,13 +1570,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface,
return IMemAllocator_SetProperties(allocator, props, &ret_props);
}
static void source_disconnect(struct strmbase_source *iface)
{
struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface);
wg_parser_stream_disable(pin->wg_stream);
}
static void free_source_pin(struct parser_source *pin)
{
if (pin->pin.pin.peer)
......@@ -1590,7 +1595,6 @@ static const struct strmbase_source_ops source_ops =
.pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection,
.pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator,
.pfnDecideBufferSize = GSTOutPin_DecideBufferSize,
.source_disconnect = source_disconnect,
};
static struct parser_source *create_pin(struct parser *filter,
......@@ -1629,9 +1633,6 @@ static HRESULT GST_RemoveOutputPins(struct parser *This)
if (!This->sink_connected)
return S_OK;
/* Disconnecting source pins triggers a call to wg_parser_stream_disable().
* The stream pointers are no longer valid after wg_parser_disconnect(), so
* make sure we disable the streams first. */
for (i = 0; i < This->source_count; ++i)
{
if (This->sources[i])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment