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
1655dd45
Commit
1655dd45
authored
Jan 25, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Jan 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Don't force event_src() onto a Wine thread.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3ed27020
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
22 deletions
+1
-22
gst_cbs.c
dlls/winegstreamer/gst_cbs.c
+0
-13
gst_cbs.h
dlls/winegstreamer/gst_cbs.h
+0
-2
gstdemux.c
dlls/winegstreamer/gstdemux.c
+1
-7
No files found.
dlls/winegstreamer/gst_cbs.c
View file @
1655dd45
...
@@ -190,19 +190,6 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64
...
@@ -190,19 +190,6 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64
return
cbdata
.
u
.
getrange_data
.
ret
;
return
cbdata
.
u
.
getrange_data
.
ret
;
}
}
gboolean
event_src_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstEvent
*
event
)
{
struct
cb_data
cbdata
=
{
EVENT_SRC
};
cbdata
.
u
.
event_src_data
.
pad
=
pad
;
cbdata
.
u
.
event_src_data
.
parent
=
parent
;
cbdata
.
u
.
event_src_data
.
event
=
event
;
call_cb
(
&
cbdata
);
return
cbdata
.
u
.
event_src_data
.
ret
;
}
void
removed_decoded_pad_wrapper
(
GstElement
*
bin
,
GstPad
*
pad
,
gpointer
user
)
void
removed_decoded_pad_wrapper
(
GstElement
*
bin
,
GstPad
*
pad
,
gpointer
user
)
{
{
struct
cb_data
cbdata
=
{
REMOVED_DECODED_PAD
};
struct
cb_data
cbdata
=
{
REMOVED_DECODED_PAD
};
...
...
dlls/winegstreamer/gst_cbs.h
View file @
1655dd45
...
@@ -34,7 +34,6 @@ enum CB_TYPE {
...
@@ -34,7 +34,6 @@ enum CB_TYPE {
QUERY_FUNCTION
,
QUERY_FUNCTION
,
ACTIVATE_MODE
,
ACTIVATE_MODE
,
REQUEST_BUFFER_SRC
,
REQUEST_BUFFER_SRC
,
EVENT_SRC
,
REMOVED_DECODED_PAD
,
REMOVED_DECODED_PAD
,
QUERY_SINK
,
QUERY_SINK
,
GSTDEMUX_MAX
,
GSTDEMUX_MAX
,
...
@@ -121,7 +120,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLS
...
@@ -121,7 +120,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLS
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
;
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
;
GstFlowReturn
got_data_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstBuffer
*
buf
)
DECLSPEC_HIDDEN
;
GstFlowReturn
got_data_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstBuffer
*
buf
)
DECLSPEC_HIDDEN
;
void
removed_decoded_pad_wrapper
(
GstElement
*
bin
,
GstPad
*
pad
,
gpointer
user
)
DECLSPEC_HIDDEN
;
void
removed_decoded_pad_wrapper
(
GstElement
*
bin
,
GstPad
*
pad
,
gpointer
user
)
DECLSPEC_HIDDEN
;
void
Gstreamer_transform_pad_added_wrapper
(
GstElement
*
filter
,
GstPad
*
pad
,
gpointer
user
)
DECLSPEC_HIDDEN
;
void
Gstreamer_transform_pad_added_wrapper
(
GstElement
*
filter
,
GstPad
*
pad
,
gpointer
user
)
DECLSPEC_HIDDEN
;
...
...
dlls/winegstreamer/gstdemux.c
View file @
1655dd45
...
@@ -1518,7 +1518,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin)
...
@@ -1518,7 +1518,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin)
gst_pad_set_getrange_function
(
This
->
my_src
,
request_buffer_src_wrapper
);
gst_pad_set_getrange_function
(
This
->
my_src
,
request_buffer_src_wrapper
);
gst_pad_set_query_function
(
This
->
my_src
,
query_function_wrapper
);
gst_pad_set_query_function
(
This
->
my_src
,
query_function_wrapper
);
gst_pad_set_activatemode_function
(
This
->
my_src
,
activate_mode_wrapper
);
gst_pad_set_activatemode_function
(
This
->
my_src
,
activate_mode_wrapper
);
gst_pad_set_event_function
(
This
->
my_src
,
event_src
_wrapper
);
gst_pad_set_event_function
(
This
->
my_src
,
event_src
);
gst_pad_set_element_private
(
This
->
my_src
,
This
);
gst_pad_set_element_private
(
This
->
my_src
,
This
);
This
->
start
=
This
->
nextofs
=
This
->
nextpullofs
=
This
->
stop
=
0
;
This
->
start
=
This
->
nextofs
=
This
->
nextpullofs
=
This
->
stop
=
0
;
...
@@ -2453,12 +2453,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata)
...
@@ -2453,12 +2453,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata)
data
->
ofs
,
data
->
len
,
data
->
buf
);
data
->
ofs
,
data
->
len
,
data
->
buf
);
break
;
break
;
}
}
case
EVENT_SRC
:
{
struct
event_src_data
*
data
=
&
cbdata
->
u
.
event_src_data
;
cbdata
->
u
.
event_src_data
.
ret
=
event_src
(
data
->
pad
,
data
->
parent
,
data
->
event
);
break
;
}
case
REMOVED_DECODED_PAD
:
case
REMOVED_DECODED_PAD
:
{
{
struct
pad_removed_data
*
data
=
&
cbdata
->
u
.
pad_removed_data
;
struct
pad_removed_data
*
data
=
&
cbdata
->
u
.
pad_removed_data
;
...
...
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