aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* fix -Wcast-qual -Wwrite-strings warningsMax Kellermann2008-09-092-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.
* tag: fix the shout and oggflac pluginsMax Kellermann2008-09-021-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.
* wavpack: tag_new() cannot failMax Kellermann2008-09-021-5/+0
| | | | | Since tag_new() uses xmalloc(), it cannot fail - if we're really out of memory, the process will abort.
* tag: renamed functions, no CamelCaseMax Kellermann2008-09-0210-53/+52
|
* tag: renamed MpdTag and MpdTagItem to struct mpd_tag, struct tag_itemMax Kellermann2008-09-0212-44/+44
| | | | | Getting rid of CamelCase; not having typedefs also allows us to forward-declare the structures.
* Merge branch 'mk/cleanups'Eric Wong2008-09-0113-418/+509
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mk/cleanups: (60 commits) pass constant pointers const pointers unsigned integers and size_t oggflac: fix GCC warnings include cleanup protect locate.h from double inclusion playlist: eliminate unused fd parameters jack: made "sample_size" static const moved jack configuration to the JackData struct jack: removed unused macros jack: don't set audioOutput->data=NULL jack: initialize JackData in jack_initDriver() jack: added freeJackClient() jack: initialize jd->client after !jd check jack: eliminate superfluous freeJackData() calls mp3: converted the MUTEFRAME_ macros to an enum mp3: converted the DECODE_ constants to an enum wavpack: don't use "isp" before initialization wavpack: moved code to wavpack_open_wvc() simplified code in the ogg decoder plugin ...
| * oggflac: fix GCC warningsMax Kellermann2008-08-311-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.
| * mp3: converted the MUTEFRAME_ macros to an enumMax Kellermann2008-08-311-9/+12
| | | | | | | | Also introduce MUTEFRAME_NONE; previously, the code used "0".
| * mp3: converted the DECODE_ constants to an enumMax Kellermann2008-08-311-8/+13
| |
| * wavpack: don't use "isp" before initializationMax Kellermann2008-08-311-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).
| * wavpack: moved code to wavpack_open_wvc()Max Kellermann2008-08-311-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().
| * simplified code in the ogg decoder pluginMax Kellermann2008-08-301-25/+25
| | | | | | | | | | Return early when the player thread sent us a command. This saves one level of indentation.
| * oggvorbis: don't detect OGG header if stream is not seekableMax Kellermann2008-08-302-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().
| * mp3: audio_linear_dither() returns mpd_sint16Max Kellermann2008-08-301-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.
| * mp3: changed outputBuffer's type to mpd_sint16[]Max Kellermann2008-08-301-4/+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-301-6/+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-301-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.
| * mp3: don't do a second flush in mp3_decode()Max Kellermann2008-08-301-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().
| * mp3: always flush directly after decoding/ditheringMax Kellermann2008-08-301-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.
| * mp3: dither a whole block at a timeMax Kellermann2008-08-301-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-301-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.
| * mp3: make samplesPerFrame more localMax Kellermann2008-08-301-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-301-11/+11
| |
| * mp3: moved code to dither_buffer()Max Kellermann2008-08-301-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-301-7/+14
| | | | | | | | | | Performance improvement by moving stuff out of a loop: skip part of the first frame before entering the loop.
| * aac: support decoding AAC streamsMax Kellermann2008-08-301-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.
| * aac: splitted aac_parse_header() from initAacBuffer()Max Kellermann2008-08-301-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-301-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-301-16/+4
| | | | | | | | Eliminate some duplicated code by using fillAacBuffer().
| * find AAC framesMax Kellermann2008-08-301-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-301-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-301-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-301-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-301-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-301-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-301-3/+1
| | | | | | | | | | adtsParse() always returns 1, and its caller does not use the return value.
| * aac: use size_tMax Kellermann2008-08-301-6/+6
| |
| * aac: removed unused initAacBuffer() parametersMax Kellermann2008-08-301-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-301-10/+2
| |
| * audiofile: remove one indent level from audiofile pluginMax Kellermann2008-08-301-27/+24
| | | | | | | | | | Anonymous code blocks just to declare variables look ugly. Move the variable declarations up and disband the code block.
| * audiofile: use break instead of local variable "eof"Max Kellermann2008-08-301-3/+3
| | | | | | | | | | | | | | Similar to previous patch: eliminate one variable by using "break". This also simplifies the code since we can remove one level of indent. [ew: rewritten to match current API]
| * aac/mp4: removed local variable "eof" because it is unusedMax Kellermann2008-08-302-17/+10
| | | | | | | | | | "break" is so much easier than "eof=1; continue;", when "!eof" is the loop condition.
| * clean up CPP includesMax Kellermann2008-08-3013-61/+0
| | | | | | | | | | | | | | Include only headers which are really required. This speeds up compilation and helps detect cross-layer accesses. [ew: minor fixups to not break on new core]
| * enable -Wpointer-arith, -Wstrict-prototypesMax Kellermann2008-08-304-10/+11
| | | | | | | | | | | | Also enable -Wunused-parameter - this forces us to add the gcc "unused" attribute to a lot of parameters (mostly library callback functions), but it's worth it during code refactorizations.
* | Fix shadow warningsEric Wong2008-09-011-2/+2
|/
* Reimplement dynamic metadata handlingEric Wong2008-08-262-9/+14
| | | | | | | | | | | | This has been tested for both playback of streams and outputting to streams, and seems to work fine with minimal locking. This reuses the sequence number infrastructure in OutputBuffer for synchronizing metadata payloads; so (IMNSHO) should be much more understandable than various flags being set here and there.. It could still use some cleanup and much testing, but synchronization issues should be minimal.
* mp3_plugin: fix assertion during seekingEric Wong2008-08-201-3/+3
| | | | | | data->muteFrame won't necessarily get cleared when it enters that block of code, so we don't signal the action as complete until it is actually cleared.
* fix output buffer deadlock when daemonizingEric Wong2008-08-193-3/+0
| | | | | | | | | | | We spawned the output buffer thread before daemonizing in initPlayerData(), which is ultra bad because daemonizes forks and threads are not preserved on exit. Since playerData has been stripped bare by this core-rewrite anyways, move this code into the outputBuffer_* group and drop playerData.[ch] completely I completely forgot to test this :<
* core rewrite (decode,player,outputBuffer,playlist)Eric Wong2008-08-1612-382/+275
| | | | | | | | | | | | | This is a huge refactoring of the core mpd process. The queueing/buffering mechanism is heavily reworked. The player.c code has been merged into outputBuffer (the actual ring buffering logic is handled by ringbuf.c); and decode.c actually handles decoding stuff. The end result is several hundreds of lines shorter, even though we still have a lot of DEBUG statements left in there for tracing and a lot of assertions, too.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 05:49:08 +0000