Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
ad6a3e75
Commit
ad6a3e75
authored
Jan 26, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Jan 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Don't force request_buffer_src() onto a Wine thread.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3b885fb5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
26 deletions
+1
-26
gst_cbs.c
dlls/winegstreamer/gst_cbs.c
+0
-16
gst_cbs.h
dlls/winegstreamer/gst_cbs.h
+0
-2
gstdemux.c
dlls/winegstreamer/gstdemux.c
+1
-8
No files found.
dlls/winegstreamer/gst_cbs.c
View file @
ad6a3e75
...
...
@@ -161,22 +161,6 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode,
return
cbdata
.
u
.
activate_mode_data
.
ret
;
}
GstFlowReturn
request_buffer_src_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
guint64
ofs
,
guint
len
,
GstBuffer
**
buf
)
{
struct
cb_data
cbdata
=
{
REQUEST_BUFFER_SRC
};
cbdata
.
u
.
getrange_data
.
pad
=
pad
;
cbdata
.
u
.
getrange_data
.
parent
=
parent
;
cbdata
.
u
.
getrange_data
.
ofs
=
ofs
;
cbdata
.
u
.
getrange_data
.
len
=
len
;
cbdata
.
u
.
getrange_data
.
buf
=
buf
;
call_cb
(
&
cbdata
);
return
cbdata
.
u
.
getrange_data
.
ret
;
}
gboolean
query_sink_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstQuery
*
query
)
{
struct
cb_data
cbdata
=
{
QUERY_SINK
};
...
...
dlls/winegstreamer/gst_cbs.h
View file @
ad6a3e75
...
...
@@ -32,7 +32,6 @@ typedef enum {
enum
CB_TYPE
{
EXISTING_NEW_PAD
,
ACTIVATE_MODE
,
REQUEST_BUFFER_SRC
,
QUERY_SINK
,
GSTDEMUX_MAX
,
BYTESTREAM_WRAPPER_PULL
,
...
...
@@ -116,7 +115,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
;
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
got_data_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstBuffer
*
buf
)
DECLSPEC_HIDDEN
;
void
Gstreamer_transform_pad_added_wrapper
(
GstElement
*
filter
,
GstPad
*
pad
,
gpointer
user
)
DECLSPEC_HIDDEN
;
gboolean
query_sink_wrapper
(
GstPad
*
pad
,
GstObject
*
parent
,
GstQuery
*
query
)
DECLSPEC_HIDDEN
;
...
...
dlls/winegstreamer/gstdemux.c
View file @
ad6a3e75
...
...
@@ -1598,7 +1598,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin)
gst_element_set_bus
(
This
->
container
,
This
->
bus
);
This
->
my_src
=
gst_pad_new_from_static_template
(
&
src_template
,
"quartz-src"
);
gst_pad_set_getrange_function
(
This
->
my_src
,
request_buffer_src
_wrapper
);
gst_pad_set_getrange_function
(
This
->
my_src
,
request_buffer_src
);
gst_pad_set_query_function
(
This
->
my_src
,
query_function
);
gst_pad_set_activatemode_function
(
This
->
my_src
,
activate_mode_wrapper
);
gst_pad_set_event_function
(
This
->
my_src
,
event_src
);
...
...
@@ -2536,13 +2536,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
);
break
;
}
case
REQUEST_BUFFER_SRC
:
{
struct
getrange_data
*
data
=
&
cbdata
->
u
.
getrange_data
;
cbdata
->
u
.
getrange_data
.
ret
=
request_buffer_src
(
data
->
pad
,
data
->
parent
,
data
->
ofs
,
data
->
len
,
data
->
buf
);
break
;
}
case
QUERY_SINK
:
{
struct
query_sink_data
*
data
=
&
cbdata
->
u
.
query_sink_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