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
e785880a
Commit
e785880a
authored
Jan 23, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Jan 25, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Don't force no_more_pads() onto a Wine thread.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7875d8dd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
20 deletions
+2
-20
gst_cbs.c
dlls/winegstreamer/gst_cbs.c
+0
-10
gst_cbs.h
dlls/winegstreamer/gst_cbs.h
+0
-2
gstdemux.c
dlls/winegstreamer/gstdemux.c
+2
-8
No files found.
dlls/winegstreamer/gst_cbs.c
View file @
e785880a
...
@@ -174,16 +174,6 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode,
...
@@ -174,16 +174,6 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode,
return
cbdata
.
u
.
activate_mode_data
.
ret
;
return
cbdata
.
u
.
activate_mode_data
.
ret
;
}
}
void
no_more_pads_wrapper
(
GstElement
*
element
,
gpointer
user
)
{
struct
cb_data
cbdata
=
{
NO_MORE_PADS
};
cbdata
.
u
.
no_more_pads_data
.
element
=
element
;
cbdata
.
u
.
no_more_pads_data
.
user
=
user
;
call_cb
(
&
cbdata
);
}
GstFlowReturn
request_buffer_src_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
guint64
ofs
,
guint
len
,
GstFlowReturn
request_buffer_src_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
guint64
ofs
,
guint
len
,
GstBuffer
**
buf
)
GstBuffer
**
buf
)
{
{
...
...
dlls/winegstreamer/gst_cbs.h
View file @
e785880a
...
@@ -33,7 +33,6 @@ enum CB_TYPE {
...
@@ -33,7 +33,6 @@ enum CB_TYPE {
EXISTING_NEW_PAD
,
EXISTING_NEW_PAD
,
QUERY_FUNCTION
,
QUERY_FUNCTION
,
ACTIVATE_MODE
,
ACTIVATE_MODE
,
NO_MORE_PADS
,
REQUEST_BUFFER_SRC
,
REQUEST_BUFFER_SRC
,
EVENT_SRC
,
EVENT_SRC
,
EVENT_SINK
,
EVENT_SINK
,
...
@@ -135,7 +134,6 @@ void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN;
...
@@ -135,7 +134,6 @@ void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN;
void
existing_new_pad_wrapper
(
GstElement
*
bin
,
GstPad
*
pad
,
gpointer
user
)
DECLSPEC_HIDDEN
;
void
existing_new_pad_wrapper
(
GstElement
*
bin
,
GstPad
*
pad
,
gpointer
user
)
DECLSPEC_HIDDEN
;
gboolean
query_function_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstQuery
*
query
)
DECLSPEC_HIDDEN
;
gboolean
query_function_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstQuery
*
query
)
DECLSPEC_HIDDEN
;
gboolean
activate_mode_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstPadMode
mode
,
gboolean
activate
)
DECLSPEC_HIDDEN
;
gboolean
activate_mode_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstPadMode
mode
,
gboolean
activate
)
DECLSPEC_HIDDEN
;
void
no_more_pads_wrapper
(
GstElement
*
decodebin
,
gpointer
user
)
DECLSPEC_HIDDEN
;
GstFlowReturn
request_buffer_src_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
guint64
ofs
,
guint
len
,
GstBuffer
**
buf
)
DECLSPEC_HIDDEN
;
GstFlowReturn
request_buffer_src_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
guint64
ofs
,
guint
len
,
GstBuffer
**
buf
)
DECLSPEC_HIDDEN
;
gboolean
event_src_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstEvent
*
event
)
DECLSPEC_HIDDEN
;
gboolean
event_src_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstEvent
*
event
)
DECLSPEC_HIDDEN
;
gboolean
event_sink_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstEvent
*
event
)
DECLSPEC_HIDDEN
;
gboolean
event_sink_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstEvent
*
event
)
DECLSPEC_HIDDEN
;
...
...
dlls/winegstreamer/gstdemux.c
View file @
e785880a
...
@@ -1765,7 +1765,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter)
...
@@ -1765,7 +1765,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter)
g_signal_connect
(
element
,
"pad-added"
,
G_CALLBACK
(
existing_new_pad_wrapper
),
filter
);
g_signal_connect
(
element
,
"pad-added"
,
G_CALLBACK
(
existing_new_pad_wrapper
),
filter
);
g_signal_connect
(
element
,
"pad-removed"
,
G_CALLBACK
(
removed_decoded_pad_wrapper
),
filter
);
g_signal_connect
(
element
,
"pad-removed"
,
G_CALLBACK
(
removed_decoded_pad_wrapper
),
filter
);
g_signal_connect
(
element
,
"autoplug-select"
,
G_CALLBACK
(
autoplug_blacklist
),
filter
);
g_signal_connect
(
element
,
"autoplug-select"
,
G_CALLBACK
(
autoplug_blacklist
),
filter
);
g_signal_connect
(
element
,
"no-more-pads"
,
G_CALLBACK
(
no_more_pads
_wrapper
),
filter
);
g_signal_connect
(
element
,
"no-more-pads"
,
G_CALLBACK
(
no_more_pads
),
filter
);
filter
->
their_sink
=
gst_element_get_static_pad
(
element
,
"sink"
);
filter
->
their_sink
=
gst_element_get_static_pad
(
element
,
"sink"
);
...
@@ -2443,12 +2443,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata)
...
@@ -2443,12 +2443,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata)
cbdata
->
u
.
activate_mode_data
.
ret
=
activate_mode
(
data
->
pad
,
data
->
parent
,
data
->
mode
,
data
->
activate
);
cbdata
->
u
.
activate_mode_data
.
ret
=
activate_mode
(
data
->
pad
,
data
->
parent
,
data
->
mode
,
data
->
activate
);
break
;
break
;
}
}
case
NO_MORE_PADS
:
{
struct
no_more_pads_data
*
data
=
&
cbdata
->
u
.
no_more_pads_data
;
no_more_pads
(
data
->
element
,
data
->
user
);
break
;
}
case
REQUEST_BUFFER_SRC
:
case
REQUEST_BUFFER_SRC
:
{
{
struct
getrange_data
*
data
=
&
cbdata
->
u
.
getrange_data
;
struct
getrange_data
*
data
=
&
cbdata
->
u
.
getrange_data
;
...
@@ -2645,7 +2639,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter)
...
@@ -2645,7 +2639,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter)
g_signal_connect
(
element
,
"pad-added"
,
G_CALLBACK
(
existing_new_pad_wrapper
),
filter
);
g_signal_connect
(
element
,
"pad-added"
,
G_CALLBACK
(
existing_new_pad_wrapper
),
filter
);
g_signal_connect
(
element
,
"pad-removed"
,
G_CALLBACK
(
removed_decoded_pad_wrapper
),
filter
);
g_signal_connect
(
element
,
"pad-removed"
,
G_CALLBACK
(
removed_decoded_pad_wrapper
),
filter
);
g_signal_connect
(
element
,
"no-more-pads"
,
G_CALLBACK
(
no_more_pads
_wrapper
),
filter
);
g_signal_connect
(
element
,
"no-more-pads"
,
G_CALLBACK
(
no_more_pads
),
filter
);
filter
->
their_sink
=
gst_element_get_static_pad
(
element
,
"sink"
);
filter
->
their_sink
=
gst_element_get_static_pad
(
element
,
"sink"
);
...
...
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