aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* mp3: changed outputBuffer's type to mpd_sint16[]Max Kellermann2008-08-261-3/+3
| | | | | The output buffer always contains mpd_sint16; declaring it with that type saves several casts.
* mp3: moved num_samples calculation out of the loopMax Kellermann2008-08-261-5/+7
| | | | | The previous patch removed all loop specific dependencies from the num_samples formula; we can now calculate it before entering the loop.
* mp3: eliminated outputPtrMax Kellermann2008-08-261-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.
* mp3: don't do a second flush in mp3_decode()Max Kellermann2008-08-261-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().
* mp3: always flush directly after decoding/ditheringMax Kellermann2008-08-261-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.
* mp3: dither a whole block at a timeMax Kellermann2008-08-261-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.
* mp3: moved dropSamplesAtEnd check out of the loopMax Kellermann2008-08-261-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.
* mp3: make samplesPerFrame more localMax Kellermann2008-08-261-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.
* mp3: unsigned integersMax Kellermann2008-08-261-11/+11
|
* mp3: removed double cmd==STOP checkMax Kellermann2008-08-261-3/+0
| | | | | cmd has already been checked before, it cannot have changed meanwhile because it is a local variable.
* mp3: moved code to dither_buffer()Max Kellermann2008-08-261-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.
* mp3: don't check dropSamplesAtStart in the loopMax Kellermann2008-08-261-7/+14
| | | | | Performance improvement by moving stuff out of a loop: skip part of the first frame before entering the loop.
* assert song->url != NULLMax Kellermann2008-08-263-0/+10
|
* aac: support decoding AAC streamsMax Kellermann2008-08-261-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.
* aac: splitted aac_parse_header() from initAacBuffer()Max Kellermann2008-08-261-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.
* aac: check buffer lengthsMax Kellermann2008-08-261-2/+3
| | | | | The AAC plugin sometimes does not check the length of available data when checking for magic prefixes. Add length checks.
* aac: use fillAacBuffer() instead of manual readingMax Kellermann2008-08-261-16/+4
| | | | Eliminate some duplicated code by using fillAacBuffer().
* find AAC framesMax Kellermann2008-08-261-1/+35
| | | | | Find AAC frames in the input and skip invalid data. This prepares AAC streaming.
* aac: moved code to adts_check_frame()Max Kellermann2008-08-261-11/+20
| | | | | adts_check_frame() checks whether the buffer head is an AAC frame, and returns the frame length.
* aac: moved code to aac_buffer_shift()Max Kellermann2008-08-261-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.
* aac: use inputStreamAtEOF()Max Kellermann2008-08-261-5/+4
| | | | | | | | | When checking for EOF, we should not check whether the read request has been fully satisified. The InputStream API does not guarantee that readFromInputStream() always fills the whole buffer, if EOF is not reached. Since there is the function inputStreamAtEOF() dedicated for this purpose, we should use it for EOF checking after readFromInputStream()==0.
* aac: don't depend on consumed data in fillAacBuffer()Max Kellermann2008-08-261-6/+10
| | | | | | Fill the AacBuffer even when nothing has been consumed yet. The function should not check for consumed data, but for free space at the end of the buffer.
* aac: simplified fillAacBuffer()Max Kellermann2008-08-261-33/+25
| | | | | Return instead of putting all the code into a if-closure. That saves one level of indentation.
* aac: make adtsParse() voidMax Kellermann2008-08-261-3/+1
| | | | | adtsParse() always returns 1, and its caller does not use the return value.
* aac: use size_tMax Kellermann2008-08-261-6/+6
|
* aac: removed unused initAacBuffer() parametersMax Kellermann2008-08-261-9/+3
| | | | | Since we eliminated the parameters retFileread and retTagsize in all callers, we can now safely remove it from the function prototype.
* eliminate unused variables in the AAC decoderMax Kellermann2008-08-261-10/+2
|
* added InputStream.readyMax Kellermann2008-08-265-0/+19
| | | | | | | The flag "ready" indicates whether the input stream is ready and it has parsed all meta data. Previously, it was impossible for decodeStart() to see the content type of HTTP input streams, because at that time, the HTTP response wasn't parsed yet.
* added decoder_plugin_register()Max Kellermann2008-08-263-2/+16
| | | | | | | With the functions decoder_plugin_register() and decoder_plugin_unregister(), decoder plugins can register a "secondary" plugin, like the flac input plugin does this for "oggflac".
* don't call quitDecode() in waitOnDecode()Max Kellermann2008-08-261-2/+3
| | | | | To make the code more consistent, call quitDecode() only at the end of decodeParent().
* moved code to player_thread.cMax Kellermann2008-08-267-450/+495
| | | | | Move code which runs in the player thread to player_thread.c. Having a lot of player thread code in decode.c isn't easy to understand.
* moved code to crossfade.cMax Kellermann2008-08-264-49/+108
| | | | | | decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
* added inline function audio_format_time_to_size()Max Kellermann2008-08-262-1/+6
| | | | | Make the code more readable by hiding big formulas in an inline function with a nice name.
* pass max_chunks to calculateCrossFadeChunks()Max Kellermann2008-08-261-7/+8
| | | | | Make calculateCrossFadeChunks() more generic and portable by eliminating global variable access.
* converted MpdTagItem.type to an enumMax Kellermann2008-08-265-22/+28
| | | | | Don't use CPP macros when you can use C enum... this also allows better type checking.
* renamed functions in decoder_list.hMax Kellermann2008-08-266-36/+40
| | | | InputPlugin to decoder_plugin, and no camelCase.
* no camel case in struct decoder_pluginMax Kellermann2008-08-265-39/+41
|
* renamed the InputPlugin function typesMax Kellermann2008-08-261-14/+13
| | | | Continuing the effort to rename InputPlugin to decoder_plugin...
* renamed inputPlugin.* to decoder_list.*Max Kellermann2008-08-267-7/+7
| | | | | Since inputPlugin.c manages the list of registered decoders, we should rename the source file.
* moved decoder externs to inputPlugin.cMax Kellermann2008-08-262-11/+11
| | | | | The decoder_plugin instances are only used inputPlugin.c, so move them from the header file.
* renamed InputPlugin to struct decoder_pluginMax Kellermann2008-08-2618-59/+65
| | | | | | "decoder plugin" is a better name than "input plugin", since the plugin does not actually do the input - InputStream does. Also don't use typedef, so we can forward-declare it if required.
* no busy-waiting for the player processMax Kellermann2008-08-261-2/+3
| | | | | The function player_command() inherited the busy-waiting algorithm from the old code; throw in a wait_main_task() to do idle waiting.
* converted PlayerControl.state to enumMax Kellermann2008-08-262-6/+11
| | | | | Don't write CPP when you can express the same in C... macros vs enum is a good example for that.
* added PlayerControl.commandMax Kellermann2008-08-264-77/+93
| | | | | | | PlayerControl.command replaces the old attributes play, stop, pause, closeAudio, lockQueue, unlockQueue, seek. The main thread waits for each command synchronously, so there can only be one command enabled at a time anyway.
* eliminate OUTPUT_BUFFER_DC_STOP, OUTPUT_BUFFER_DC_SEEKMax Kellermann2008-08-265-23/+20
| | | | | (Ab)use the decoder_command enumeration, which has nearly the same values and the same meaning.
* added decoder_get_url()Max Kellermann2008-08-263-1/+8
| | | | | | The wavpack decoder plugin implements a hack, and it needs the song URL for that. This API (and the hack) should be revised later, but add that function for now.
* don't set dc->seekable in wavpack pluginMax Kellermann2008-08-261-2/+0
| | | | dc->seekable is already set by decodeStart().
* use a local "initialized" flag instead of dc->stateMax Kellermann2008-08-263-5/+11
| | | | | | Since we want to hide mpd internals from the decoder plugins, the plugins should not check dc->state whether they have already called decoder_initialized(). Use a local variable to track that.
* added decoder_seek_where() and decoder_seek_error()Max Kellermann2008-08-2612-42/+60
| | | | | Provide access to seeking for the decoder plugins; they have to know where to seek, and they need a way to tell us that seeking has failed.
* added decoder_command_finished() to decoder_api.hMax Kellermann2008-08-2614-33/+34
| | | | | | | Some decoder commands are implemented in the decoder plugins, thus they need to have an API call to signal that their current command has been finished. Let them use the new decoder_command_finished() instead of the internal dc_command_finished().