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
70d43973
Commit
70d43973
authored
May 20, 2004
by
Warren Dukes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some fixes for non-blocking seek :-)
git-svn-id:
https://svn.musicpd.org/mpd/trunk@1100
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
a81573ef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
26 deletions
+4
-26
aac_decode.c
src/aac_decode.c
+0
-12
decode.c
src/decode.c
+4
-1
mp4_decode.c
src/mp4_decode.c
+0
-13
No files found.
src/aac_decode.c
View file @
70d43973
...
...
@@ -264,7 +264,6 @@ int aac_decode(OutputBuffer * cb, DecoderControl * dc) {
unsigned
int
sampleCount
;
char
*
sampleBuffer
;
size_t
sampleBufferLen
;
int
chunkLen
=
0
;
/*float * seekTable;
long seekTableEnd = -1;
int seekPositionFound = 0;*/
...
...
@@ -383,17 +382,6 @@ int aac_decode(OutputBuffer * cb, DecoderControl * dc) {
if
(
dc
->
state
!=
DECODE_STATE_DECODE
)
return
-
1
;
if
(
!
dc
->
stop
&&
chunkLen
>
0
)
{
cb
->
chunkSize
[
cb
->
end
]
=
chunkLen
;
++
cb
->
end
;
if
(
cb
->
end
>=
buffered_chunks
)
{
cb
->
end
=
0
;
cb
->
wrap
=
1
;
}
chunkLen
=
0
;
}
if
(
dc
->
seek
)
dc
->
seek
=
0
;
if
(
dc
->
stop
)
{
...
...
src/decode.c
View file @
70d43973
...
...
@@ -410,7 +410,10 @@ void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
processDecodeInput
();
handleDecodeStart
();
if
(
!
dc
->
seek
&&
seeking
)
{
if
(
dc
->
seekChunk
>=
0
)
cb
->
begin
=
dc
->
seekChunk
;
if
(
dc
->
seekChunk
>=
0
)
{
cb
->
begin
=
dc
->
seekChunk
;
cb
->
wrap
=
0
;
}
seeking
=
0
;
}
if
(
dc
->
state
==
DECODE_STATE_STOP
&&
...
...
src/mp4_decode.c
View file @
70d43973
...
...
@@ -105,7 +105,6 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) {
char
*
sampleBuffer
;
size_t
sampleBufferLen
;
unsigned
int
initial
=
1
;
int
chunkLen
=
0
;
float
*
seekTable
;
long
seekTableEnd
=
-
1
;
int
seekPositionFound
=
0
;
...
...
@@ -219,7 +218,6 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) {
if
(
dc
->
seek
&&
seekPositionFound
)
{
seekPositionFound
=
0
;
chunkLen
=
0
;
clearOutputBuffer
(
cb
);
dc
->
seekChunk
=
cb
->
end
;
dc
->
seek
=
0
;
...
...
@@ -299,17 +297,6 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) {
if
(
dc
->
state
!=
DECODE_STATE_DECODE
)
return
-
1
;
if
(
!
dc
->
stop
&&
!
dc
->
seek
&&
chunkLen
>
0
)
{
cb
->
chunkSize
[
cb
->
end
]
=
chunkLen
;
++
cb
->
end
;
if
(
cb
->
end
>=
buffered_chunks
)
{
cb
->
end
=
0
;
cb
->
wrap
=
1
;
}
chunkLen
=
0
;
}
if
(
dc
->
seek
)
dc
->
seek
=
0
;
if
(
dc
->
stop
)
{
...
...
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