* @param input_channels Number of input channels
* @param input_signed Whether input samples are signed or unsigned
* @param input_rate Frames/second in input
+ * @param input_endian Input endianness (@c ENDIAN_BIG or @c ENDIAN_LITTLE)
* @param output_bits Bits/sample in output
* @param output_channels Number of output channels
* @param output_rate Frames/second in output
* @param output_signed Whether output samples are signed or unsigned
+ * @param output_endian Output endianness (@c ENDIAN_BIG or @c ENDIAN_LITTLE)
*
* For formats with more than two channels it's assume that the first
* two channels are left and right. No particular meaning is attached
/** @brief Convert input samples to floats
* @param rs Resampler state
* @param bytes Input bytes
- * @param nbytes Number of input bytes
+ * @param nframes Number of input frames
* @param floats Where to store converted data
*
* @p floats must be big enough. As well as converting to floats this
*/
static void resample_prepare_input(const struct resampler *rs,
const uint8_t *bytes,
- size_t nbytes,
+ size_t nframes,
float *floats) {
- size_t nframes = nbytes / (rs->input_bytes_per_frame);
-
while(nframes > 0) {
int n;
float *input = xcalloc(nframesin * rs->output_channels, sizeof (float));
float *output = 0;
- resample_prepare_input(rs, bytes, nbytes, input);
+ resample_prepare_input(rs, bytes, nframesin, input);
#if HAVE_SAMPLERATE_H
if(rs->state) {
/* A sample-rate conversion must be performed */
SRC_DATA data;
+ memset(&data, 0, sizeof data);
/* Compute how many frames are expected to come out. */
size_t maxframesout = nframesin * rs->output_rate / rs->input_rate + 1;
output = xcalloc(maxframesout * rs->output_channels, sizeof(float));
data.output_frames = maxframesout;
data.end_of_input = eof;
data.src_ratio = (double)rs->output_rate / rs->input_rate;
+ D(("nframesin=%zu maxframesout=%zu eof=%d ratio=%d.%06d",
+ nframesin, maxframesout, eof,
+ (int)data.src_ratio,
+ ((int)(data.src_ratio * 1000000) % 1000000)));
int error_ = src_process(rs->state, &data);
if(error_)
disorder_fatal(0, "calling src_process: %s", src_strerror(error_));
nframesin = data.input_frames_used;
nsamplesout = data.output_frames_gen * rs->output_channels;
+ D(("new nframesin=%zu nsamplesout=%zu", nframesin, nsamplesout));
}
#endif
if(!output) {