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
28fe6207
Commit
28fe6207
authored
Jun 15, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Jul 31, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Keep default decodebin queue limits.
parent
1dc8cdae
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
24 deletions
+6
-24
gst_private.h
dlls/winegstreamer/gst_private.h
+1
-1
main.c
dlls/winegstreamer/main.c
+2
-3
media_source.c
dlls/winegstreamer/media_source.c
+1
-7
quartz_parser.c
dlls/winegstreamer/quartz_parser.c
+1
-1
unixlib.h
dlls/winegstreamer/unixlib.h
+0
-1
wg_parser.c
dlls/winegstreamer/wg_parser.c
+0
-10
wm_reader.c
dlls/winegstreamer/wm_reader.c
+1
-1
No files found.
dlls/winegstreamer/gst_private.h
View file @
28fe6207
...
...
@@ -69,7 +69,7 @@ HRESULT wg_sample_queue_create(struct wg_sample_queue **out);
void
wg_sample_queue_destroy
(
struct
wg_sample_queue
*
queue
);
void
wg_sample_queue_flush
(
struct
wg_sample_queue
*
queue
,
bool
all
);
wg_parser_t
wg_parser_create
(
enum
wg_parser_type
type
,
bool
unlimited_buffering
);
wg_parser_t
wg_parser_create
(
enum
wg_parser_type
type
);
void
wg_parser_destroy
(
wg_parser_t
parser
);
HRESULT
wg_parser_connect
(
wg_parser_t
parser
,
uint64_t
file_size
);
...
...
dlls/winegstreamer/main.c
View file @
28fe6207
...
...
@@ -66,17 +66,16 @@ bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size)
return
TRUE
;
}
wg_parser_t
wg_parser_create
(
enum
wg_parser_type
type
,
bool
unlimited_buffering
)
wg_parser_t
wg_parser_create
(
enum
wg_parser_type
type
)
{
struct
wg_parser_create_params
params
=
{
.
type
=
type
,
.
unlimited_buffering
=
unlimited_buffering
,
.
err_on
=
ERR_ON
(
quartz
),
.
warn_on
=
WARN_ON
(
quartz
),
};
TRACE
(
"type %#x
, unlimited_buffering %d.
\n
"
,
type
,
unlimited_buffering
);
TRACE
(
"type %#x
.
\n
"
,
type
);
if
(
WINE_UNIX_CALL
(
unix_wg_parser_create
,
&
params
))
return
0
;
...
...
dlls/winegstreamer/media_source.c
View file @
28fe6207
...
...
@@ -1643,13 +1643,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
if
(
FAILED
(
hr
=
MFAllocateWorkQueue
(
&
object
->
async_commands_queue
)))
goto
fail
;
/* In Media Foundation, sources may read from any media source stream
* without fear of blocking due to buffering limits on another. Trailmakers,
* a Unity3D Engine game, only reads one sample from the audio stream (and
* never deselects it). Remove buffering limits from decodebin in order to
* account for this. Note that this does leak memory, but the same memory
* leak occurs with native. */
if
(
!
(
parser
=
wg_parser_create
(
WG_PARSER_DECODEBIN
,
true
)))
if
(
!
(
parser
=
wg_parser_create
(
WG_PARSER_DECODEBIN
)))
{
hr
=
E_OUTOFMEMORY
;
goto
fail
;
...
...
dlls/winegstreamer/quartz_parser.c
View file @
28fe6207
...
...
@@ -1451,7 +1451,7 @@ static HRESULT parser_create(enum wg_parser_type type, struct parser **parser)
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
if
(
!
(
object
->
wg_parser
=
wg_parser_create
(
type
,
false
)))
if
(
!
(
object
->
wg_parser
=
wg_parser_create
(
type
)))
{
free
(
object
);
return
E_OUTOFMEMORY
;
...
...
dlls/winegstreamer/unixlib.h
View file @
28fe6207
...
...
@@ -212,7 +212,6 @@ struct wg_parser_create_params
{
wg_parser_t
parser
;
wg_parser_type
type
;
UINT8
unlimited_buffering
;
UINT8
err_on
;
UINT8
warn_on
;
};
...
...
dlls/winegstreamer/wg_parser.c
View file @
28fe6207
...
...
@@ -93,8 +93,6 @@ struct wg_parser
bool
sink_connected
;
bool
unlimited_buffering
;
gchar
*
sink_caps
;
struct
input_cache_chunk
input_cache_chunks
[
4
];
...
...
@@ -1771,13 +1769,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser)
gst_bin_add
(
GST_BIN
(
parser
->
container
),
element
);
parser
->
decodebin
=
element
;
if
(
parser
->
unlimited_buffering
)
{
g_object_set
(
parser
->
decodebin
,
"max-size-buffers"
,
G_MAXUINT
,
NULL
);
g_object_set
(
parser
->
decodebin
,
"max-size-time"
,
G_MAXUINT64
,
NULL
);
g_object_set
(
parser
->
decodebin
,
"max-size-bytes"
,
G_MAXUINT
,
NULL
);
}
g_signal_connect
(
element
,
"pad-added"
,
G_CALLBACK
(
pad_added_cb
),
parser
);
g_signal_connect
(
element
,
"pad-removed"
,
G_CALLBACK
(
pad_removed_cb
),
parser
);
g_signal_connect
(
element
,
"autoplug-continue"
,
G_CALLBACK
(
autoplug_continue_cb
),
parser
);
...
...
@@ -1888,7 +1879,6 @@ static NTSTATUS wg_parser_create(void *args)
pthread_cond_init
(
&
parser
->
read_cond
,
NULL
);
pthread_cond_init
(
&
parser
->
read_done_cond
,
NULL
);
parser
->
init_gst
=
init_funcs
[
params
->
type
];
parser
->
unlimited_buffering
=
params
->
unlimited_buffering
;
parser
->
err_on
=
params
->
err_on
;
parser
->
warn_on
=
params
->
warn_on
;
GST_DEBUG
(
"Created winegstreamer parser %p."
,
parser
);
...
...
dlls/winegstreamer/wm_reader.c
View file @
28fe6207
...
...
@@ -1459,7 +1459,7 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size)
HRESULT
hr
;
WORD
i
;
if
(
!
(
wg_parser
=
wg_parser_create
(
WG_PARSER_DECODEBIN
,
false
)))
if
(
!
(
wg_parser
=
wg_parser_create
(
WG_PARSER_DECODEBIN
)))
return
E_OUTOFMEMORY
;
reader
->
wg_parser
=
wg_parser
;
...
...
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