Revert "kpb: refactor some of KPBs macros"

This reverts commit 0eabf51.

Author: jajanusz

src/audio/kpb.c

@@ -136,7 +136,7 @@ static struct comp_dev *kpb_new(struct sof_ipc_comp *comp)
 		return NULL;
 	}
 
-	if (kpb->config.channels > KPB_MAX_SUPPORTED_CHANNELS) {
+	if (kpb->config.no_channels > KPB_MAX_SUPPORTED_CHANNELS) {
 		trace_kpb_error_with_ids(dev, "kpb_new() error: "
 		"no of channels exceeded the limit");
 		return NULL;
@@ -895,7 +895,7 @@ static void kpb_init_draining(struct comp_dev *dev, struct kpb_client *cli)
 	struct comp_data *kpb = comp_get_drvdata(dev);
 	bool is_sink_ready = (kpb->host_sink->sink->state == COMP_STATE_ACTIVE);
 	size_t sample_width = kpb->config.sampling_width;
-	size_t history_depth = cli->history_depth * kpb->config.channels *
+	size_t history_depth = cli->history_depth * kpb->config.no_channels *
 			       (kpb->config.sampling_freq / 1000) *
 			       (KPB_SAMPLE_CONTAINER_SIZE(sample_width) / 8);
 	struct hb *buff = kpb->history_buffer;
@@ -907,9 +907,9 @@ static void kpb_init_draining(struct comp_dev *dev, struct kpb_client *cli)
 	size_t host_period_size = kpb->host_period_size;
 	size_t host_buffer_size = kpb->host_buffer_size;
 	size_t ticks_per_ms = clock_ms_to_ticks(PLATFORM_DEFAULT_CLOCK, 1);
-	size_t bytes_per_ms = KPB_SAMPLES_PER_MS *
+	size_t bytes_per_ms = KPB_SAMPLING_WIDTH *
 			      (KPB_SAMPLE_CONTAINER_SIZE(sample_width) / 8) *
-			      kpb->config.channels;
+			      kpb->config.no_channels;
 	size_t period_bytes_limit = 0;
 
 	trace_kpb_with_ids(dev, "kpb_init_draining(): requested draining "
@@ -1188,7 +1188,7 @@ static void kpb_drain_samples(void *source, struct comp_buffer *sink,
 	size_t frames = KPB_BYTES_TO_FRAMES(size, sample_width);
 
 	for (i = 0; i < frames; i++) {
-		for (channel = 0; channel < KPB_NUM_OF_CHANNELS; channel++) {
+		for (channel = 0; channel < KPB_NR_OF_CHANNELS; channel++) {
 			switch (sample_width) {
 #if CONFIG_FORMAT_S16LE
 			case 16:
@@ -1235,7 +1235,7 @@ static void kpb_buffer_samples(struct comp_buffer *source, uint32_t start,
 	size_t frames = KPB_BYTES_TO_FRAMES(size, sample_width);
 
 	for (i = 0; i < frames; i++) {
-		for (channel = 0; channel < KPB_NUM_OF_CHANNELS; channel++) {
+		for (channel = 0; channel < KPB_NR_OF_CHANNELS; channel++) {
 			switch (sample_width) {
 			case 16:
 				src = buffer_read_frag_s16(source, j);
@@ -1332,7 +1332,7 @@ static void kpb_copy_samples(struct comp_buffer *sink,
 	size_t frames = KPB_BYTES_TO_FRAMES(size, sample_width);
 
 	for (i = 0; i < frames; i++) {
-		for (channel = 0; channel < KPB_NUM_OF_CHANNELS; channel++) {
+		for (channel = 0; channel < KPB_NR_OF_CHANNELS; channel++) {
 			switch (sample_width) {
 #if CONFIG_FORMAT_S16LE
 			case 16:

src/include/sof/audio/kpb.h

@@ -33,22 +33,21 @@ struct comp_buffer;
 
 /* KPB internal defines */
 #define KPB_MAX_BUFF_TIME 2100 /**< time of buffering in miliseconds */
-#define KPB_MAX_SUPPORTED_CHANNELS 2 /**< number of supported channels */
-/**< number of samples taken each milisecond */
-#define	KPB_SAMPLES_PER_MS (KPB_SAMPLNG_FREQUENCY / 1000)
-#define	KPB_SAMPLNG_FREQUENCY 16000 /**< supported sampling frequency in Hz */
-#define KPB_NUM_OF_CHANNELS 2
+#define KPB_MAX_SUPPORTED_CHANNELS 2
+#define	KPB_SAMPLING_WIDTH 16 /**< number of bits */
+#define	KPB_SAMPLNG_FREQUENCY 16000 /* max sampling frequency in Hz */
+#define KPB_NR_OF_CHANNELS 2
 #define KPB_SAMPLE_CONTAINER_SIZE(sw) ((sw == 16) ? 16 : 32)
 #define KPB_MAX_BUFFER_SIZE(sw) ((KPB_SAMPLNG_FREQUENCY / 1000) * \
 	(KPB_SAMPLE_CONTAINER_SIZE(sw) / 8) * KPB_MAX_BUFF_TIME * \
-	KPB_NUM_OF_CHANNELS)
+	KPB_NR_OF_CHANNELS)
 #define KPB_MAX_NO_OF_CLIENTS 2
 #define KPB_NO_OF_HISTORY_BUFFERS 2 /**< no of internal buffers */
 #define KPB_ALLOCATION_STEP 0x100
 #define KPB_NO_OF_MEM_POOLS 3
 #define KPB_BYTES_TO_FRAMES(bytes, sample_width) \
 	(bytes / ((KPB_SAMPLE_CONTAINER_SIZE(sample_width) / 8) * \
-	KPB_NUM_OF_CHANNELS))
+	KPB_NR_OF_CHANNELS))
 
 enum kpb_state {
 	KPB_STATE_DISABLED = 0,

src/include/user/kpb.h

@@ -14,7 +14,7 @@
 struct sof_kpb_config {
 	uint32_t size; /**< kpb size in bytes */
 	uint32_t caps; /**< SOF_MEM_CAPS_ */
-	uint32_t channels; /**< number of channels */
+	uint32_t no_channels; /**< no of channels */
 	uint32_t history_depth; /**< time of buffering in milliseconds */
 	uint32_t sampling_freq; /**< frequency in hertz */
 	uint32_t sampling_width; /**< number of bits */

test/cmocka/src/audio/kpb/kpb_buffer.c

@@ -113,7 +113,7 @@ static int buffering_test_setup(void **state)
 	.size = sizeof(struct sof_kpb_config),
 	.no_channels = 2,
 	.sampling_freq = KPB_SAMPLNG_FREQUENCY,
-	.sampling_width = KPB_SAMPLE_CONTAINER_SIZE(16),
+	.sampling_width = KPB_SAMPLING_WIDTH,
 	};
 
 	/* Register KPB component to use its internal functions */