ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winegstreamer: Fix pin enumeration order for the AVI and WAVE parsers. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-01-24 09:56:00 -06:00 committed by Alexandre Julliard
parent 0897293b99
commit 0a9acdefe8
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/quartz/tests/avisplit.c
View File

@ -427,7 +427,6 @@ static void test_find_pin(void)
hr = IBaseFilter_FindPin(filter, L"Stream 00", &pin); hr = IBaseFilter_FindPin(filter, L"Stream 00", &pin);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine
ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin);
IPin_Release(pin); IPin_Release(pin);
IPin_Release(pin2); IPin_Release(pin2);
@ -437,7 +436,6 @@ todo_wine
hr = IBaseFilter_FindPin(filter, L"input pin", &pin); hr = IBaseFilter_FindPin(filter, L"input pin", &pin);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine
ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin);
IPin_Release(pin); IPin_Release(pin);
IPin_Release(pin2); IPin_Release(pin2);

2
dlls/quartz/tests/waveparser.c
View File

@ -421,7 +421,6 @@ static void test_find_pin(void)
hr = IBaseFilter_FindPin(filter, L"output", &pin); hr = IBaseFilter_FindPin(filter, L"output", &pin);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine
ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin);
IPin_Release(pin); IPin_Release(pin);
IPin_Release(pin2); IPin_Release(pin2);
@ -431,7 +430,6 @@ todo_wine
hr = IBaseFilter_FindPin(filter, L"input pin", &pin); hr = IBaseFilter_FindPin(filter, L"input pin", &pin);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine
ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin);
IPin_Release(pin); IPin_Release(pin);
IPin_Release(pin2); IPin_Release(pin2);

20
dlls/winegstreamer/gstdemux.c
View File

@ -60,6 +60,7 @@ struct gstdemux
struct gstdemux_source **sources; struct gstdemux_source **sources;
unsigned int source_count; unsigned int source_count;
BOOL enum_sink_first;
LONGLONG filesize; LONGLONG filesize;
@ -1214,10 +1215,20 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig
{ {
struct gstdemux *filter = impl_from_strmbase_filter(base); struct gstdemux *filter = impl_from_strmbase_filter(base);
if (!index) if (filter->enum_sink_first)
return &filter->sink.pin; {
else if (index <= filter->source_count) if (!index)
return &filter->sources[index - 1]->pin.pin; return &filter->sink.pin;
else if (index <= filter->source_count)
return &filter->sources[index - 1]->pin.pin;
}
else
{
if (index < filter->source_count)
return &filter->sources[index]->pin.pin;
else if (index == filter->source_count)
return &filter->sink.pin;
}
return NULL; return NULL;
} }
@ -2510,6 +2521,7 @@ IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr)
object->duration_event = CreateEventW(NULL, FALSE, FALSE, NULL); object->duration_event = CreateEventW(NULL, FALSE, FALSE, NULL);
object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL);
object->init_gst = mpeg_splitter_init_gst; object->init_gst = mpeg_splitter_init_gst;
object->enum_sink_first = TRUE;
*phr = S_OK; *phr = S_OK;
TRACE("Created MPEG-1 splitter %p.\n", object); TRACE("Created MPEG-1 splitter %p.\n", object);