| Commit message (Collapse) | Author | Files | Lines |
|
That variable is never used except during initialization in
ffmpeg_helper().
|
|
|
|
Renamed variables.
|
|
If an input stream provides tags (e.g. from an icecast server), send
them in the decoder_data() and decoder_tag() methods. Removed the
according code from the mp3 and oggvorbis plugins - decoders shouldn't
have to care about stream tags.
This patch also adds the missing decoder_tag() invocation to the mp3
plugin.
|
|
The variables mod_mikModInitiated and mod_mikModInitError were used to
control lazy initialization, but they are superfluous now.
|
|
The "mod" decoder plugin was being initialized lazily, but was
deinitialized unconditionally. That led to segmentation faults.
Convert mod_initMikMod() to be the global module initialization
method. The MPD core should care about lazy initialization.
|
|
ffmpeg_tag() deleted the tag when ffmpeg_helper() returned success.
The return value was interpreted incorrectly, it should return the tag
on success.
|
|
Rewinding the stream here is not useful, but may consume valuable
resources (and time).
|
|
The try_decode() method may have read some data from the stream, which
is now lost. To make this data available to other methods, get it
back by rewinding the input stream after each try_decode() invocation.
The ogg and wavpack plugins did this manually and inconsistently; this
code can now be removed.
|
|
decoder_read() checks the decoder command. Without this patch, the
ffmpeg plugin could become unresponsive.
|
|
Ogg and ffmpeg detection was disabled when the stream was not
seekable, because the detection was too expensive. Since the curl
input stream can now rewind the stream cheaply, we can re-enable
detection on streams.
|
|
Provide an API for submitting additional tags from the stream.
|
|
Avoid while(true) loops, and convert them to a loop with a proper
condition.
|
|
Since the aac and mod plugins have told MPD that they cannot seek, MPD
will never send a SEEK command to them. Removed the SEEK comand
checks from both plugins.
|
|
Don't pass the "seekable" flag with every decoder_data() invocation.
Since that flag won't change within the file, it is enough to pass it
to decoder_initialized() once per file.
|
|
The strings were constant, but the pointers weren't. C syntax is
somewhat tricky..
|
|
All decoder_plugin structs are initialized at compile time, and must
never change.
|
|
|
|
"LOG_H" is a macro which is also used by ffmpeg/log.h. This is
ffmpeg's fault, because short macros should be reserved for
applications, but since it's always a good idea to choose prefixed
macro names, even for applications, we are going to do that in MPD.
|
|
The source _ogg_common.c does not need any symbols from
_flac_common.h, but including it leads to compiler errors when libflac
isn't available.
|
|
Again, I forgot to adapt oggflac to the new API (struct input_stream,
bool return values).
|
|
decoder_data() uses wait times to let the input stream continue its
transfer.
|
|
decoder_data() always returns the current command. If we use this, we
can save a lot of decoder_get_command() calls.
|
|
Converted the runtime check to an assertion.
|
|
Remove one indent level.
|
|
Move code from ffmpeg_decode_internal() to make it smaller and more
readable.
|
|
The decoder API provides the function decoder_seek_error() to report
seek errors. Use this function instead of logging the error.
|
|
The function mpdurl_read() is too complicated, and uses the wrong data
types.
|
|
tag objects must be freed with tag_free() to ensure that all resources
are freed.
|
|
The function ffmpeg_tag() already has the variable base.tag, which can
be used for this.
|
|
ffmpeg_try_decode() did not interpret ffmpeg_helper()'s return value
properly; migrate everything to bool to make it consistent.
|
|
We don't need those anymore, they just fill the log.
|
|
ffmpeg_tag() did not initialize base.decoder, which made valgrind
unhappy, and can lead to a egmentation fault.
|
|
Similar to libmad, libmpcdec provides samples with higher quality than
16 bit. Send 24 bit samples to MPD, which allows MPD to apply
dithering just in case the output devices are only 16 bit capable.
|
|
Don't hard-code the "16 bits" or "2 bytes" in multiple locations.
|
|
The name "s16" implies 16 bit integers. To make the code more
generic, rename it to "dest".
|
|
The conversion of integer samples was completely broken, which
presumably didn't annoy anybody because libmpcdec provides float
samples on most installations.
|
|
When input_stream_seek() was converted to return a bool, this wasn't
adjusted in the musepack plugin.
|
|
Don't return 0/-1 on success/error, but true/false. Instead of int,
use bool for storing flags.
|
|
Its only caller in mp3_decode() just compared its value with
DECODE_BREAK. Convert that to bool, and return false if the loop
should be ended. Also eliminate some superfluous command checking
code, which was already done in the preceding while loop.
|
|
A decoder_flush() invocation was missing in the FLAC plugin, resulting
in casual assertion failures due to a wrong assumption about the last
chunk's audio format. It's much easier to remove that decoder_flush()
function and make the decoder thread call ob_flush().
|
|
Call ob_clear() in decoder_command_finished() instead of implementing
that call in every decoder plugin.
|
|
Remember the seek_where argument and call decoder_command_finished()
immediately. This way, the player thread can continue working, and we
can receive more commands.
This also fixes several issues which resulted in broken frames,
leading to erroneos "elapsed" values: frames weren't parsed properly,
since the code was checking for command!=NONE.
|
|
Previously, the function would only return when a STOP was issued. It
makes more sense to consider all possible commands.
|
|
Break the large function mp3_read() into smaller pieces.
|
|
Break the large function mp3_read() into smaller pieces.
|
|
Break the large function mp3_read() into smaller pieces.
|
|
Break the large function mp3_read() into smaller pieces.
|
|
Break the large function mp3_read() into smaller pieces.
|
|
dc_seek() won't send a SEEK command to the decoder thread unless the
stream is seekable. No need to do another check; convert that to an
assertion.
|