aboutsummaryrefslogtreecommitdiffstats
path: root/src (unfollow)
Commit message (Collapse)AuthorFilesLines
2008-08-26fix a comment regarding the player queueMax Kellermann1-1/+1
2008-08-26document the PLAYER_QUEUE_ constantsMax Kellermann1-0/+15
2008-08-26added enum player_queue_stateMax Kellermann3-11/+19
2008-08-26rewrote playerKill()Max Kellermann3-2/+11
playerKill() was marked as deprecated, but it seems like a good idea to do proper cleanup in all threads (e.g. for usable valgrind results). Introduce the command "EXIT" which makes the player thread exit cleanly.
2008-08-26player: don't call STOP before CLOSE_AUDIOMax Kellermann2-15/+10
playerWait() stops the player thread (twice!) and closes the output device. It should be well enough to just send CLOSE_AUDIO, without STOP. This requires a tiny change to the player thread code: make it break when CLOSE_AUDIO is sent.
2008-08-26playlist: eliminate unused fd parametersMax Kellermann3-49/+46
Again, remove file descriptor parameters, which are not actually used. These functions can also be converted to return void.
2008-08-26player: no "fd" and no return valueMax Kellermann4-47/+30
Most player*() functions do not actually use the file descriptor, and always return 0 (success). Eliminate them to get a leaner interface.
2008-08-26flac: decoder command means EOFMax Kellermann2-11/+9
It was possible for the decoder thread to go into an endless loop (flac and oggflac decoders): when a "STOP" command arrived, the Read() callback would return 0, but the EOF() callback returned false. Fix: when decoder_get_command()!=NONE, return EOF==true.
2008-08-26made "sample_size" static constMax Kellermann1-1/+1
sample_size is a variable which is computed at compile time. Declare it "static const", so the compiler can optimize it away.
2008-08-26moved jack configuration to the JackData structMax Kellermann1-49/+64
Storing local configuration in global (static) variables is obviously a bad idea. Move all those variables into the JackData struct, including the locks.
2008-08-26jack: removed unused macrosMax Kellermann1-10/+0
2008-08-26jack: don't set audioOutput->data=NULLMax Kellermann1-5/+5
There is only one caller of freeJackData() left: jack_finishDriver(). This function is called by the mpd core, and is called exactly once for every successful jack_initDriver(). We do not need to clear audioOutput->data, since this variable is invalidated anyway.
2008-08-26jack: initialize JackData in jack_initDriver()Max Kellermann1-6/+2
Over the lifetime of the jack AudioOutput object, we want a single valid JackData object, so we can persistently store data there (configuration etc.). Allocate JackData in jack_initDriver(). After that, we can safely remove all audioOutput->data==NULL checks (and replace them with assertions).
2008-08-26jack: added freeJackClient()Max Kellermann1-13/+25
No need to destroy the JackData object when an error occurs, since jack_finishDriver() already frees it. Only deinitialize the jack library, introduce freeJackClient() for that, and move code from freeJackData().
2008-08-26jack: initialize jd->client after !jd checkMax Kellermann1-5/+5
Prepare the next patch: make the "!jd" check independent of the jd->client initialization. This way we can change the "jd" initialization semantics later.
2008-08-26jack: eliminate superfluous freeJackData() callsMax Kellermann1-6/+0
connect_jack() invokes freeJackData() in every error handler, although its caller also invokes this function after a failure. We can save a lot of lines in connect_jack() by removing these redundant freeJackData() invocations.
2008-08-26mp3, flac: check for seek command after decoder_read()Max Kellermann2-4/+16
When we introduced decoder_read(), we added code which aborts the read operation when a decoder command arrives. Several plugins however did not expect that when they were converted to decoder_read(). Add proper checks to the mp3 and flac decoder plugins.
2008-08-26check decoder_command!=NONE instead of decoder_command==STOPMax Kellermann5-13/+14
The code said "decoder_command==STOP" because that was a conversion from the old "dc->stop" test. As we can now check for all commands in one test, we can simply rewrite that to decoder_command!=NONE.
2008-08-26mp3: converted the MUTEFRAME_ macros to an enumMax Kellermann1-9/+12
Also introduce MUTEFRAME_NONE; previously, the code used "0".
2008-08-26mp3: converted the DECODE_ constants to an enumMax Kellermann1-8/+13
2008-08-26added flag "decoder.seeking"Max Kellermann3-1/+12
This flag is used internally; it is set by decoder_seek_where(), and indicates that the decoder plugin has begun the seek process. It is used for the case that the decoder plugin has to read data during the seek process. Before this patch, that was impossible, because decoder_read() would refuse to read data unless dc->command is NONE. This patch is kind of a dirty workaround, and needs to be redesigned later.
2008-08-26wavpack: don't use "isp" before initializationMax Kellermann1-4/+1
The old code called can_seek() with the uninitialized pointer "isp.is". Has this ever worked? Anyway, initialize "isp" first, then call can_seek(&isp).
2008-08-26wavpack: moved code to wavpack_open_wvc()Max Kellermann1-79/+66
Move everything related to finding and initializing the WVC stream to wavpack_open_wvc(). This greatly simplifies its error handling and the function wavpack_streamdecode().
2008-08-26simplified code in the ogg decoder pluginMax Kellermann1-25/+25
Return early when the player thread sent us a command. This saves one level of indentation.
2008-08-26added decoder_read()Max Kellermann10-66/+50
On our way to stabilize the decoder API, we will one day remove the input stream functions. The most basic function, read() will be provided by decoder_api.h with this patch. It already contains a loop (still with manual polling), error/eof handling and decoder command checks. This kind of code used to be duplicated in all decoder plugins.
2008-08-26wavpack: added InputStreamPlus.decoderMax Kellermann1-4/+7
The "decoder" object reference will be used by another patch.
2008-08-26oggvorbis: don't detect OGG header if stream is not seekableMax Kellermann2-0/+10
If the input stream is not seekable, the try_decode() function consumes valuable data, which is not available to the decode() function anymore. This means that the decode() function does not parse the header correctly. Better skip the detection if we cannot seek. Or implement better buffering, something like unread() or buffered rewind().
2008-08-26added AacBuffer.decoderMax Kellermann1-4/+7
We need the decoder object at several places in the AAC plugin. Add it to mp3DecodeData, so we don't have to pass it around in every function.
2008-08-26mp3: added mp3DecodeData.decoderMax Kellermann1-9/+13
We need the decoder object at several places in the mp3 plugin. Add it to mp3DecodeData, so we don't have to pass it around in every function.
2008-08-26mp3: audio_linear_dither() returns mpd_sint16Max Kellermann1-11/+9
The return value of audio_linear_dither() is always casted to mpd_sint16. Returning long does not make sense, and consumed 8 bytes on a 64 bit platform.
2008-08-26mp3: changed outputBuffer's type to mpd_sint16[]Max Kellermann1-3/+3
The output buffer always contains mpd_sint16; declaring it with that type saves several casts.
2008-08-26mp3: moved num_samples calculation out of the loopMax Kellermann1-5/+7
The previous patch removed all loop specific dependencies from the num_samples formula; we can now calculate it before entering the loop.
2008-08-26mp3: eliminated outputPtrMax Kellermann1-14/+3
The output buffer is always flushed after being appended to, which allows us to assume it is always empty. Always start writing at outputBuffer, don't remember outputPtr.
2008-08-26mp3: don't do a second flush in mp3_decode()Max Kellermann1-17/+1
The previous patch made mp3Read() flush the output buffer in every iteration, which means we can eliminate the flush check after invoking mp3Read().
2008-08-26mp3: always flush directly after decoding/ditheringMax Kellermann1-15/+13
Since we try to fill the buffer in every iteration, we assume that we should flush the output buffer at the end of each iteration.
2008-08-26mp3: dither a whole block at a timeMax Kellermann1-3/+9
Fill the whole output buffer at a time by using dither_buffer()'s ability to decode blocks. Calculate how many samples fit into the output buffer before each invocation.
2008-08-26mp3: moved dropSamplesAtEnd check out of the loopMax Kellermann1-21/+18
Simplifying loops for performance: why check dropSamplesAtEnd in every iteration, when we could modify the loop boundary? The (writable) variable samplesLeft can be eliminated; add a write-once variable pcm_length instead, which is used for the loop condition.
2008-08-26mp3: make samplesPerFrame more localMax Kellermann1-2/+1
The variable samplesPerFrame is used only in one single closure. Make it local to this closure. The compiler will probably convert it to a register anyway.
2008-08-26mp3: unsigned integersMax Kellermann1-11/+11
2008-08-26mp3: removed double cmd==STOP checkMax Kellermann1-3/+0
cmd has already been checked before, it cannot have changed meanwhile because it is a local variable.
2008-08-26mp3: moved code to dither_buffer()Max Kellermann1-14/+30
Preparing for simplifying and thus speeding up the dithering code: moved dithering to a separate function which contains a trivial loop. With this patch, only one sample is dithered at a time, but the following patches will allow us to dither a whole block at a time, without complicated buffer length checks.
2008-08-26mp3: don't check dropSamplesAtStart in the loopMax Kellermann1-7/+14
Performance improvement by moving stuff out of a loop: skip part of the first frame before entering the loop.
2008-08-26assert song->url != NULLMax Kellermann3-0/+10
2008-08-26aac: support decoding AAC streamsMax Kellermann1-2/+137
Copy some code from aac_decode() to aac_stream_decode() and apply necessary changes to allow streaming audio data. Both functions might be merged later.
2008-08-26aac: splitted aac_parse_header() from initAacBuffer()Max Kellermann1-11/+16
initAacBuffer() should really only initialize the buffer; currently, it also reads data from the input stream and parses the header. All of the AAC buffer code should probably be moved to a separate library anyway.
2008-08-26aac: check buffer lengthsMax Kellermann1-2/+3
The AAC plugin sometimes does not check the length of available data when checking for magic prefixes. Add length checks.
2008-08-26aac: use fillAacBuffer() instead of manual readingMax Kellermann1-16/+4
Eliminate some duplicated code by using fillAacBuffer().
2008-08-26find AAC framesMax Kellermann1-1/+35
Find AAC frames in the input and skip invalid data. This prepares AAC streaming.
2008-08-26aac: moved code to adts_check_frame()Max Kellermann1-11/+20
adts_check_frame() checks whether the buffer head is an AAC frame, and returns the frame length.
2008-08-26aac: moved code to aac_buffer_shift()Max Kellermann1-7/+14
Shifting from the buffer queue is a common operation, and should be provided as a separate function. Move code to aac_buffer_shift() and add a bunch of assertions.