Commit 124f79a2 authored by Max Kellermann's avatar Max Kellermann

pcm_resample: don't resample partial samples

Added assertions which ensure that there are no partial samples in the source buffer.
parent b13d656f
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include "pcm_resample.h" #include "pcm_resample.h"
#include "gcc.h" #include "gcc.h"
#include <assert.h>
/* resampling code blatantly ripped from ESD */ /* resampling code blatantly ripped from ESD */
size_t size_t
pcm_resample_16(uint8_t channels, pcm_resample_16(uint8_t channels,
...@@ -33,6 +35,9 @@ pcm_resample_16(uint8_t channels, ...@@ -33,6 +35,9 @@ pcm_resample_16(uint8_t channels,
unsigned dest_samples = dest_size / sizeof(*dest_buffer); unsigned dest_samples = dest_size / sizeof(*dest_buffer);
int16_t lsample, rsample; int16_t lsample, rsample;
assert((src_size % (sizeof(*src_buffer) * channels)) == 0);
assert((dest_size % (sizeof(*dest_buffer) * channels)) == 0);
switch (channels) { switch (channels) {
case 1: case 1:
while (dest_pos < dest_samples) { while (dest_pos < dest_samples) {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "log.h" #include "log.h"
#include "utils.h" #include "utils.h"
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
...@@ -75,6 +76,9 @@ pcm_resample_16(uint8_t channels, ...@@ -75,6 +76,9 @@ pcm_resample_16(uint8_t channels,
size_t data_out_size; size_t data_out_size;
int error; int error;
assert((src_size % (sizeof(*src_buffer) * channels)) == 0);
assert((dest_size % (sizeof(*dest_buffer) * channels)) == 0);
if (convalgo < 0) if (convalgo < 0)
convalgo = pcm_resample_get_converter(); convalgo = pcm_resample_get_converter();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment