Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
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
Иван Мажукин
mpd
Commits
951bad46
Commit
951bad46
authored
Nov 24, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/{dsdiff,dsf,opus}: fix deadlock while seeking
parent
716225cd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
NEWS
NEWS
+2
-0
DsdLib.cxx
src/decoder/plugins/DsdLib.cxx
+2
-2
OpusDecoderPlugin.cxx
src/decoder/plugins/OpusDecoderPlugin.cxx
+1
-1
No files found.
NEWS
View file @
951bad46
ver 0.19.5 (not yet released)
* decoder
- dsdiff, dsf, opus: fix deadlock while seeking
ver 0.19.4 (2014/11/18)
* protocol
...
...
src/decoder/plugins/DsdLib.cxx
View file @
951bad46
...
...
@@ -53,7 +53,7 @@ dsdlib_skip_to(Decoder *decoder, InputStream &is,
offset_type
offset
)
{
if
(
is
.
IsSeekable
())
return
is
.
Seek
(
offset
,
IgnoreError
());
return
is
.
Lock
Seek
(
offset
,
IgnoreError
());
if
(
is
.
GetOffset
()
>
offset
)
return
false
;
...
...
@@ -72,7 +72,7 @@ dsdlib_skip(Decoder *decoder, InputStream &is,
return
true
;
if
(
is
.
IsSeekable
())
return
is
.
Seek
(
is
.
GetOffset
()
+
delta
,
IgnoreError
());
return
is
.
Lock
Seek
(
is
.
GetOffset
()
+
delta
,
IgnoreError
());
if
(
delta
>
1024
*
1024
)
/* don't skip more than one megabyte; it would be too
...
...
src/decoder/plugins/OpusDecoderPlugin.cxx
View file @
951bad46
...
...
@@ -214,7 +214,7 @@ LoadEOSPacket(InputStream &is, Decoder *decoder, int serialno,
ogg_stream_clear
(
&
os
);
/* restore the previous file position */
is
.
Seek
(
old_offset
,
IgnoreError
());
is
.
Lock
Seek
(
old_offset
,
IgnoreError
());
return
result
;
}
...
...
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