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
491945ee
Commit
491945ee
authored
Feb 17, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Move the EOS handling from read_buffer() to the Unix library.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e9800b1c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
gstdemux.c
dlls/winegstreamer/gstdemux.c
+0
-8
wg_parser.c
dlls/winegstreamer/wg_parser.c
+4
-0
No files found.
dlls/winegstreamer/gstdemux.c
View file @
491945ee
...
...
@@ -794,14 +794,6 @@ static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, Gs
TRACE
(
"filter %p, offset %s, length %u, buffer %p.
\n
"
,
This
,
wine_dbgstr_longlong
(
ofs
),
len
,
buffer
);
if
(
ofs
>=
This
->
file_size
)
{
WARN
(
"Reading past eof: %s, %u
\n
"
,
wine_dbgstr_longlong
(
ofs
),
len
);
return
GST_FLOW_EOS
;
}
if
(
len
+
ofs
>
This
->
file_size
)
len
=
This
->
file_size
-
ofs
;
gst_buffer_map
(
buffer
,
&
info
,
GST_MAP_WRITE
);
hr
=
IAsyncReader_SyncRead
(
This
->
reader
,
ofs
,
len
,
info
.
data
);
gst_buffer_unmap
(
buffer
,
&
info
);
...
...
dlls/winegstreamer/wg_parser.c
View file @
491945ee
...
...
@@ -992,6 +992,10 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64
if
(
offset
==
GST_BUFFER_OFFSET_NONE
)
offset
=
parser
->
next_pull_offset
;
parser
->
next_pull_offset
=
offset
+
size
;
if
(
offset
>=
parser
->
file_size
)
return
GST_FLOW_EOS
;
if
(
offset
+
size
>=
parser
->
file_size
)
size
=
parser
->
file_size
-
offset
;
if
(
!*
buffer
)
*
buffer
=
new_buffer
=
gst_buffer_new_and_alloc
(
size
);
...
...
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