aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins (unfollow)
Commit message (Collapse)AuthorFilesLines
2008-09-29flac: removed FlacData.chunk_lengthMax Kellermann4-9/+3
chunk_length can be converted to a local variable, because it is always reset to 0 after it was used.
2008-09-29flac: merged flacSendChunk() into flac_common_write()Max Kellermann1-11/+6
Since flacSendChunk() is a trivial function and is only used in one location, move the code there. The advantage is that calling decoder_data() directly returns the decoder_command value, so we can eliminate one decoder_get_command() call. [ew: using the terser API in the main branch, it always eliminated the dc_intr()/dc_seek() call, but I agree that killing a camel, err.. camelCase function is a good thing]
2008-09-29flac: removed generic sample size supportMax Kellermann1-31/+27
Support for bit rates except 16 bits (and 8 bits on little endian) has always been broken. Since we added optimized functions for 8, 16, 24/32 bits, we can remove the generic flac_convert() function. Instead of removing it, convert it to a wrapper function for flac_convert_*().
2008-09-29flac: added special functions for 8 and 32 bitMax Kellermann1-0/+37
Same optimization for 8 and 32 bit files, like the previous patch for 16 bit. Along the way, this patch adds 24 bit FLAC support!
2008-09-29flac: added optimized converter for 16 bitMax Kellermann1-0/+17
flac_convert_16() runs a lot faster than the generic (and quite buggy) function flac_convert(). flac_convert_16() is only used for non-stereo files, since there is already flac_convert_stereo16().
2008-09-29flac: use signed integers in flac_convert_stereo16()Max Kellermann1-6/+4
By mistake, I casted the sample value to uint16_t, which is wrong. This patch simplifies the code by using a int16_t pointer instead of casting to int16_t* every time.
2008-09-29flac: moved code from flacWrite() to _flac_common.cMax Kellermann4-120/+90
There is still a lot of duplicated code in flac_plugin.c and oggflac_plugin.c. Move code from flac_plugin.c to _flac_common.c, and use the new function flac_common_write() also in oggflac_plugin.c, porting lots of optimizations over to it.
2008-09-29flac: assume the buffer is empty in flacWrite() IIMax Kellermann1-6/+2
The previous patch on this topic was incomplete: it still added data->chunk_length when calling flac_convert(). Remove this, too.
2008-09-20start using prefixcmp()Eric Wong1-1/+1
LOC reduction and less noise makes things easier for tired old folks to follow.
2008-09-17mp3: fix long line, I can't read past 80 colsEric Wong1-1/+2
2008-09-17mp3: fix buffer overflow when max_frames is too largeMax Kellermann1-0/+5
The function decodeFirstFrame() allocates memory based on data from the mp3 header. This can make the buffer size allocation overflow, or lead to a DoS attack with a very large buffer. Cap this buffer at 8 million frames, which should really be enough for reasonable files.
2008-09-12mp4: fix potential integer overflow bug in the mp4_decode() functionTerry1-0/+7
A crafted mp4 file could cause an integer overflow in mp4_decode function in src/inputPlugins/mp4_plugin.c. mp4ff_num_samples() function returns some tainted value. sizeof(float) * numSamples is an integer overflow operation if numSamples is too huge, so xmalloc will allocate a small memory region. I constructe a mp4 file, and use faad2 to open the file. mp4ff_num_samples() returns -1. So I think mpd bears from the same problem.
2008-09-09fix -Wcast-qual -Wwrite-strings warningsMax Kellermann2-8/+21
The previous patch enabled these warnings. In Eric's branch, they were worked around with a generic deconst_ptr() function. There are several places where we can add "const" to pointers, and in others, libraries want non-const strings. In the latter, convert string literals to "static char[]" variables - this takes the same space, and seems safer than deconsting a string literal.
2008-09-02tag: fix the shout and oggflac pluginsMax Kellermann1-1/+3
During the tag library refactoring, the shout plugin was disabled, and I forgot about adapting it to the new API. Apply the same fixes to the oggflac decoder plugin.
2008-09-02wavpack: tag_new() cannot failMax Kellermann1-5/+0
Since tag_new() uses xmalloc(), it cannot fail - if we're really out of memory, the process will abort.
2008-09-02tag: renamed functions, no CamelCaseMax Kellermann10-53/+52
2008-09-02tag: renamed MpdTag and MpdTagItem to struct mpd_tag, struct tag_itemMax Kellermann12-44/+44
Getting rid of CamelCase; not having typedefs also allows us to forward-declare the structures.
2008-09-01Fix shadow warningsEric Wong1-2/+2
2008-08-31oggflac: fix GCC warningsMax Kellermann1-9/+9
Fix lots of "unused parameter" warnings in the OggFLAC decoder plugin. Not sure if anybody uses it anymore, since newer libflac obsoletes it.
2008-08-31mp3: converted the MUTEFRAME_ macros to an enumMax Kellermann1-9/+12
Also introduce MUTEFRAME_NONE; previously, the code used "0".
2008-08-31mp3: converted the DECODE_ constants to an enumMax Kellermann1-8/+13
2008-08-31wavpack: 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-31wavpack: moved code to wavpack_open_wvc()Max Kellermann1-70/+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-30simplified 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-30oggvorbis: 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-30mp3: 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-30mp3: changed outputBuffer's type to mpd_sint16[]Max Kellermann1-4/+3
The output buffer always contains mpd_sint16; declaring it with that type saves several casts.
2008-08-30mp3: moved num_samples calculation out of the loopMax Kellermann1-6/+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-30mp3: eliminated outputPtrMax Kellermann1-17/+9
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-30mp3: don't do a second flush in mp3_decode()Max Kellermann1-12/+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-30mp3: always flush directly after decoding/ditheringMax Kellermann1-17/+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-30mp3: 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-30mp3: moved dropSamplesAtEnd check out of the loopMax Kellermann1-21/+19
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-30mp3: 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-30mp3: unsigned integersMax Kellermann1-11/+11
2008-08-30mp3: 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-30mp3: 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-30aac: support decoding AAC streamsMax Kellermann1-2/+128
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-30aac: 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-30aac: 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-30aac: use fillAacBuffer() instead of manual readingMax Kellermann1-16/+4
Eliminate some duplicated code by using fillAacBuffer().
2008-08-30find AAC framesMax Kellermann1-1/+35
Find AAC frames in the input and skip invalid data. This prepares AAC streaming.
2008-08-30aac: 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-30aac: 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.
2008-08-30aac: use inputStreamAtEOF()Max Kellermann1-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.
2008-08-30aac: don't depend on consumed data in fillAacBuffer()Max Kellermann1-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.
2008-08-30aac: simplified fillAacBuffer()Max Kellermann1-33/+25
Return instead of putting all the code into a if-closure. That saves one level of indentation.
2008-08-30aac: make adtsParse() voidMax Kellermann1-3/+1
adtsParse() always returns 1, and its caller does not use the return value.
2008-08-30aac: use size_tMax Kellermann1-6/+6
2008-08-30aac: removed unused initAacBuffer() parametersMax Kellermann1-9/+3
Since we eliminated the parameters retFileread and retTagsize in all callers, we can now safely remove it from the function prototype.