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

decoder/wavpack: rename "samples" to "frames"

Browse Source
This commit is contained in:
Max Kellermann 2022-07-11 21:35:09 +02:00
parent 349882ed75
commit 6d02edebc9
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,12 +198,11 @@ wavpack_decode(DecoderClient &client, WavpackContext *wpc, bool can_seek)
client.Ready(audio_format, can_seek, GetDuration(wpc)); client.Ready(audio_format, can_seek, GetDuration(wpc));
const int output_sample_size = audio_format.GetFrameSize(); const std::size_t output_frame_size = audio_format.GetFrameSize();
/* wavpack gives us all kind of samples in a 32-bit space */ /* wavpack gives us all kind of samples in a 32-bit space */
int32_t chunk[1024]; int32_t buffer[1024];
const uint32_t samples_requested = std::size(chunk) / const uint32_t max_frames = std::size(buffer) / audio_format.channels;
audio_format.channels;
DecoderCommand cmd = client.GetCommand(); DecoderCommand cmd = client.GetCommand();
while (cmd != DecoderCommand::STOP) { while (cmd != DecoderCommand::STOP) {
@ -222,16 +221,16 @@ wavpack_decode(DecoderClient &client, WavpackContext *wpc, bool can_seek)
} }
} }
uint32_t samples_got = WavpackUnpackSamples(wpc, chunk, uint32_t n_frames = WavpackUnpackSamples(wpc, buffer,
samples_requested); max_frames);
if (samples_got == 0) if (n_frames == 0)
break; break;
int bitrate = lround(WavpackGetInstantBitrate(wpc) / 1000); int bitrate = lround(WavpackGetInstantBitrate(wpc) / 1000);
format_samples(chunk, samples_got * audio_format.channels); format_samples(buffer, n_frames * audio_format.channels);
cmd = client.SubmitData(nullptr, chunk, cmd = client.SubmitData(nullptr, buffer,
samples_got * output_sample_size, n_frames * output_frame_size,
bitrate); bitrate);
} }
} }