Skip to content

M
mpd
Commit c180d2f9 authored by Warren Dukes's avatar Warren Dukes
Browse files
Options

try to make seeking more non-blocking

git-svn-id: https://svn.musicpd.org/mpd/trunk@1076 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent bf9e2afb
Show whitespace changes
Inline Side-by-side
Showing with 101 additions and 75 deletions
src/aac_decode.c
View file @ c180d2f9
...@@ -341,13 +341,12 @@ int aac_decode(OutputBuffer * cb, DecoderControl * dc) { ...@@ -341,13 +341,12 @@ int aac_decode(OutputBuffer * cb, DecoderControl * dc) {
sampleRate = frameInfo.samplerate; sampleRate = frameInfo.samplerate;
#endif #endif
if(dc->start) { if(dc->state != DECODE_STATE_DECODE) {
dc->audioFormat.channels = frameInfo.channels; dc->audioFormat.channels = frameInfo.channels;
dc->audioFormat.sampleRate = sampleRate; dc->audioFormat.sampleRate = sampleRate;
getOutputAudioFormat(&(dc->audioFormat), getOutputAudioFormat(&(dc->audioFormat),
&(cb->audioFormat)); &(cb->audioFormat));
dc->state = DECODE_STATE_DECODE; dc->state = DECODE_STATE_DECODE;
dc->start = 0;
} }
advanceAacBuffer(&b,frameInfo.bytesconsumed); advanceAacBuffer(&b,frameInfo.bytesconsumed);
...@@ -382,7 +381,7 @@ int aac_decode(OutputBuffer * cb, DecoderControl * dc) { ...@@ -382,7 +381,7 @@ int aac_decode(OutputBuffer * cb, DecoderControl * dc) {
closeInputStream(b.inStream); closeInputStream(b.inStream);
if(b.buffer) free(b.buffer); if(b.buffer) free(b.buffer);
if(dc->start) return -1; if(dc->state != DECODE_STATE_DECODE) return -1;
if(!dc->stop && !dc->seek && chunkLen>0) { if(!dc->stop && !dc->seek && chunkLen>0) {
cb->chunkSize[cb->end] = chunkLen; cb->chunkSize[cb->end] = chunkLen;
......
src/audiofile_decode.c
View file @ c180d2f9
...@@ -91,7 +91,6 @@ int audiofile_decode(OutputBuffer * cb, DecoderControl * dc) { ...@@ -91,7 +91,6 @@ int audiofile_decode(OutputBuffer * cb, DecoderControl * dc) {
fs = (int)afGetFrameSize(af_fp, AF_DEFAULT_TRACK,1); fs = (int)afGetFrameSize(af_fp, AF_DEFAULT_TRACK,1);
dc->state = DECODE_STATE_DECODE; dc->state = DECODE_STATE_DECODE;
dc->start = 0;
{ {
int ret, eof = 0, current = 0; int ret, eof = 0, current = 0;
unsigned char chunk[CHUNK_SIZE]; unsigned char chunk[CHUNK_SIZE];
......
src/decode.c
View file @ c180d2f9
...@@ -79,7 +79,7 @@ void decodeSigHandler(int sig) { ...@@ -79,7 +79,7 @@ void decodeSigHandler(int sig) {
void stopDecode(DecoderControl * dc) { void stopDecode(DecoderControl * dc) {
if(decode_pid && *decode_pid>0 && if(decode_pid && *decode_pid>0 &&
(dc->start || dc->state==DECODE_STATE_DECODE)) (dc->start || dc->state!=DECODE_STATE_STOP))
{ {
dc->stop = 1; dc->stop = 1;
while(decode_pid && *decode_pid>0 && dc->stop) my_usleep(1000); while(decode_pid && *decode_pid>0 && dc->stop) my_usleep(1000);
...@@ -112,7 +112,29 @@ int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af) { ...@@ -112,7 +112,29 @@ int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af) {
return (int)chunks; return (int)chunks;
} }
int waitOnDecode(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) { #define handleDecodeStart() \
if(decodeWaitedOn && dc->state==DECODE_STATE_DECODE) { \
decodeWaitedOn = 1; \
if(openAudioDevice(&(cb->audioFormat))<0) { \
strncpy(pc->erroredFile,pc->file,MAXPATHLEN); \
pc->erroredFile[MAXPATHLEN] = '\0'; \
pc->error = PLAYER_ERROR_AUDIO; \
quitDecode(pc,dc); \
return; \
} \
pc->totalTime = dc->totalTime; \
pc->sampleRate = dc->audioFormat.sampleRate; \
pc->bits = dc->audioFormat.bits; \
pc->channels = dc->audioFormat.channels; \
} \
else { \
my_usleep(10); \
continue; \
}
int waitOnDecode(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
int * decodeWaitedOn)
{
while(decode_pid && *decode_pid>0 && dc->start) my_usleep(1000); while(decode_pid && *decode_pid>0 && dc->start) my_usleep(1000);
if(dc->start || dc->error!=DECODE_ERROR_NOERROR) { if(dc->start || dc->error!=DECODE_ERROR_NOERROR) {
...@@ -123,28 +145,25 @@ int waitOnDecode(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) { ...@@ -123,28 +145,25 @@ int waitOnDecode(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
return -1; return -1;
} }
if(openAudioDevice(&(cb->audioFormat))<0) { pc->totalTime = pc->fileTime;
strncpy(pc->erroredFile,pc->file,MAXPATHLEN);
pc->erroredFile[MAXPATHLEN] = '\0';
pc->error = PLAYER_ERROR_AUDIO;
quitDecode(pc,dc);
return -1;
}
pc->totalTime = dc->totalTime;
pc->elapsedTime = 0; pc->elapsedTime = 0;
pc->bitRate = 0; pc->bitRate = 0;
pc->sampleRate = dc->audioFormat.sampleRate; pc->sampleRate = 0;
pc->bits = dc->audioFormat.bits; pc->bits = 0;
pc->channels = dc->audioFormat.channels; pc->channels = 0;
*decodeWaitedOn = 1;
return 0; return 0;
} }
void decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) { int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
int * decodeWaitedOn)
{
int ret = -1;
if(decode_pid && *decode_pid>0) { if(decode_pid && *decode_pid>0) {
cb->next = -1; cb->next = -1;
if(dc->state!=DECODE_STATE_DECODE || dc->error || if(dc->state==DECODE_STATE_STOP || dc->error ||
strcmp(dc->file,pc->file)!=0) strcmp(dc->file,pc->file)!=0)
{ {
stopDecode(dc); stopDecode(dc);
...@@ -153,9 +172,9 @@ void decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) { ...@@ -153,9 +172,9 @@ void decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
cb->wrap = 0; cb->wrap = 0;
dc->error = 0; dc->error = 0;
dc->start = 1; dc->start = 1;
waitOnDecode(pc,dc,cb); waitOnDecode(pc,dc,cb,decodeWaitedOn);
} }
if(*decode_pid>0 && dc->state==DECODE_STATE_DECODE) { if(*decode_pid>0 && dc->state!=DECODE_STATE_STOP) {
dc->seekWhere = pc->seekWhere > pc->totalTime-0.1 ? dc->seekWhere = pc->seekWhere > pc->totalTime-0.1 ?
pc->totalTime-0.1 : pc->totalTime-0.1 :
pc->seekWhere; pc->seekWhere;
...@@ -164,10 +183,15 @@ void decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) { ...@@ -164,10 +183,15 @@ void decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
dc->seek = 1; dc->seek = 1;
pc->bitRate = 0; pc->bitRate = 0;
while(*decode_pid>0 && dc->seek) my_usleep(1000); while(*decode_pid>0 && dc->seek) my_usleep(1000);
if(!dc->seekError) pc->elapsedTime = dc->seekWhere; if(!dc->seekError) {
ret = 0;
pc->elapsedTime = dc->seekWhere;
}
} }
} }
pc->seek = 0; pc->seek = 0;
return ret;
} }
#define processDecodeInput() \ #define processDecodeInput() \
...@@ -202,12 +226,13 @@ void decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) { ...@@ -202,12 +226,13 @@ void decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
} \ } \
if(pc->seek) { \ if(pc->seek) { \
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \ pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \
decodeSeek(pc,dc,cb); \ if(decodeSeek(pc,dc,cb,&decodeWaitedOn) == 0) { \
pc->beginTime = pc->elapsedTime; \ pc->beginTime = pc->elapsedTime; \
doCrossFade = 0; \ doCrossFade = 0; \
nextChunk = -1; \ nextChunk = -1; \
bbp = 0; \ bbp = 0; \
} \ } \
} \
if(pc->stop) { \ if(pc->stop) { \
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \ pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \
quitDecode(pc,dc); \ quitDecode(pc,dc); \
...@@ -229,7 +254,17 @@ void decodeStart(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) { ...@@ -229,7 +254,17 @@ void decodeStart(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) {
return; return;
} }
while(!inputStreamAtEOF(&inStream) && bufferInputStream(&inStream) < 0); dc->state = DECODE_STATE_START;
dc->start = 0;
while(!inputStreamAtEOF(&inStream) && bufferInputStream(&inStream) < 0
&& !dc->stop);
if(dc->stop) {
dc->state = DECODE_STATE_STOP;
dc->stop = 0;
return;
}
switch(pc->decodeType) { switch(pc->decodeType) {
case DECODE_TYPE_URL: case DECODE_TYPE_URL:
...@@ -339,33 +374,7 @@ int decoderInit(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) { ...@@ -339,33 +374,7 @@ int decoderInit(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) {
return 0; return 0;
} }
/* decode w/ buffering void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
* this will fork another process
* child process does decoding
* parent process does playing audio
*/
void decode() {
OutputBuffer * cb;
PlayerControl * pc;
DecoderControl * dc;
cb = &(getPlayerData()->buffer);
cb->begin = 0;
cb->end = 0;
cb->wrap = 0;
pc = &(getPlayerData()->playerControl);
dc = &(getPlayerData()->decoderControl);
dc->error = 0;
dc->start = 1;
cb->next = -1;
if(decode_pid==NULL || *decode_pid<=0) {
if(decoderInit(pc,cb,dc)<0) return;
}
{
/* PARENT */
int pause = 0; int pause = 0;
int quit = 0; int quit = 0;
int bbp = buffered_before_play; int bbp = buffered_before_play;
...@@ -374,11 +383,12 @@ void decode() { ...@@ -374,11 +383,12 @@ void decode() {
int fadePosition; int fadePosition;
int nextChunk = -1; int nextChunk = -1;
int test; int test;
int decodeWaitedOn = 0;
char silence[CHUNK_SIZE]; char silence[CHUNK_SIZE];
memset(silence,0,CHUNK_SIZE); memset(silence,0,CHUNK_SIZE);
if(waitOnDecode(pc,dc,cb)<0) return; if(waitOnDecode(pc,dc,cb,&decodeWaitedOn)<0) return;
pc->state = PLAYER_STATE_PLAY; pc->state = PLAYER_STATE_PLAY;
pc->play = 0; pc->play = 0;
...@@ -386,15 +396,16 @@ void decode() { ...@@ -386,15 +396,16 @@ void decode() {
kill(getppid(),SIGUSR1); kill(getppid(),SIGUSR1);
while(*decode_pid>0 && !cb->wrap && cb->end-cb->begin<bbp && while(*decode_pid>0 && !cb->wrap && cb->end-cb->begin<bbp &&
dc->state==DECODE_STATE_DECODE) dc->state!=DECODE_STATE_STOP)
{ {
processDecodeInput(); processDecodeInput();
if(quit) return; if(quit) return;
my_usleep(1000); my_usleep(10000);
} }
while(!quit) { while(!quit) {
processDecodeInput(); processDecodeInput();
handleDecodeStart();
if(dc->state==DECODE_STATE_STOP && if(dc->state==DECODE_STATE_STOP &&
pc->queueState==PLAYER_QUEUE_FULL && pc->queueState==PLAYER_QUEUE_FULL &&
pc->queueLockState==PLAYER_QUEUE_UNLOCKED) pc->queueLockState==PLAYER_QUEUE_UNLOCKED)
...@@ -440,11 +451,9 @@ void decode() { ...@@ -440,11 +451,9 @@ void decode() {
if(nextChunk<test) { if(nextChunk<test) {
if(nextChunk>=buffered_chunks) if(nextChunk>=buffered_chunks)
{ {
nextChunk-= nextChunk -= buffered_chunks;
buffered_chunks;
} }
pcm_mix(cb->chunks+cb->begin* pcm_mix(cb->chunks+cb->begin*CHUNK_SIZE,
CHUNK_SIZE,
cb->chunks+nextChunk* cb->chunks+nextChunk*
CHUNK_SIZE, CHUNK_SIZE,
cb->chunkSize[ cb->chunkSize[
...@@ -499,8 +508,7 @@ void decode() { ...@@ -499,8 +508,7 @@ void decode() {
if(nextChunk<test) { if(nextChunk<test) {
if(nextChunk>=buffered_chunks) if(nextChunk>=buffered_chunks)
{ {
nextChunk-= nextChunk -= buffered_chunks;
buffered_chunks;
} }
cb->begin = nextChunk; cb->begin = nextChunk;
} }
...@@ -521,7 +529,9 @@ void decode() { ...@@ -521,7 +529,9 @@ void decode() {
} }
else { else {
cb->next = -1; cb->next = -1;
if(waitOnDecode(pc,dc,cb)<0) return; if(waitOnDecode(pc,dc,cb,&decodeWaitedOn)<0) {
return;
}
nextChunk = -1; nextChunk = -1;
doCrossFade = 0; doCrossFade = 0;
crossFadeChunks = 0; crossFadeChunks = 0;
...@@ -537,18 +547,39 @@ void decode() { ...@@ -537,18 +547,39 @@ void decode() {
break; break;
} }
else { else {
if(playAudio(silence, CHUNK_SIZE) < 0) { if(playAudio(silence, CHUNK_SIZE) < 0) quit = 1;
quit = 1;
}
} }
} }
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \ pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \
quitDecode(pc,dc); quitDecode(pc,dc);
}
/* decode w/ buffering
* this will fork another process
* child process does decoding
* parent process does playing audio
*/
void decode() {
OutputBuffer * cb;
PlayerControl * pc;
DecoderControl * dc;
cb = &(getPlayerData()->buffer);
/* END OF PARENT */ cb->begin = 0;
cb->end = 0;
cb->wrap = 0;
pc = &(getPlayerData()->playerControl);
dc = &(getPlayerData()->decoderControl);
dc->error = 0;
dc->start = 1;
cb->next = -1;
if(decode_pid==NULL || *decode_pid<=0) {
if(decoderInit(pc,cb,dc)<0) return;
} }
return; decodeParent(pc, dc, cb);
} }
/* vim:set shiftwidth=4 tabstop=8 expandtab: */ /* vim:set shiftwidth=8 tabstop=8 expandtab: */
src/decode.h
View file @ c180d2f9
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
#define DECODE_TYPE_URL 1 #define DECODE_TYPE_URL 1
#define DECODE_STATE_STOP 0 #define DECODE_STATE_STOP 0
#define DECODE_STATE_DECODE 1 #define DECODE_STATE_START 1
#define DECODE_STATE_DECODE 2
#define DECODE_ERROR_NOERROR 0 #define DECODE_ERROR_NOERROR 0
#define DECODE_ERROR_UNKTYPE 10 #define DECODE_ERROR_UNKTYPE 10
......
src/flac_decode.c
View file @ c180d2f9
...@@ -135,7 +135,6 @@ int flac_decode(OutputBuffer * cb, DecoderControl *dc) { ...@@ -135,7 +135,6 @@ int flac_decode(OutputBuffer * cb, DecoderControl *dc) {
} }
dc->state = DECODE_STATE_DECODE; dc->state = DECODE_STATE_DECODE;
dc->start = 0;
while(1) { while(1) {
FLAC__seekable_stream_decoder_process_single(flacDec); FLAC__seekable_stream_decoder_process_single(flacDec);
......
src/mp3_decode.c
View file @ c180d2f9
...@@ -560,7 +560,6 @@ int mp3_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream) { ...@@ -560,7 +560,6 @@ int mp3_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream) {
getOutputAudioFormat(&(dc->audioFormat), &(cb->audioFormat)); getOutputAudioFormat(&(dc->audioFormat), &(cb->audioFormat));
dc->totalTime = data.totalTime; dc->totalTime = data.totalTime;
dc->start = 0;
dc->state = DECODE_STATE_DECODE; dc->state = DECODE_STATE_DECODE;
while(mp3Read(&data,cb,dc)!=DECODE_BREAK); while(mp3Read(&data,cb,dc)!=DECODE_BREAK);
......
src/mp4_decode.c
View file @ c180d2f9
...@@ -249,7 +249,7 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) { ...@@ -249,7 +249,7 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) {
break; break;
} }
if(dc->start) { if(dc->state != DECODE_STATE_DECODE) {
channels = frameInfo.channels; channels = frameInfo.channels;
#ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE #ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE
scale = frameInfo.samplerate; scale = frameInfo.samplerate;
...@@ -259,7 +259,6 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) { ...@@ -259,7 +259,6 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) {
getOutputAudioFormat(&(dc->audioFormat), getOutputAudioFormat(&(dc->audioFormat),
&(cb->audioFormat)); &(cb->audioFormat));
dc->state = DECODE_STATE_DECODE; dc->state = DECODE_STATE_DECODE;
dc->start = 0;
} }
if(channels*(dur+offset) > frameInfo.samples) { if(channels*(dur+offset) > frameInfo.samples) {
...@@ -297,7 +296,7 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) { ...@@ -297,7 +296,7 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) {
closeInputStream(&inStream); closeInputStream(&inStream);
free(mp4cb); free(mp4cb);
if(dc->start) return -1; if(dc->state != DECODE_STATE_DECODE) return -1;
if(!dc->stop && !dc->seek && chunkLen>0) { if(!dc->stop && !dc->seek && chunkLen>0) {
cb->chunkSize[cb->end] = chunkLen; cb->chunkSize[cb->end] = chunkLen;
......
src/ogg_decode.c
View file @ c180d2f9
...@@ -175,7 +175,6 @@ int ogg_decode(OutputBuffer * cb, DecoderControl * dc) ...@@ -175,7 +175,6 @@ int ogg_decode(OutputBuffer * cb, DecoderControl * dc)
dc->totalTime = ov_time_total(&vf,-1); dc->totalTime = ov_time_total(&vf,-1);
dc->state = DECODE_STATE_DECODE; dc->state = DECODE_STATE_DECODE;
dc->start = 0;
{ {
int current_section; int current_section;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment