oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

wavpack: read first byte from wvc stream

Browse Source 
Instead of manually waiting for the input stream to become ready (to
catch server errors), just read the first byte.  Since the
wavpack_input has the capability to push back one byte, we can simply
re-feed it.  Advantage is: decoder_read() handles everything for us,
i.e. waiting for the stream, polling for decoder commands and error
handling.
This commit is contained in:
Max Kellermann 2008-11-04 17:10:03 +01:00
parent 3cf54591e9
commit 097bccd4ae
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/decoder/wavpack_plugin.c
View File

@ -431,13 +431,16 @@ static bool wavpack_trydecode(struct input_stream *is)
} }
static bool static bool
wavpack_open_wvc(struct decoder *decoder, struct input_stream *is_wvc) wavpack_open_wvc(struct decoder *decoder, struct input_stream *is_wvc,
struct wavpack_input *wpi)
{ {
char tmp[MPD_PATH_MAX]; char tmp[MPD_PATH_MAX];
const char *utf8url; const char *utf8url;
size_t len; size_t len;
char *wvc_url = NULL; char *wvc_url = NULL;
bool ret; bool ret;
char first_byte;
size_t nbytes;
/* /*
* As we use dc->utf8url, this function will be bad for * As we use dc->utf8url, this function will be bad for
@ -469,28 +472,15 @@ wavpack_open_wvc(struct decoder *decoder, struct input_stream *is_wvc)
* And we try to buffer in order to get know * And we try to buffer in order to get know
* about a possible 404 error. * about a possible 404 error.
*/ */
for (;;) { nbytes = decoder_read(decoder, is_wvc,
if (input_stream_eof(is_wvc)) { &first_byte, sizeof(first_byte));
/* if (nbytes == 0)
* EOF is reached even without return false;
* a single byte is read...
* So, this is not good :/
*/
input_stream_close(is_wvc);
return false;
}
if (input_stream_buffer(is_wvc) >= 0) /* push it back */
return true; wavpack_input_init(wpi, decoder, is_wvc);
wpi->last_byte = first_byte;
if (decoder_get_command(decoder) != DECODE_COMMAND_NONE) { return true;
input_stream_close(is_wvc);
return false;
}
/* Save some CPU */
my_usleep(1000);
}
} }
/* /*
@ -505,10 +495,8 @@ wavpack_streamdecode(struct decoder * decoder, struct input_stream *is)
int open_flags = OPEN_2CH_MAX | OPEN_NORMALIZE /*| OPEN_STREAMING*/; int open_flags = OPEN_2CH_MAX | OPEN_NORMALIZE /*| OPEN_STREAMING*/;
struct wavpack_input isp, isp_wvc; struct wavpack_input isp, isp_wvc;
if (wavpack_open_wvc(decoder, &is_wvc)) { if (wavpack_open_wvc(decoder, &is_wvc, &isp_wvc))
wavpack_input_init(&isp_wvc, decoder, &is_wvc);
open_flags |= OPEN_WVC; open_flags |= OPEN_WVC;
}
wavpack_input_init(&isp, decoder, is); wavpack_input_init(&isp, decoder, is);
wpc = WavpackOpenFileInputEx(&mpd_is_reader, &isp, &isp_wvc, error, wpc = WavpackOpenFileInputEx(&mpd_is_reader, &isp, &isp_wvc, error,