oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'neheb/h'

Browse Source
This commit is contained in:
Max Kellermann
2020-03-16 17:29:05 +01:00
parent 256cfc545d 5e4b7e2fb7
commit fd71514068
16 changed files with 72 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder/plugins/FaadDecoderPlugin.cxx
View File

@@ -26,12 +26,12 @@
#include "util/ScopeExit.hxx"
#include "util/ConstBuffer.hxx"
#include "util/Domain.hxx"
#include "util/Math.hxx"
#include "Log.hxx"
#include <neaacdec.h>
#include <cassert>
#include <cmath>
#include <string.h>

3
src/decoder/plugins/MpcdecDecoderPlugin.cxx
View File

@@ -25,6 +25,7 @@
#include "tag/Handler.hxx"
#include "util/Domain.hxx"
#include "util/Clamp.hxx"
#include "util/Math.hxx"
#include "util/ScopeExit.hxx"
#include "Log.hxx"
@@ -32,8 +33,6 @@
#include <iterator>
#include <math.h>
struct mpc_decoder_data {
InputStream &is;
DecoderClient *client;

4
src/decoder/plugins/WavpackDecoderPlugin.cxx
View File

@@ -25,6 +25,7 @@
#include "tag/Handler.hxx"
#include "fs/Path.hxx"
#include "util/Alloc.hxx"
#include "util/Math.hxx"
#include "util/ScopeExit.hxx"
#include "util/RuntimeError.hxx"
@@ -263,8 +264,7 @@ wavpack_decode(DecoderClient &client, WavpackContext *wpc, bool can_seek)
if (samples_got == 0)
break;
int bitrate = (int)(WavpackGetInstantBitrate(wpc) / 1000 +
0.5);
int bitrate = lround(WavpackGetInstantBitrate(wpc) / 1000);
format_samples(chunk, samples_got * audio_format.channels);
cmd = client.SubmitData(nullptr, chunk,