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

decoder_api: no CamelCase

Browse Source 
Renamed variables.
This commit is contained in:
Max Kellermann 2008-11-03 17:56:41 +01:00
parent b54348a1e5
commit b9d456a041
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/decoder_api.c
View File

@ -91,12 +91,12 @@ void decoder_seek_error(struct decoder * decoder)
} }
size_t decoder_read(struct decoder *decoder, size_t decoder_read(struct decoder *decoder,
struct input_stream *inStream, struct input_stream *is,
void *buffer, size_t length) void *buffer, size_t length)
{ {
size_t nbytes; size_t nbytes;
assert(inStream != NULL); assert(is != NULL);
assert(buffer != NULL); assert(buffer != NULL);
while (true) { while (true) {
@ -107,8 +107,8 @@ size_t decoder_read(struct decoder *decoder,
dc.command != DECODE_COMMAND_NONE) dc.command != DECODE_COMMAND_NONE)
return 0; return 0;
nbytes = input_stream_read(inStream, buffer, length); nbytes = input_stream_read(is, buffer, length);
if (nbytes > 0 || input_stream_eof(inStream)) if (nbytes > 0 || input_stream_eof(is))
return nbytes; return nbytes;
/* sleep for a fraction of a second! */ /* sleep for a fraction of a second! */
@ -122,14 +122,13 @@ size_t decoder_read(struct decoder *decoder,
* one. * one.
*/ */
static enum decoder_command static enum decoder_command
need_chunks(struct input_stream *inStream) need_chunks(struct input_stream *is)
{ {
if (dc.command == DECODE_COMMAND_STOP || if (dc.command == DECODE_COMMAND_STOP ||
dc.command == DECODE_COMMAND_SEEK) dc.command == DECODE_COMMAND_SEEK)
return dc.command; return dc.command;
if (!inStream || if (is == NULL || input_stream_buffer(is) <= 0) {
input_stream_buffer(inStream) <= 0) {
notify_wait(&dc.notify); notify_wait(&dc.notify);
notify_signal(&pc.notify); notify_signal(&pc.notify);
} }
@ -139,50 +138,49 @@ need_chunks(struct input_stream *inStream)
enum decoder_command enum decoder_command
decoder_data(struct decoder *decoder, decoder_data(struct decoder *decoder,
struct input_stream *inStream, struct input_stream *is,
void *dataIn, size_t dataInLen, void *_data, size_t length,
float data_time, uint16_t bitRate, float data_time, uint16_t bitRate,
ReplayGainInfo * replayGainInfo) ReplayGainInfo *replay_gain_info)
{ {
static char *conv_buffer;
static size_t conv_buffer_size;
size_t nbytes; size_t nbytes;
char *data; char *data;
size_t datalen;
static char *convBuffer;
static size_t convBufferLen;
if (audio_format_equals(&dc.in_audio_format, &dc.out_audio_format)) { if (audio_format_equals(&dc.in_audio_format, &dc.out_audio_format)) {
data = dataIn; data = _data;
datalen = dataInLen;
} else { } else {
datalen = pcm_convert_size(&dc.in_audio_format, dataInLen, length = pcm_convert_size(&dc.in_audio_format, length,
&dc.out_audio_format); &dc.out_audio_format);
if (datalen > convBufferLen) { if (length > conv_buffer_size) {
if (convBuffer != NULL) if (conv_buffer != NULL)
free(convBuffer); free(conv_buffer);
convBuffer = xmalloc(datalen); conv_buffer = xmalloc(length);
convBufferLen = datalen; conv_buffer_size = length;
} }
data = convBuffer;
datalen = pcm_convert(&dc.in_audio_format, dataIn, data = conv_buffer;
dataInLen, &dc.out_audio_format, length = pcm_convert(&dc.in_audio_format, _data,
data, &decoder->conv_state); length, &dc.out_audio_format,
data, &decoder->conv_state);
} }
if (replayGainInfo != NULL && (replayGainState != REPLAYGAIN_OFF)) if (replay_gain_info != NULL && (replayGainState != REPLAYGAIN_OFF))
doReplayGain(replayGainInfo, data, datalen, doReplayGain(replay_gain_info, data, length,
&dc.out_audio_format); &dc.out_audio_format);
else if (normalizationEnabled) else if (normalizationEnabled)
normalizeData(data, datalen, &dc.out_audio_format); normalizeData(data, length, &dc.out_audio_format);
while (datalen > 0) { while (length > 0) {
nbytes = music_pipe_append(data, datalen, nbytes = music_pipe_append(data, length,
&dc.out_audio_format, &dc.out_audio_format,
data_time, bitRate); data_time, bitRate);
datalen -= nbytes; length -= nbytes;
data += nbytes; data += nbytes;
if (datalen > 0) { if (length > 0) {
enum decoder_command cmd = need_chunks(inStream); enum decoder_command cmd = need_chunks(is);
if (cmd != DECODE_COMMAND_NONE) if (cmd != DECODE_COMMAND_NONE)
return cmd; return cmd;
} }