Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
0a9acdef
Commit
0a9acdef
authored
Jan 24, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Jan 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
0897293b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
8 deletions
+16
-8
avisplit.c
dlls/quartz/tests/avisplit.c
+0
-2
waveparser.c
dlls/quartz/tests/waveparser.c
+0
-2
gstdemux.c
dlls/winegstreamer/gstdemux.c
+16
-4
No files found.
dlls/quartz/tests/avisplit.c
View file @
0a9acdef
...
@@ -427,7 +427,6 @@ static void test_find_pin(void)
...
@@ -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
...
@@ -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
);
...
...
dlls/quartz/tests/waveparser.c
View file @
0a9acdef
...
@@ -421,7 +421,6 @@ static void test_find_pin(void)
...
@@ -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
...
@@ -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
);
...
...
dlls/winegstreamer/gstdemux.c
View file @
0a9acdef
...
@@ -60,6 +60,7 @@ struct gstdemux
...
@@ -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
...
@@ -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)
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment