aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* alsa: re-enable-nonblocking, but sleep if busyEric Wong2008-09-231-7/+10
| | | | | | | Instead of letting ALSA block for us (and potentially allowing something stupid on certain hardware or drivers), we do the sleeping ourselves. We calculate the sleep to be a fraction of period_time to avoid oversleeping (and thus audible skipping).
* songvec: avoid free(NULL)Eric Wong2008-09-231-2/+4
| | | | Potentially broken free() implementations don't like it
* directory: fix leak introduced with threaded updateEric Wong2008-09-231-1/+1
| | | | | Use freeList() instead of free() to free all elements in the list.
* Remove EINTR checking for open(2)Eric Wong2008-09-232-3/+2
| | | | | | open(2) should only interrupt on "slow" devices, afaik... [mk: still using fopen()]
* directory: don't leak file handles if we get a corrupt dbEric Wong2008-09-231-1/+1
|
* songvec: remove songvec_pruneEric Wong2008-09-233-28/+0
| | | | | | Any pruned files will be noticed during update and pruned from the live database, so this inefficient function can go away and never come back.
* directory: update do its work inside a threadEric Wong2008-09-235-150/+58
| | | | | | | | | A lot of the preparation was needed (and done in previous months) in making update thread-safe, but here it is. This was the first thing I made work inside a thread when I started mpd-uclinux many years ago, and also the last thing I've done in mainline mpd to work inside a thread, go figure.
* directory: use enum update_return for return values IIMax Kellermann2008-09-231-16/+21
| | | | Converted some more functions and their callers to enum update_return.
* directory: use enum update_return for return valuesEric Wong2008-09-231-72/+49
| | | | This way we avoid having to document -1, 0, 1
* Don't try to prune unless we're updatingEric Wong2008-09-231-1/+2
| | | | | | Pruning is very expensive and we won't need it in the future anyways. This brings startup back to previous speeds (before songvec changes).
* workaround race condition on updates with broken signal blockingEric Wong2008-09-231-39/+50
| | | | | | | | | pthreads with our existing signal blocking/handling is broken, for now just sleep a bit in the child to prevent the CHLD handler from being called too early. Also, improve error reporting when handling SIGCHLD by storing the status to be called in the main task (which can be logged, since we can't do logging inside the sig handler).
* Replace SongList with struct songvecEric Wong2008-09-2311-113/+212
| | | | | | | Our linked-list implementation is wasteful and the SongList isn't modified enough to benefit from being a linked list. So use a more compact array of song pointers which saves ~200K on a library with ~9K songs (on x86-32).
* directory: remove unused updateMp3Directory() functionEric Wong2008-09-232-20/+0
| | | | | | | | | | | | It hasn't been used in many years commit 3a89afdd80f228139554372a83a9d74486acf691 Author: Warren Dukes <warren.dukes@gmail.com> Date: Sat Nov 20 20:28:32 2004 +0000 remove --update-db option (SVN r2719)
* start using prefixcmp()Eric Wong2008-09-237-52/+24
| | | | | LOC reduction and less noise makes things easier for tired old folks to follow.
* Add prefixcmp() (stol^H^H^H^Hborrowed from git)Eric Wong2008-09-232-0/+12
| | | | | | | This allows us to avoid the nasty repetition in strncmp(foo, bar, strlen(foo)). We'll miss out on the compiler optimizing strlen() into sizeof() - 1 for string literals for this; but we don't use this it for performance-critical functions anyways...
* volume: oops, only #include <alloca.h> if OSS is enabledEric Wong2008-09-231-1/+0
|
* oss: avoid heap allocations when configuring mixerEric Wong2008-09-231-13/+13
| | | | Noticed-by: Courtney Cavin
* Directory: don't allocate stat information dynamicallyEric Wong2008-09-232-50/+22
| | | | | | | This should save a few thousand ops. Not worth it to malloc for such a small (3-words on 32-bit ARM and x86) structures. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* mp3: fix long line, I can't read past 80 colsEric Wong2008-09-231-1/+2
|
* main_notify: removed assertion in wakeup_main_task()Max Kellermann2008-09-231-2/+0
| | | | | It is legal to call wakeup_main_task() from within the main thread, e.g. from within a signal handler. Remove the assertion.
* main_notify: use init_async_pipe()Max Kellermann2008-09-231-8/+1
| | | | Remove duplicated code.
* mp3: fix buffer overflow when max_frames is too largeMax Kellermann2008-09-171-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.
* client: check expired after client_process_line()Max Kellermann2008-09-171-1/+3
| | | | | | The assertion on "!client_is_expired(client)" was wrong, because writing the command response may cause the client to become expired. Replace that assertion with a check.
* mp4: fix potential integer overflow bug in the mp4_decode() functionTerry2008-09-121-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.
* shout: don't write empty buffersMax Kellermann2008-09-121-2/+4
| | | | | Add a check to write_page() which checks if there is actually data. Don't bother to call shout_send() if there is not.
* shout: removed clear_shout_buffer()Max Kellermann2008-09-121-8/+2
| | | | | The function is trivial, without a benefit. Also don't initialize buf.data[0], this is not a null terminated string.
* shout: make the shout_buffer staticMax Kellermann2008-09-124-12/+4
| | | | | | | Since the buffer size is known at compile time, we can save an indirection by declaring it as a char array instead of a pointer. That saves an extra allocation, and we can calculate with the compile-time constant sizeof(data) instead of the attribute "max_len".
* shout: constant plugin declarationsMax Kellermann2008-09-124-7/+7
| | | | | Declare both shout plugins "const", since they will never change, once initialized at compile time.
* shout: static encoder plugin listMax Kellermann2008-09-121-35/+15
| | | | | | Shout encoder plugins are known at compile time. There is no reason to use a complex data structure as "List" to manage them at runtime - just put the pointers into a static array.
* shout: removed typedefs on structs and plugin methodsMax Kellermann2008-09-124-73/+65
| | | | | | | Don't typedef the structs at all. It is easier to forward-declare this way. Don't typedef methods. They are used exactly once, a few lines below.
* shout: added mp3 encoderEric Wollesen2008-09-124-0/+197
| | | | | | | | | | | | | [mk: moved this patch after "Refactor and cleanup of shout Ogg and MP3 audio outputs". The original commit message follows, although it is outdated:] Creation of shout_mp3 audio output plugin. Basically I just copied the existing shout plugin and replaced ogg with lame. Uses lame for mp3 encoding. Next step is to pull common functionality out of each shout plugin and share it between them. Configuration options for "shout_mp3" are the same as for "shout".
* shout: introduce pluggable encoder APIEric Wollesen2008-09-123-55/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've perhaps gone a bit overboard, but here's the current rundown: Both Ogg and MP3 use the "shout" audio output plugin. The shout audio output plugin itself has two new plugins, one for the Ogg encoder, and another for the MP3 (LAME) encoder. Configuration for an Ogg stream doesn't change. For an MP3 stream, configuration is the same as Ogg, with two exceptions. First, you must specify the optional "encoding" parameter, which should be set to "mp3". See mpd.conf(5) for more details. Second, the "quality" parameter is reversed for LAME, such that 1 is high quality for LAME, whereas 10 is high quality for Ogg. I've decomposed the code so that all libshout related operations are done in audioOutput_shout.c, all Ogg specific functions are in audioOutput_shout_ogg.c, and of course then all LAME specific functions are handled in audioOutput_shout_mp3.c. To develop encoder plugins for the shout audio output plugin, I basically just mimicked the plugin system used for audio outputs. This might be overkill, but hopefully if anyone ever wants to support some other sort of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will hopefully be all set. The Ogg encoder is slightly less optimal under this configuration. It used to send shout data directly out of its ogg_page structures. Now, in the interest of encapsulation, it copies the data from its ogg_page structures into a buffer provided by the shout audio output plugin (see audioOutput_shout_ogg.c, line 77.) I suspect the performance impact is negligible. As for metadata, I'm pretty sure they'll both work. I wrote up a test scaffold that would create a fake tag, and tell the plugin to send it out to the stream every few seconds. It seemed to work fine. Of course, if something does break, I'll be glad to fix it. Lastly, I've renamed lots of things into snake_case, in keeping with normalperson's wishes in that regard. [mk: moved the MP3 patch after this one. Splitted this patch into several parts; the others were already applied before this one. Fixed a bunch GCC warnings and wrong whitespace modifications. Made it compile with mpd-mk by adapting to its prototypes]
* shout: send shout metadataEric Wollesen2008-09-123-5/+19
| | | | | | | | | Support sending metadata to a shout server using shout_metadata_new() and shout_metadata_add(). The Ogg Vorbis encoder does not support this currently. [mk: this patch was separated from Eric's patch "Refactor and cleanup of shout Ogg and MP3 audio outputs", I added a description]
* shout: added struct _ogg_vorbis_dataMax Kellermann2008-09-122-56/+73
| | | | | | Preparing the merge of Eric Wollesen's patch "Refactor and cleanup of shout Ogg and MP3 audio outputs": we declare one of the struct types here, to make the merge smoother.
* shout: added shout_bufferEric Wollesen2008-09-123-46/+102
| | | | | | | | | | | | The Ogg encoder is slightly less optimal under this configuration. It used to send shout data directly out of its ogg_page structures. Now, in the interest of encapsulation, it copies the data from its ogg_page structures into a buffer provided by the shout audio output plugin (see audioOutput_shout_ogg.c, line 77.) I suspect the performance impact is negligible. [mk: this patch and its description was separated from Eric's patch "Refactor and cleanup of shout Ogg and MP3 audio outputs"]
* shout: moved code to audioOutput_shout_ogg.cMax Kellermann2008-09-124-153/+211
| | | | | | | | | | | Begin dividing audioOutput_shout.c: move everything OGG Vorbis related to audioOutput_shout_ogg.c. The header audioOutput_shout.h has to keep its dependency on vorbis/vorbisenc.h, because it needs the vorbis encoder types. For this patch, we have to export several internal functions with generic names to the ABI; these will be removed later when the encoder plugin patches are merged.
* shout: moved declarations to audioOutput_shout.hMax Kellermann2008-09-123-40/+70
| | | | | Prepare the split of the shout plugin into multiple sources: move all important declarations to audioOutput_shout.h.
* shout: removed commented codeMax Kellermann2008-09-121-4/+0
| | | | | | Remove unused code which is in comments. Remove that comment about "stolen code", since the plugin has changed much, and it isn't obvious which parts are derived.
* shout: no CamelCaseMax Kellermann2008-09-121-194/+194
|
* output: copy reqAudioFormat to outAudioFormat only if not yet openMax Kellermann2008-09-111-1/+7
| | | | | | If the output device is already open, it may have modified outAudioFormat; in this case, outAudioFormat is still valid, and does not need an overwrite.
* output: don't initialize inAudioFormat, outAudioFormatMax Kellermann2008-09-111-4/+0
| | | | | | As long as the device isn't open, both attributes are not used. Since they will both be initialized in audio_output_open(), we do not need the initialization in audio_output_init().
* shout: use reqAudioFormat instead of outAudioFormatMax Kellermann2008-09-111-1/+1
| | | | | In the plugin's init() function, outAudioFormat is simply a copy of reqAudioFormat. Use reqAudioFormat instead of outAudioFormat here.
* shout: copy the audio_format, instead of taking a pointerMax Kellermann2008-09-111-13/+12
| | | | | | | Storing pointers to immutable audio_format structs isn't worth it, because the struct itself isn't much larger than the pointer. Since the shout plugin requires the user to configure a fixed audio format, we can simply copy it in myShout_initDriver().
* output: removed audio_output.sameInAndOutFormatsMax Kellermann2008-09-113-8/+2
| | | | | Eliminate sameInAndOutFormats and check with audio_format_equals() each time it this information is needed. Another 4 bytes saved.
* output: removed audio_output.convertAudioFormatMax Kellermann2008-09-113-7/+3
| | | | | Instead of checking convertAudioFormat, we can simply check if reqAudioFormat is defined. This saves 4 bytes in the struct.
* audio: removed commented codeMax Kellermann2008-09-101-12/+0
| | | | We have git..
* audio: added assertionsMax Kellermann2008-09-101-0/+5
|
* audio: make audio_configFormat a static variableMax Kellermann2008-09-101-8/+5
| | | | | | Save one allocation, since the whole audio_format struct is nearly the same size as the pointer to it. Check audio_format_defined(af) instead of af!=NULL.
* audio: don't free uninitialized audio_bufferMax Kellermann2008-09-101-5/+6
| | | | | | | free(NULL) isn't explicitly forbidden, but isn't exactly good style. Check the rare case that the audio buffer isn't initialized yet in closeAudioDevice(). In this case, we also don't have to call flushAudioBuffer().
* audio: added function audio_buffer_resize()Max Kellermann2008-09-101-4/+22
| | | | | | To make openAudioDevice() smaller and more readable, move code to a static function. Also don't use realloc(), since the old value of the buffer isn't needed anymore, saving a memcpy().
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 00:26:21 +0000