Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
f3888615
Commit
f3888615
authored
Sep 02, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream: avoid seeking within the peek buffer
parent
994a2555
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
1 deletion
+27
-1
src/input/stream.c
src/input/stream.c
+27
-1
No files found.
src/input/stream.c
View file @
f3888615
...
@@ -449,6 +449,33 @@ int stream_Seek(stream_t *s, uint64_t offset)
...
@@ -449,6 +449,33 @@ int stream_Seek(stream_t *s, uint64_t offset)
{
{
stream_priv_t
*
priv
=
(
stream_priv_t
*
)
s
;
stream_priv_t
*
priv
=
(
stream_priv_t
*
)
s
;
block_t
*
peek
=
priv
->
peek
;
if
(
peek
!=
NULL
)
{
if
(
priv
->
offset
>=
offset
)
{
uint64_t
fwd
=
priv
->
offset
-
offset
;
if
(
fwd
<=
peek
->
i_buffer
)
{
/* Seeking within the peek buffer */
peek
->
p_buffer
+=
fwd
;
peek
->
i_buffer
-=
fwd
;
if
(
peek
->
i_buffer
==
0
)
{
priv
->
peek
=
NULL
;
block_Release
(
peek
);
}
return
VLC_SUCCESS
;
}
}
}
else
{
if
(
priv
->
offset
==
offset
)
return
VLC_SUCCESS
;
/* Nothing to do! */
}
if
(
s
->
pf_seek
==
NULL
)
if
(
s
->
pf_seek
==
NULL
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -458,7 +485,6 @@ int stream_Seek(stream_t *s, uint64_t offset)
...
@@ -458,7 +485,6 @@ int stream_Seek(stream_t *s, uint64_t offset)
priv
->
offset
=
offset
;
priv
->
offset
=
offset
;
block_t
*
peek
=
priv
->
peek
;
if
(
peek
!=
NULL
)
if
(
peek
!=
NULL
)
{
{
priv
->
peek
=
NULL
;
priv
->
peek
=
NULL
;
...
...
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