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
a9d63412
Commit
a9d63412
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: Rename the "ppPins" element of struct gstdemux to "sources".
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a7984a3a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
16 deletions
+17
-16
gstdemux.c
dlls/winegstreamer/gstdemux.c
+17
-16
No files found.
dlls/winegstreamer/gstdemux.c
View file @
a9d63412
...
@@ -57,7 +57,8 @@ struct gstdemux
...
@@ -57,7 +57,8 @@ struct gstdemux
struct
strmbase_sink
sink
;
struct
strmbase_sink
sink
;
IAsyncReader
*
reader
;
IAsyncReader
*
reader
;
IMemAllocator
*
alloc
;
IMemAllocator
*
alloc
;
struct
gstdemux_source
**
ppPins
;
struct
gstdemux_source
**
sources
;
LONG
cStreams
;
LONG
cStreams
;
LONGLONG
filesize
;
LONGLONG
filesize
;
...
@@ -842,7 +843,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user)
...
@@ -842,7 +843,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user)
TRACE
(
"%p %p %p
\n
"
,
This
,
bin
,
pad
);
TRACE
(
"%p %p %p
\n
"
,
This
,
bin
,
pad
);
for
(
x
=
0
;
x
<
This
->
cStreams
;
++
x
)
{
for
(
x
=
0
;
x
<
This
->
cStreams
;
++
x
)
{
if
(
This
->
ppPin
s
[
x
]
->
their_src
==
pad
)
if
(
This
->
source
s
[
x
]
->
their_src
==
pad
)
break
;
break
;
}
}
if
(
x
==
This
->
cStreams
)
if
(
x
==
This
->
cStreams
)
...
@@ -853,7 +854,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user)
...
@@ -853,7 +854,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user)
return
;
return
;
}
}
pin
=
This
->
ppPin
s
[
x
];
pin
=
This
->
source
s
[
x
];
if
(
pin
->
flipfilter
)
if
(
pin
->
flipfilter
)
gst_pad_unlink
(
pin
->
their_src
,
pin
->
flip_sink
);
gst_pad_unlink
(
pin
->
their_src
,
pin
->
flip_sink
);
...
@@ -994,7 +995,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user)
...
@@ -994,7 +995,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user)
}
}
for
(
x
=
0
;
x
<
This
->
cStreams
;
++
x
)
{
for
(
x
=
0
;
x
<
This
->
cStreams
;
++
x
)
{
struct
gstdemux_source
*
pin
=
This
->
ppPin
s
[
x
];
struct
gstdemux_source
*
pin
=
This
->
source
s
[
x
];
if
(
!
pin
->
their_src
)
{
if
(
!
pin
->
their_src
)
{
gst_segment_init
(
pin
->
segment
,
GST_FORMAT_TIME
);
gst_segment_init
(
pin
->
segment
,
GST_FORMAT_TIME
);
...
@@ -1215,7 +1216,7 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig
...
@@ -1215,7 +1216,7 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig
if
(
!
index
)
if
(
!
index
)
return
&
filter
->
sink
.
pin
;
return
&
filter
->
sink
.
pin
;
else
if
(
index
<=
filter
->
cStreams
)
else
if
(
index
<=
filter
->
cStreams
)
return
&
filter
->
ppPin
s
[
index
-
1
]
->
pin
.
pin
;
return
&
filter
->
source
s
[
index
-
1
]
->
pin
.
pin
;
return
NULL
;
return
NULL
;
}
}
...
@@ -1280,7 +1281,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface)
...
@@ -1280,7 +1281,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface)
for
(
i
=
0
;
i
<
filter
->
cStreams
;
++
i
)
for
(
i
=
0
;
i
<
filter
->
cStreams
;
++
i
)
{
{
if
(
SUCCEEDED
(
pin_hr
=
BaseOutputPinImpl_Active
(
&
filter
->
ppPin
s
[
i
]
->
pin
)))
if
(
SUCCEEDED
(
pin_hr
=
BaseOutputPinImpl_Active
(
&
filter
->
source
s
[
i
]
->
pin
)))
hr
=
pin_hr
;
hr
=
pin_hr
;
}
}
return
hr
;
return
hr
;
...
@@ -1496,10 +1497,10 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter)
...
@@ -1496,10 +1497,10 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter)
WaitForSingleObject
(
filter
->
no_more_pads_event
,
INFINITE
);
WaitForSingleObject
(
filter
->
no_more_pads_event
,
INFINITE
);
gst_pad_query_duration
(
filter
->
ppPin
s
[
0
]
->
their_src
,
GST_FORMAT_TIME
,
&
duration
);
gst_pad_query_duration
(
filter
->
source
s
[
0
]
->
their_src
,
GST_FORMAT_TIME
,
&
duration
);
for
(
i
=
0
;
i
<
filter
->
cStreams
;
++
i
)
for
(
i
=
0
;
i
<
filter
->
cStreams
;
++
i
)
{
{
struct
gstdemux_source
*
pin
=
filter
->
ppPin
s
[
i
];
struct
gstdemux_source
*
pin
=
filter
->
source
s
[
i
];
const
HANDLE
events
[
2
]
=
{
pin
->
caps_event
,
filter
->
error_event
};
const
HANDLE
events
[
2
]
=
{
pin
->
caps_event
,
filter
->
error_event
};
pin
->
seek
.
llDuration
=
pin
->
seek
.
llStop
=
duration
/
100
;
pin
->
seek
.
llDuration
=
pin
->
seek
.
llStop
=
duration
/
100
;
...
@@ -1947,9 +1948,9 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *
...
@@ -1947,9 +1948,9 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *
struct
gstdemux_source
*
pin
,
**
new_array
;
struct
gstdemux_source
*
pin
,
**
new_array
;
char
pad_name
[
19
];
char
pad_name
[
19
];
if
(
!
(
new_array
=
heap_realloc
(
filter
->
ppPin
s
,
(
filter
->
cStreams
+
1
)
*
sizeof
(
*
new_array
))))
if
(
!
(
new_array
=
heap_realloc
(
filter
->
source
s
,
(
filter
->
cStreams
+
1
)
*
sizeof
(
*
new_array
))))
return
NULL
;
return
NULL
;
filter
->
ppPin
s
=
new_array
;
filter
->
source
s
=
new_array
;
if
(
!
(
pin
=
heap_alloc_zero
(
sizeof
(
*
pin
))))
if
(
!
(
pin
=
heap_alloc_zero
(
sizeof
(
*
pin
))))
return
NULL
;
return
NULL
;
...
@@ -1970,7 +1971,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *
...
@@ -1970,7 +1971,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *
gst_pad_set_event_function
(
pin
->
my_sink
,
event_sink_wrapper
);
gst_pad_set_event_function
(
pin
->
my_sink
,
event_sink_wrapper
);
gst_pad_set_query_function
(
pin
->
my_sink
,
query_sink_wrapper
);
gst_pad_set_query_function
(
pin
->
my_sink
,
query_sink_wrapper
);
filter
->
ppPin
s
[
filter
->
cStreams
++
]
=
pin
;
filter
->
source
s
[
filter
->
cStreams
++
]
=
pin
;
return
pin
;
return
pin
;
}
}
...
@@ -1990,11 +1991,11 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This)
...
@@ -1990,11 +1991,11 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This)
This
->
my_src
=
This
->
their_sink
=
NULL
;
This
->
my_src
=
This
->
their_sink
=
NULL
;
for
(
i
=
0
;
i
<
This
->
cStreams
;
++
i
)
for
(
i
=
0
;
i
<
This
->
cStreams
;
++
i
)
free_source_pin
(
This
->
ppPin
s
[
i
]);
free_source_pin
(
This
->
source
s
[
i
]);
This
->
cStreams
=
0
;
This
->
cStreams
=
0
;
heap_free
(
This
->
ppPin
s
);
heap_free
(
This
->
source
s
);
This
->
ppPin
s
=
NULL
;
This
->
source
s
=
NULL
;
gst_element_set_bus
(
This
->
container
,
NULL
);
gst_element_set_bus
(
This
->
container
,
NULL
);
gst_object_unref
(
This
->
container
);
gst_object_unref
(
This
->
container
);
This
->
container
=
NULL
;
This
->
container
=
NULL
;
...
@@ -2317,10 +2318,10 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter)
...
@@ -2317,10 +2318,10 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter)
WaitForSingleObject
(
filter
->
no_more_pads_event
,
INFINITE
);
WaitForSingleObject
(
filter
->
no_more_pads_event
,
INFINITE
);
gst_pad_query_duration
(
filter
->
ppPin
s
[
0
]
->
their_src
,
GST_FORMAT_TIME
,
&
duration
);
gst_pad_query_duration
(
filter
->
source
s
[
0
]
->
their_src
,
GST_FORMAT_TIME
,
&
duration
);
for
(
i
=
0
;
i
<
filter
->
cStreams
;
++
i
)
for
(
i
=
0
;
i
<
filter
->
cStreams
;
++
i
)
{
{
struct
gstdemux_source
*
pin
=
filter
->
ppPin
s
[
i
];
struct
gstdemux_source
*
pin
=
filter
->
source
s
[
i
];
const
HANDLE
events
[
2
]
=
{
pin
->
caps_event
,
filter
->
error_event
};
const
HANDLE
events
[
2
]
=
{
pin
->
caps_event
,
filter
->
error_event
};
pin
->
seek
.
llDuration
=
pin
->
seek
.
llStop
=
duration
/
100
;
pin
->
seek
.
llDuration
=
pin
->
seek
.
llStop
=
duration
/
100
;
...
...
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