- Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH 1/2] comp: buffer: reject buffer size 0 requests.
by Liam Girdwood 07 Sep '17

07 Sep '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/reef/audio/buffer.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/include/reef/audio/buffer.h b/src/include/reef/audio/buffer.h index e708ee2..ea9bd9c 100644 --- a/src/include/reef/audio/buffer.h +++ b/src/include/reef/audio/buffer.h @@ -183,6 +183,8 @@ static inline int buffer_set_size(struct comp_buffer *buffer, uint32_t size) { if (size > buffer->alloc_size) return -ENOMEM; + if (size == 0) + return -EINVAL; buffer->end_addr = buffer->addr + size; buffer->size = size; -- 2.11.0

1 1

[Sound-open-firmware] [PATCH v4 1/3] comp: default function to set comp state
by Ranjani Sridharan 07 Sep '17

07 Sep '17

This patch adds a the comp_set_state() used for the mandatory pipeline commands, START, STOP, PAUSE and RELEASE. It also updates the cmd method in existing components to use comp_set_state(). Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/component.c | 38 ++++++++++++++++++++++++++++++++++++++ src/audio/eq_fir.c | 23 +---------------------- src/audio/host.c | 16 ++++------------ src/audio/src.c | 25 +++---------------------- src/audio/tone.c | 28 +++++----------------------- src/audio/volume.c | 19 +++---------------- src/include/reef/audio/component.h | 3 +++ 7 files changed, 57 insertions(+), 95 deletions(-) diff --git a/src/audio/component.c b/src/audio/component.c index 6369e2e..232ef02 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -117,6 +117,44 @@ void comp_unregister(struct comp_driver *drv) spin_unlock(&cd->lock); } +int comp_set_state(struct comp_dev *dev, int cmd) +{ + int ret = 0; + + switch (cmd) { + case COMP_CMD_START: + case COMP_CMD_RELEASE: + dev->state = COMP_STATE_RUNNING; + break; + case COMP_CMD_STOP: + if (dev->state == COMP_STATE_RUNNING || + dev->state == COMP_STATE_DRAINING || + dev->state == COMP_STATE_PAUSED) { + comp_buffer_reset(dev); + dev->state = COMP_STATE_SETUP; + } else { + trace_comp_error("CEs"); + ret = -EINVAL; + } + break; + case COMP_CMD_PAUSE: + /* only support pausing for running */ + if (dev->state == COMP_STATE_RUNNING) + dev->state = COMP_STATE_PAUSED; + else { + trace_comp_error("CEp"); + ret = -EINVAL; + } + break; + default: + trace_comp_error("CEd"); + ret = -EINVAL; + break; + } + + return ret; +} + void sys_comp_init(void) { cd = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*cd)); diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 540c68f..98cd43e 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -382,32 +382,11 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) ret = fir_cmd(dev, cdata); break; case COMP_CMD_START: - trace_src("EFs"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_src("ESp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_src("EPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_src("ERl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_src("EDf"); - ret = -EINVAL; + ret = comp_set_state(dev, cmd); break; } diff --git a/src/audio/host.c b/src/audio/host.c index e71e95f..f81fd66 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -553,28 +553,20 @@ static int host_cmd(struct comp_dev *dev, int cmd, void *data) // TODO: align cmd macros. switch (cmd) { - case COMP_CMD_PAUSE: - /* only support pausing for running, channel is paused by DAI */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - break; case COMP_CMD_STOP: if (dev->state == COMP_STATE_RUNNING || dev->state == COMP_STATE_DRAINING || dev->state == COMP_STATE_PAUSED) ret = host_stop(dev); break; - case COMP_CMD_RELEASE: - /* channel is released by DAI */ - dev->state = COMP_STATE_RUNNING; - break; - case COMP_CMD_START: - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_SUSPEND: case COMP_CMD_RESUME: break; + case COMP_CMD_START: + case COMP_CMD_PAUSE: + case COMP_CMD_RELEASE: default: + ret = comp_set_state(dev, cmd); break; } diff --git a/src/audio/src.c b/src/audio/src.c index c11ef3f..34cab7a 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -431,6 +431,7 @@ static int src_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) static int src_cmd(struct comp_dev *dev, int cmd, void *data) { struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; trace_src("SCm"); @@ -438,35 +439,15 @@ static int src_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return src_ctrl_cmd(dev, cdata); case COMP_CMD_START: - trace_src("SSt"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_src("SSp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_src("SPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_src("SRl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_src("SDf"); + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/audio/tone.c b/src/audio/tone.c index 448c472..aec8a72 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -434,6 +434,8 @@ static int tone_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); + trace_tone("tri"); + switch (cdata->cmd) { case SOF_CTRL_CMD_MUTE: trace_tone("TMu"); @@ -468,6 +470,7 @@ static int tone_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) static int tone_cmd(struct comp_dev *dev, int cmd, void *data) { struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; trace_tone("tri"); @@ -475,36 +478,15 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return tone_ctrl_cmd(dev, cdata); case COMP_CMD_START: - trace_tone("TSt"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_tone("TSp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_tone("TPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_tone("TRl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_tone("TDf"); - + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/audio/volume.c b/src/audio/volume.c index c88f9d2..d642320 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -429,6 +429,7 @@ static int volume_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata static int volume_cmd(struct comp_dev *dev, int cmd, void *data) { struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; trace_volume("cmd"); @@ -436,29 +437,15 @@ static int volume_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return volume_ctrl_cmd(dev, cdata); case COMP_CMD_START: - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - break; case COMP_CMD_RELEASE: - dev->state = COMP_STATE_RUNNING; - break; default: + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index 9793c36..d7ea29a 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -214,6 +214,9 @@ static inline void comp_free(struct comp_dev *dev) dev->drv->ops.free(dev); } +/* component state set */ +int comp_set_state(struct comp_dev *dev, int cmd); + /* component parameter init - mandatory */ static inline int comp_params(struct comp_dev *dev) { -- 2.9.3

2 1

[Sound-open-firmware] [PATCH] comp: dai: drain and stop notifications come from host.
by Liam Girdwood 07 Sep '17

07 Sep '17

Make sure all stop/drain notification come from host and not DAI component. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index e085096..30d3ae9 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -121,38 +121,9 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) } } - if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK && - dma_buffer->avail < dd->period_bytes) { - /* end of stream, finish */ - if (dma_buffer->avail == 0) { - dai_cmd(dev, COMP_CMD_STOP, NULL); - - /* stop dma immediately */ - next->size = DMA_RELOAD_END; - - /* let any waiters know we have completed */ - //wait_completed(&dev->pipeline->complete); - - return; - } else { - /* drain the last bytes */ - next->src = (uint32_t)dma_buffer->r_ptr; - next->dest = dai_fifo(dd->dai, SOF_IPC_STREAM_PLAYBACK); - next->size = dma_buffer->avail; - - dd->last_bytes = next->size; - - goto next_copy; - - } - - } - /* notify pipeline that DAI needs it's buffer processed */ pipeline_schedule_copy(dev->pipeline, dev); -next_copy: - return; } -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] comp: buffer: add support for non period aligned buffers
by Liam Girdwood 07 Sep '17

07 Sep '17

Add support for non period aligned buffers to the buffer free/avail calculation. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/reef/audio/buffer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/reef/audio/buffer.h b/src/include/reef/audio/buffer.h index 54978a8..83fcd57 100644 --- a/src/include/reef/audio/buffer.h +++ b/src/include/reef/audio/buffer.h @@ -93,7 +93,7 @@ static inline void comp_update_buffer_produce(struct comp_buffer *buffer, /* check for pointer wrap */ if (buffer->w_ptr >= buffer->end_addr) - buffer->w_ptr = buffer->addr; + buffer->w_ptr = buffer->addr + (buffer->w_ptr - buffer->end_addr); /* calculate available bytes */ if (buffer->r_ptr < buffer->w_ptr) @@ -127,7 +127,7 @@ static inline void comp_update_buffer_consume(struct comp_buffer *buffer, /* check for pointer wrap */ if (buffer->r_ptr >= buffer->end_addr) - buffer->r_ptr = buffer->addr; + buffer->r_ptr = buffer->addr + (buffer->r_ptr - buffer->end_addr); /* calculate available bytes */ if (buffer->r_ptr < buffer->w_ptr) -- 2.11.0

1 3

[Sound-open-firmware] [PATCH v3 1/3] comp: default function to set comp state
by Ranjani Sridharan 06 Sep '17

06 Sep '17

This patch adds a the comp_set_state() used for the mandatory pipeline commands, START, STOP, PAUSE and RELEASE. It also updates the cmd method in existing components to use comp_set_state(). Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/component.c | 38 ++++++++++++++++++++++++++++++++++++++ src/audio/eq_fir.c | 23 +---------------------- src/audio/host.c | 16 ++++------------ src/audio/src.c | 25 +++---------------------- src/audio/tone.c | 28 +++++----------------------- src/audio/volume.c | 19 +++---------------- src/include/reef/audio/component.h | 3 +++ 7 files changed, 57 insertions(+), 95 deletions(-) diff --git a/src/audio/component.c b/src/audio/component.c index 6369e2e..232ef02 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -117,6 +117,44 @@ void comp_unregister(struct comp_driver *drv) spin_unlock(&cd->lock); } +int comp_set_state(struct comp_dev *dev, int cmd) +{ + int ret = 0; + + switch (cmd) { + case COMP_CMD_START: + case COMP_CMD_RELEASE: + dev->state = COMP_STATE_RUNNING; + break; + case COMP_CMD_STOP: + if (dev->state == COMP_STATE_RUNNING || + dev->state == COMP_STATE_DRAINING || + dev->state == COMP_STATE_PAUSED) { + comp_buffer_reset(dev); + dev->state = COMP_STATE_SETUP; + } else { + trace_comp_error("CEs"); + ret = -EINVAL; + } + break; + case COMP_CMD_PAUSE: + /* only support pausing for running */ + if (dev->state == COMP_STATE_RUNNING) + dev->state = COMP_STATE_PAUSED; + else { + trace_comp_error("CEp"); + ret = -EINVAL; + } + break; + default: + trace_comp_error("CEd"); + ret = -EINVAL; + break; + } + + return ret; +} + void sys_comp_init(void) { cd = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*cd)); diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 540c68f..98cd43e 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -382,32 +382,11 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) ret = fir_cmd(dev, cdata); break; case COMP_CMD_START: - trace_src("EFs"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_src("ESp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_src("EPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_src("ERl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_src("EDf"); - ret = -EINVAL; + ret = comp_set_state(dev, cmd); break; } diff --git a/src/audio/host.c b/src/audio/host.c index e71e95f..f81fd66 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -553,28 +553,20 @@ static int host_cmd(struct comp_dev *dev, int cmd, void *data) // TODO: align cmd macros. switch (cmd) { - case COMP_CMD_PAUSE: - /* only support pausing for running, channel is paused by DAI */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - break; case COMP_CMD_STOP: if (dev->state == COMP_STATE_RUNNING || dev->state == COMP_STATE_DRAINING || dev->state == COMP_STATE_PAUSED) ret = host_stop(dev); break; - case COMP_CMD_RELEASE: - /* channel is released by DAI */ - dev->state = COMP_STATE_RUNNING; - break; - case COMP_CMD_START: - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_SUSPEND: case COMP_CMD_RESUME: break; + case COMP_CMD_START: + case COMP_CMD_PAUSE: + case COMP_CMD_RELEASE: default: + ret = comp_set_state(dev, cmd); break; } diff --git a/src/audio/src.c b/src/audio/src.c index c11ef3f..34cab7a 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -431,6 +431,7 @@ static int src_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) static int src_cmd(struct comp_dev *dev, int cmd, void *data) { struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; trace_src("SCm"); @@ -438,35 +439,15 @@ static int src_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return src_ctrl_cmd(dev, cdata); case COMP_CMD_START: - trace_src("SSt"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_src("SSp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_src("SPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_src("SRl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_src("SDf"); + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/audio/tone.c b/src/audio/tone.c index 448c472..aec8a72 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -434,6 +434,8 @@ static int tone_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); + trace_tone("tri"); + switch (cdata->cmd) { case SOF_CTRL_CMD_MUTE: trace_tone("TMu"); @@ -468,6 +470,7 @@ static int tone_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) static int tone_cmd(struct comp_dev *dev, int cmd, void *data) { struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; trace_tone("tri"); @@ -475,36 +478,15 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return tone_ctrl_cmd(dev, cdata); case COMP_CMD_START: - trace_tone("TSt"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_tone("TSp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_tone("TPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_tone("TRl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_tone("TDf"); - + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/audio/volume.c b/src/audio/volume.c index 6cbd6ff..6fa36c4 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -429,6 +429,7 @@ static int volume_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata static int volume_cmd(struct comp_dev *dev, int cmd, void *data) { struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; trace_volume("cmd"); @@ -436,29 +437,15 @@ static int volume_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return volume_ctrl_cmd(dev, cdata); case COMP_CMD_START: - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - break; case COMP_CMD_RELEASE: - dev->state = COMP_STATE_RUNNING; - break; default: + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index 35c80de..e20ffed 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -214,6 +214,9 @@ static inline void comp_free(struct comp_dev *dev) dev->drv->ops.free(dev); } +/* component state set */ +int comp_set_state(struct comp_dev *dev, int cmd); + /* component parameter init - mandatory */ static inline int comp_params(struct comp_dev *dev) { -- 2.9.3

2 1

[Sound-open-firmware] [PATCH] SRC: Bug fix for copy period length and some init code cleanup
by Seppo Ingalsuo 06 Sep '17

06 Sep '17

The error in computing block length in copy() function is fixed. It caused SRC to use unnecessarily long blocks with some rates and fail to execute within available buffer size. The input and output block length is now computed in initization. Sample rates support mask bit for 7350 Hz is removed also. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/src.c | 26 +++++---- src/audio/src_core.c | 153 +++++++++++++++++++++++++++------------------------ src/audio/src_core.h | 12 +++- 3 files changed, 104 insertions(+), 87 deletions(-) diff --git a/src/audio/src.c b/src/audio/src.c index c11ef3f..d741aeb 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -311,7 +311,7 @@ static int src_params(struct comp_dev *dev) size_t delay_lines_size; uint32_t source_rate, sink_rate; int32_t *buffer_start; - int n = 0, i, err; + int n = 0, i, err, frames_is_for_source; trace_src("par"); @@ -329,21 +329,25 @@ static int src_params(struct comp_dev *dev) sink_rate = src->sink_rate; /* re-write our params with output rate for next component */ params->rate = sink_rate; + frames_is_for_source = 0; } else { /* params rate is sink rate */ source_rate = src->source_rate; sink_rate = params->rate; /* re-write our params with output rate for next component */ params->rate = source_rate; + frames_is_for_source = 1; } /* Allocate needed memory for delay lines */ - err = src_buffer_lengths(&need, source_rate, sink_rate, params->channels); + err = src_buffer_lengths(&need, source_rate, sink_rate, + params->channels, dev->frames, frames_is_for_source); if (err < 0) { trace_src_error("sr1"); trace_value(source_rate); trace_value(sink_rate); trace_value(params->channels); + trace_value(dev->frames); return err; } @@ -371,8 +375,8 @@ static int src_params(struct comp_dev *dev) /* Initize SRC for actual sample rate */ for (i = 0; i < params->channels; i++) { - n = src_polyphase_init(&cd->src[i], source_rate, - sink_rate, buffer_start); + n = src_polyphase_init(&cd->src[i], source_rate, sink_rate, + &need, buffer_start); buffer_start += need.single_src; } @@ -474,7 +478,7 @@ static int src_copy(struct comp_dev *dev) { struct comp_data *cd = comp_get_drvdata(dev); struct comp_buffer *source, *sink; - int need_source, need_sink, blk_in, blk_out, frames_source, frames_sink; + int need_source, need_sink, blk_in, blk_out; trace_comp("SRC"); @@ -484,20 +488,18 @@ static int src_copy(struct comp_dev *dev) sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); - /* Check that source has enough frames available and sink enough - * frames free. + /* Calculate needed amount of source buffer and sink buffer + * for one SRC run. */ blk_in = src_polyphase_get_blk_in(&cd->src[0]); blk_out = src_polyphase_get_blk_out(&cd->src[0]); - frames_source = dev->frames * blk_in / blk_out; - frames_sink = frames_source * blk_out / blk_in; - need_source = frames_source * dev->frame_bytes; - need_sink = frames_sink * dev->frame_bytes; + need_source = blk_in * dev->frame_bytes; + need_sink = blk_out * dev->frame_bytes; /* Run as many times as buffers allow */ while ((source->avail >= need_source) && (sink->free >= need_sink)) { /* Run src */ - cd->src_func(dev, source, sink, frames_source, frames_sink); + cd->src_func(dev, source, sink, blk_in, blk_out); /* calc new free and available */ comp_update_buffer_consume(source, 0); diff --git a/src/audio/src_core.c b/src/audio/src_core.c index 55f7062..cc44734 100644 --- a/src/audio/src_core.c +++ b/src/audio/src_core.c @@ -52,8 +52,8 @@ #endif /* TODO: These should be defined somewhere else. */ -#define SOF_RATES_LENGTH 16 -int sof_rates[SOF_RATES_LENGTH] = {7350, 8000, 11025, 12000, 16000, 18900, +#define SOF_RATES_LENGTH 15 +int sof_rates[SOF_RATES_LENGTH] = {8000, 11025, 12000, 16000, 18900, 22050, 24000, 32000, 44100, 48000, 64000, 88200, 96000, 176400, 192000}; @@ -71,20 +71,6 @@ int src_out_delay_length(struct src_stage *s) return (s->num_of_subfilters - 1) * s->odm + 1; } -/* Calculates the buffer length needed between two SRC stages */ -int src_stage_buf_length(struct src_stage *s1, struct src_stage *s2) -{ - int k, s1_times; - - if ((s1->blk_out == 0) || (s2->blk_in == 0)) - return 0; - - k = gcd(s1->blk_out, s2->blk_in); - s1_times = s2->blk_in / k; - - return s1->blk_out * s1_times; -} - /* Returns index of a matching sample rate */ int src_find_fs(int fs_list[], int list_length, int fs) { @@ -126,31 +112,65 @@ int32_t src_output_rates(void) } /* Calculates buffers to allocate for a SRC mode */ -int src_buffer_lengths(struct src_alloc *a, int fs_in, int fs_out, int nch) +int src_buffer_lengths(struct src_alloc *a, int fs_in, int fs_out, int nch, + int max_frames, int max_frames_is_for_source) { - int idx_in, idx_out; + int blk_in, blk_out, k, s1_times, s2_times; struct src_stage *stage1, *stage2; - idx_in = src_find_fs(src_in_fs, NUM_IN_FS, fs_in); - idx_out = src_find_fs(src_out_fs, NUM_OUT_FS, fs_out); + a->idx_in = src_find_fs(src_in_fs, NUM_IN_FS, fs_in); + a->idx_out = src_find_fs(src_out_fs, NUM_OUT_FS, fs_out); - /* Return an error if no in and out match was found. */ - if ((idx_in < 0) || (idx_out < 0)) + /* Set blk_in, blk_out so that the muted fallback SRC keeps + * just source & sink in sync in pipeline without drift. + */ + if ((a->idx_in < 0) || (a->idx_out < 0)) { + k = gcd(fs_in, fs_out); + a->blk_in = fs_in / k; + a->blk_out = fs_out / k; return -EINVAL; + } - stage1 = src_table1[idx_out][idx_in]; - stage2 = src_table2[idx_out][idx_in]; + stage1 = src_table1[a->idx_out][a->idx_in]; + stage2 = src_table2[a->idx_out][a->idx_in]; a->fir_s1 = src_fir_delay_length(stage1); a->out_s1 = src_out_delay_length(stage1); + k = gcd(stage1->blk_out, stage2->blk_in); + s1_times = stage2->blk_in / k; + s2_times = s1_times * stage1->blk_out / stage2->blk_in; + blk_in = s1_times * stage1->blk_in; + blk_out = s2_times * stage2->blk_out; + + /* Find out how many additional times the SRC can be executed + while having block size less or equal to max_frames. + */ + if (max_frames_is_for_source) { + k = max_frames / blk_in; + } else { + k = max_frames / blk_out; + } + + /* Return with error if max_frames is too small even for smallest + possible SRC block length. */ + if (k < 1) + return -EINVAL; + + a->blk_mult = k; + a->blk_in = blk_in * k; + a->blk_out = blk_out * k; + a->stage1_times = s1_times * k; + a->stage2_times = s2_times * k; + if (stage2->filter_length == 1) { a->fir_s2 = 0; a->out_s2 = 0; a->scratch = 0; + a->stage2_times = 0; } else { a->fir_s2 = src_fir_delay_length(stage2); a->out_s2 = src_out_delay_length(stage2); - a->scratch = src_stage_buf_length(stage1, stage2); + a->scratch = stage1->blk_out * s1_times * k; } a->single_src = a->fir_s1 + a->fir_s2 + a->out_s1 + a->out_s2; a->total = a->scratch + nch * a->single_src; @@ -171,10 +191,9 @@ static void src_state_reset(struct src_state *state) static int init_stages( struct src_stage *stage1, struct src_stage *stage2, - struct polyphase_src *src, int n, int32_t *delay_lines_start) + struct polyphase_src *src, struct src_alloc *res, + int n, int32_t *delay_lines_start) { - int k; - /* Clear FIR state */ src_state_reset(&src->state1); src_state_reset(&src->state2); @@ -183,9 +202,9 @@ static int init_stages( src->stage1 = stage1; src->stage2 = stage2; if (n == 1) { - src->blk_in = stage1->blk_in; - src->blk_out = stage1->blk_out; - src->stage1_times = 1; + src->blk_in = stage1->blk_in * res->blk_mult; + src->blk_out = stage1->blk_out * res->blk_mult; + src->stage1_times = res->stage1_times; src->stage2_times = 0; if (stage1->blk_out == 0) return -EINVAL; @@ -193,23 +212,21 @@ static int init_stages( if ((stage1->blk_out == 0) || (stage1->blk_in == 0)) return -EINVAL; - k = gcd(stage1->blk_out, stage2->blk_in); - src->stage1_times = stage2->blk_in / k; - src->stage2_times = - src->stage1_times * stage1->blk_out / stage2->blk_in; - src->blk_in = src->stage1_times * stage1->blk_in; - src->blk_out = src->stage2_times * stage2->blk_out; + src->stage1_times = res->stage1_times; + src->stage2_times = res->stage2_times; + src->blk_in = res->blk_in; + src->blk_out = res->blk_out; } /* Delay line sizes */ - src->state1.fir_delay_size = src_fir_delay_length(stage1); - src->state1.out_delay_size = src_out_delay_length(stage1); + src->state1.fir_delay_size = res->fir_s1; //src_fir_delay_length(stage1); + src->state1.out_delay_size = res->out_s1; //src_out_delay_length(stage1); src->state1.fir_delay = delay_lines_start; src->state1.out_delay = src->state1.fir_delay + src->state1.fir_delay_size; if (n > 1) { - src->state2.fir_delay_size = src_fir_delay_length(stage2); - src->state2.out_delay_size = src_out_delay_length(stage2); + src->state2.fir_delay_size = res->fir_s2; // src_fir_delay_length(stage2); + src->state2.out_delay_size = res->out_s2; // src_out_delay_length(stage2); src->state2.fir_delay = src->state1.out_delay + src->state1.out_delay_size; src->state2.out_delay = @@ -253,45 +270,35 @@ void src_polyphase_reset(struct polyphase_src *src) } int src_polyphase_init(struct polyphase_src *src, int fs1, int fs2, - int32_t *delay_lines_start) + struct src_alloc *res, int32_t *delay_lines_start) { - int f, idx_in, idx_out, n_stages, ret; + int n_stages, ret; struct src_stage *stage1, *stage2; - idx_in = src_find_fs(src_in_fs, NUM_IN_FS, fs1); - idx_out = src_find_fs(src_out_fs, NUM_OUT_FS, fs2); - - if ((idx_in < 0) || (idx_out < 0)) { - ret = -EINVAL; - } else { - /* Get setup for 2 stage conversion */ - stage1 = src_table1[idx_out][idx_in]; - stage2 = src_table2[idx_out][idx_in]; - ret = init_stages(stage1, stage2, src, 2, delay_lines_start); - - /* Get number of stages used for optimize opportunity. 2nd - * stage lenth is one if conversion needs only one stage. - */ - n_stages = (src->stage2->filter_length == 1) ? 1 : 2; - - /* If filter length for first stage is zero this is a deleted - * mode from in/out matrix. Computing of such SRC mode needs - * to be prevented. - */ - if (src->stage2->filter_length == 0) - ret = -EINVAL; + if ((res->idx_in < 0) || (res->idx_out < 0)) { + src->blk_in = res->blk_in; + src->blk_out = res->blk_out; + return -EINVAL; } - if (ret < 0) { - /* Set blk_in, blk_out so that the muted fallback SRC keeps - * just source & sink in sync in pipeline without drift. - */ - f = gcd(fs1, fs2); - src->blk_in = fs1 / f; - src->blk_out = fs2 / f; + /* Get setup for 2 stage conversion */ + stage1 = src_table1[res->idx_out][res->idx_in]; + stage2 = src_table2[res->idx_out][res->idx_in]; + ret = init_stages(stage1, stage2, src, res, 2, delay_lines_start); + if (ret < 0) + return -EINVAL; + + /* Get number of stages used for optimize opportunity. 2nd + * stage lenth is one if conversion needs only one stage. + */ + n_stages = (src->stage2->filter_length == 1) ? 1 : 2; + /* If filter length for first stage is zero this is a deleted + * mode from in/out matrix. Computing of such SRC mode needs + * to be prevented. + */ + if (src->stage2->filter_length == 0) return -EINVAL; - } return n_stages; } diff --git a/src/audio/src_core.h b/src/audio/src_core.h index dae5e53..ae1223a 100644 --- a/src/audio/src_core.h +++ b/src/audio/src_core.h @@ -52,6 +52,13 @@ struct src_alloc { int scratch; int single_src; int total; + int blk_mult; + int blk_in; + int blk_out; + int stage1_times; + int stage2_times; + int idx_in; + int idx_out; }; struct src_stage { @@ -137,14 +144,15 @@ static inline int src_polyphase_get_blk_out(struct polyphase_src *src) void src_polyphase_reset(struct polyphase_src *src); int src_polyphase_init(struct polyphase_src *src, int fs1, int fs2, - int32_t *delay_lines_start); + struct src_alloc *res, int32_t *delay_lines_start); int src_polyphase(struct polyphase_src *src, int32_t x[], int32_t y[], int n_in); void src_polyphase_stage_cir(struct src_stage_prm *s); -int src_buffer_lengths(struct src_alloc *a, int fs_in, int fs_out, int nch); +int src_buffer_lengths(struct src_alloc *a, int fs_in, int fs_out, int nch, + int max_frames, int max_frames_is_for_source); int32_t src_input_rates(void); -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] comp: mixer: report any mixer XRUNs to pipeline.
by Liam Girdwood 06 Sep '17

06 Sep '17

Report any mixer underruns or overruns for each source and sink to pipeline. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/mixer.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/audio/mixer.c b/src/audio/mixer.c index e82b5f0..932c3ad 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -203,7 +203,7 @@ static int mixer_copy(struct comp_dev *dev) struct mixer_data *md = comp_get_drvdata(dev); struct comp_buffer *sink, *sources[PLATFORM_MAX_STREAMS], *source; struct list_item *blist; - int32_t i = 0, num_mix_sources = 0; + int32_t i = 0, num_mix_sources = 0, xru = 0; tracev_mixer("cpy"); @@ -223,17 +223,19 @@ static int mixer_copy(struct comp_dev *dev) /* make sure no sources have underruns */ for (i = 0; i < num_mix_sources; i++) { if (sources[i]->avail < md->period_bytes) { - trace_mixer("xru"); - trace_value(source[i].source->comp.id); - return 0; + comp_underrun(dev, sources[i], sources[i]->avail, + md->period_bytes); + xru = 1; } } + /* underrun ? */ + if (xru) + return 0; /* make sure sink has no overuns */ sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); if (sink->free < md->period_bytes) { - trace_mixer("xro"); - trace_value(sink[i].sink->comp.id); + comp_overrun(dev, sink, sink->free, md->period_bytes); return 0; } -- 2.11.0

1 7

[Sound-open-firmware] [PATCH v3] Passthrough component added
by Ranjani Sridharan 05 Sep '17

05 Sep '17

This patch adds a passthrough component that copies the input stream from the source buffer to the sink buffer. It is meant to serve as a template for creating new components. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/Makefile.am | 3 +- src/audio/passthrough.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++ src/include/reef/trace.h | 1 + src/include/uapi/ipc.h | 7 ++ 4 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 src/audio/passthrough.c diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 285422e..c71430c 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -17,7 +17,8 @@ libaudio_a_SOURCES = \ pipeline.c \ pipeline_static.c \ component.c \ - buffer.c + buffer.c \ + passthrough.c libaudio_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/audio/passthrough.c b/src/audio/passthrough.c new file mode 100644 index 0000000..420d502 --- /dev/null +++ b/src/audio/passthrough.c @@ -0,0 +1,238 @@ +/* + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> + */ + +#include <stdio.h> +#include <stdint.h> +#include <stddef.h> +#include <reef/lock.h> +#include <reef/alloc.h> +#include <reef/list.h> +#include <reef/stream.h> +#include <reef/trace.h> +#include <reef/audio/component.h> +#include <reef/audio/pipeline.h> +#include <uapi/ipc.h> + +/* tracing */ +#define trace_pass(__e) trace_event(TRACE_CLASS_PASS, __e) +#define trace_pass_error(__e) trace_error(TRACE_CLASS_PASS, __e) +#define tracev_pass(__e) tracev_event(TRACE_CLASS_PASS, __e) + +/* The passthrough component, as the name inplies, allows the source buffer + * to pass through the component, without any processing, to the sink buffer. + * It supports 16-bits and 32-bits data formats. + * This code is intended to be used as a template for creating new components. + */ + +/* + * passthrough_comp_data structure: This is private data that cannot be touched + * outside the component. It contains: + * passthrough_func - function that performs the buffer copy + */ +struct passthrough_comp_data { + int (*passthrough_func)(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames); + +}; + +/* This function performs memcpy of the stream data from the source buffer to + * the sink buffer. It returns the number of frames that were copied. + */ +static int passthrough_function(struct comp_dev *dev, + struct comp_buffer *sink_buffer, + struct comp_buffer *source_buffer, uint32_t frames) +{ + struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); + int32_t *src = (int32_t *) source_buffer->r_ptr; + int32_t *dest = (int32_t *) sink_buffer->w_ptr; + int nch = dev->params.channels; + + /* copy frames from source to destination */ + switch (config->frame_fmt) { + case SOF_IPC_FRAME_S16_LE: + memcpy(dest, src, frames * nch * sizeof(int16_t)); + break; + case SOF_IPC_FRAME_S32_LE: + case SOF_IPC_FRAME_S24_4LE: + case SOF_IPC_FRAME_FLOAT: + memcpy(dest, src, frames * nch * sizeof(int32_t)); + break; + default: + trace_pass_error("PTp"); + return -EINVAL; + } + + return frames; +} + +/* passthrough_new create the new passthrough component and allocates + * memory for the component and its private data. + * It returns a pointer to struct comp_dev that was created. + */ +static struct comp_dev *passthrough_new(struct sof_ipc_comp *comp) +{ + struct comp_dev *dev; + struct passthrough_comp_data *cd; + + trace_pass("PTn"); + dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + COMP_SIZE(struct sof_ipc_comp_passthrough)); + if (dev == NULL) + return NULL; + + memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_passthrough)); + + cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + if (cd == NULL) { + rfree(dev); + return NULL; + } + + comp_set_drvdata(dev, cd); + cd->passthrough_func = passthrough_function; + + return dev; +} + +/* passthrough_free performs the clean-up */ +static void passthrough_free(struct comp_dev *dev) +{ + struct passthrough_comp_data *cd = comp_get_drvdata(dev); + + rfree(cd); + rfree(dev); +} + +/* passthrough_params sets the component audio stream parameters */ +static int passthrough_params(struct comp_dev *dev) +{ + return 0; +} + +/* passthrough_cmd is used to pass standard and bespoke commands (with data) + * to the component + */ +static int passthrough_cmd(struct comp_dev *dev, int cmd, void *data) +{ + int ret = 0; + + switch (cmd) { + case COMP_CMD_START: + case COMP_CMD_STOP: + case COMP_CMD_PAUSE: + case COMP_CMD_RELEASE: + default: + ret = comp_set_state(dev, cmd); + break; + } + + return ret; +} + +/* passthrough_copy is called when stream data flows through the pipeline + * It calls passthrough_function to copy the source buffer to the sink buffer. + * It returns the number of frames that were copied. + */ +static int passthrough_copy(struct comp_dev *dev) +{ + struct passthrough_comp_data *cd = comp_get_drvdata(dev); + struct comp_buffer *source_buffer = NULL, *sink_buffer = NULL; + uint32_t copy_bytes; + + /* get source and sink buffers */ + source_buffer = list_first_item(&dev->bsource_list, struct comp_buffer, + sink_list); + sink_buffer = list_first_item(&dev->bsink_list, struct comp_buffer, + source_list); + + /* check that source has enough frames available and sink enough + * frames free + */ + copy_bytes = comp_buffer_get_copy_bytes(dev, source_buffer, + sink_buffer); + + if (copy_bytes < dev->params.host_period_bytes) { + trace_pass_error("PTc"); + return -EINVAL; + } + + /* Run passthrough if buffers have enough room */ + cd->passthrough_func(dev, sink_buffer, source_buffer, dev->frames); + + comp_update_buffer_consume(source_buffer, + dev->params.host_period_bytes); + comp_update_buffer_produce(sink_buffer, dev->params.host_period_bytes); + + return dev->frames; +} + +/* passthrough_preload is used for preloading the component buffers before + * pipeline start + */ +static int passthrough_preload(struct comp_dev *dev) +{ + return passthrough_copy(dev); +} + +/* passthrough_reset rests the component state */ +static int passthrough_reset(struct comp_dev *dev) +{ + trace_pass("PTe"); + dev->state = COMP_STATE_INIT; + return 0; +} + +/* passthrough_prepare prepares the component for receiving stream data */ +static int passthrough_prepare(struct comp_dev *dev) +{ + trace_pass("PTl"); + dev->state = COMP_STATE_PREPARE; + return 0; +} + +/* passthrough component driver ops */ +struct comp_driver comp_passthrough = { + .type = SOF_COMP_PASSTHROUGH, + .ops = { + .new = passthrough_new, + .free = passthrough_free, + .params = passthrough_params, + .cmd = passthrough_cmd, + .copy = passthrough_copy, + .prepare = passthrough_prepare, + .reset = passthrough_reset, + .preload = passthrough_preload, + }, +}; + +void sys_comp_passthrough_init(void) +{ + comp_register(&comp_passthrough); +} diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 300e8d8..b7ec31a 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -87,6 +87,7 @@ #define TRACE_CLASS_TONE (18 << 24) #define TRACE_CLASS_EQ_FIR (19 << 24) #define TRACE_CLASS_EQ_IIR (20 << 24) +#define TRACE_CLASS_PASS (21 << 24) /* move to config.h */ #define TRACE 1 diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index be4c9f2..127ecf1 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -516,6 +516,7 @@ enum sof_comp_type { SOF_COMP_EQ_FIR, SOF_COMP_FILEREAD, /* host test based file IO */ SOF_COMP_FILEWRITE, /* host test based file IO */ + SOF_COMP_PASSTHROUGH, }; /* XRUN action for component */ @@ -615,6 +616,12 @@ struct sof_ipc_comp_mux { struct sof_ipc_comp_config config; } __attribute__((packed)); +/* generic passthrough component */ +struct sof_ipc_comp_passthrough { + struct sof_ipc_comp comp; + struct sof_ipc_comp_config config; +} __attribute__((packed)); + /* generic tone generator component */ struct sof_ipc_comp_tone { struct sof_ipc_comp comp; -- 2.9.3

1 0

[Sound-open-firmware] [PATCH] component: data: Make component get/set data host API generic
by Liam Girdwood 05 Sep '17

05 Sep '17

Make the host API and IPC to set and get component runtime data and values generic with no bespoke commands at the IPC level. Create a generic structure that descibes the type and size of data and whether that data is appended to the IPC message or is available to be DMAed from host. Update the components to use the new structure. Some components like SRC, tone and tone still require some work to export thier ABI. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/eq_fir.c | 58 ++++++++++++++-------- src/audio/eq_iir.c | 53 +++++++++++++-------- src/audio/src.c | 31 ++++++++---- src/audio/tone.c | 49 +++++++++++++------ src/audio/volume.c | 71 +++++++++++++++------------ src/include/reef/audio/component.h | 25 +++++----- src/include/uapi/ipc.h | 98 +++++++++++++++++++++++--------------- src/ipc/intel-ipc.c | 53 ++++++--------------- 8 files changed, 254 insertions(+), 184 deletions(-) diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 534a4a1..540c68f 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -299,26 +299,25 @@ static int eq_fir_params(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commands (with data) to component */ -static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) +static int fir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_ipc_eq_fir_blob *blob; - struct sof_ipc_eq_fir_switch *assign; - struct eq_fir_update *fir_update; - int i; - int ret = 0; + struct eq_fir_update *fir_update; /* TODO: move this to IPC as it's ABI */ size_t bs; + int i, ret = 0; - trace_src("cmd"); + /* TODO: determine if data is DMAed or appended to cdata */ - switch (cmd) { - case COMP_CMD_EQ_FIR_SWITCH: + switch (cdata->cmd) { + case SOF_CTRL_CMD_EQ_SWITCH: trace_src("EFx"); - assign = (struct sof_ipc_eq_fir_switch *) data; - fir_update = (struct eq_fir_update *) assign->data; + fir_update = (struct eq_fir_update *)cdata->data; ret = eq_fir_switch_response(cd->fir, cd->config, fir_update, PLATFORM_MAX_CHANNELS); + if (ret < 0) { + trace_src_error("ec1"); + return ret; + } /* Print trace information */ tracev_value(fir_update->stream_max_channels); @@ -326,14 +325,13 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) tracev_value(fir_update->assign_response[i]); break; - case COMP_CMD_EQ_FIR_CONFIG: + case SOF_CTRL_CMD_EQ_CONFIG: trace_src("EFc"); /* Check and free old config */ eq_fir_free_parameters(&cd->config); /* Copy new config, need to decode data to know the size */ - blob = (struct sof_ipc_eq_fir_blob *) data; - bs = blob->comp.hdr.size - sizeof(struct sof_ipc_hdr); + bs = cdata->num_elems; if (bs > EQ_FIR_MAX_BLOB_SIZE) return -EINVAL; @@ -341,7 +339,7 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) if (cd->config == NULL) return -EINVAL; - memcpy(cd->config, blob->data, bs); + memcpy(cd->config, cdata->data, bs); ret = eq_fir_setup(cd->fir, cd->config, PLATFORM_MAX_CHANNELS); /* Print trace information */ @@ -349,20 +347,40 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) tracev_value(cd->config->number_of_responses_defined); for (i = 0; i < cd->config->stream_max_channels; i++) tracev_value(cd->config->assign_response[i]); - break; - case COMP_CMD_MUTE: + case SOF_CTRL_CMD_MUTE: trace_src("EFm"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) fir_mute(&cd->fir[i]); break; - case COMP_CMD_UNMUTE: + case SOF_CTRL_CMD_UNMUTE: trace_src("EFu"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) fir_unmute(&cd->fir[i]); break; + default: + trace_src_error("ec1"); + ret = -EINVAL; + break; + } + + return ret; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; + + trace_src("cmd"); + + switch (cmd) { + case COMP_CMD_SET_DATA: + ret = fir_cmd(dev, cdata); + break; case COMP_CMD_START: trace_src("EFs"); dev->state = COMP_STATE_RUNNING; @@ -389,6 +407,8 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) break; default: trace_src("EDf"); + ret = -EINVAL; + break; } return ret; diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index 0ac2ef9..f75be71 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -303,24 +303,17 @@ static int eq_iir_params(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commands (with data) to component */ -static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) +static int iir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_ipc_eq_iir_switch *assign; - struct sof_ipc_eq_iir_blob *blob; - struct eq_iir_update *iir_update; - int i; - int ret = 0; + struct eq_iir_update *iir_update; /* TODO: move to IPC header as part of ABI */ + int i, ret = 0; size_t bs; - trace_eq_iir("cmd"); - - switch (cmd) { - case COMP_CMD_EQ_IIR_SWITCH: + switch (cdata->cmd) { + case SOF_CTRL_CMD_EQ_SWITCH: trace_eq_iir("EFx"); - assign = (struct sof_ipc_eq_iir_switch *) data; - iir_update = (struct eq_iir_update *) assign->data; + iir_update = (struct eq_iir_update *) cdata->data; ret = eq_iir_switch_response(cd->iir, cd->config, iir_update, PLATFORM_MAX_CHANNELS); @@ -330,15 +323,13 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) tracev_value(iir_update->assign_response[i]); break; - case COMP_CMD_EQ_IIR_CONFIG: + case SOF_CTRL_CMD_EQ_CONFIG: trace_eq_iir("EFc"); /* Check and free old config */ eq_iir_free_parameters(&cd->config); /* Copy new config, need to decode data to know the size */ - blob = (struct sof_ipc_eq_iir_blob *) data; - bs = blob->comp.hdr.size - sizeof(struct sof_ipc_hdr) - - sizeof(struct sof_ipc_host_buffer); + bs = cdata->num_elems; if (bs > EQ_IIR_MAX_BLOB_SIZE) return -EINVAL; @@ -347,7 +338,7 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) if (cd->config == NULL) return -EINVAL; - memcpy(cd->config, blob->data, bs); + memcpy(cd->config, cdata->data, bs); /* Initialize all channels, the actual number of channels may * not be set yet. */ @@ -360,18 +351,39 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) tracev_value(cd->config->assign_response[i]); break; - case COMP_CMD_MUTE: + case SOF_CTRL_CMD_MUTE: trace_eq_iir("EFm"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) iir_mute_df2t(&cd->iir[i]); break; - case COMP_CMD_UNMUTE: + case SOF_CTRL_CMD_UNMUTE: trace_eq_iir("EFu"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) iir_unmute_df2t(&cd->iir[i]); break; + default: + trace_eq_iir_error("ec1"); + ret = -EINVAL; + break; + } + + return ret; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; + + trace_eq_iir("cmd"); + + switch (cmd) { + case COMP_CMD_SET_DATA: + ret = iir_cmd(dev, cdata); + break; case COMP_CMD_START: trace_eq_iir("EFs"); dev->state = COMP_STATE_RUNNING; @@ -398,6 +410,7 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) break; default: trace_eq_iir("EDf"); + ret = -EINVAL; break; } diff --git a/src/audio/src.c b/src/audio/src.c index 0279841..5dd8345 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -376,29 +376,42 @@ static int src_params(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commands (with data) to component */ -static int src_cmd(struct comp_dev *dev, int cmd, void *data) +static int src_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { - trace_src("SCm"); struct comp_data *cd = comp_get_drvdata(dev); int i; - switch (cmd) { - case COMP_CMD_SRC: - trace_src("SMa"); - break; - case COMP_CMD_MUTE: + switch (cdata->cmd) { + case SOF_CTRL_CMD_MUTE: trace_src("SMu"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) src_polyphase_mute(&cd->src[i]); break; - case COMP_CMD_UNMUTE: + case SOF_CTRL_CMD_UNMUTE: trace_src("SUm"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) src_polyphase_unmute(&cd->src[i]); break; + default: + trace_src_error("ec1"); + return -EINVAL; + } + + return 0; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int src_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + + trace_src("SCm"); + + switch (cmd) { + case COMP_CMD_SET_VALUE: + return src_ctrl_cmd(dev, cdata); case COMP_CMD_START: trace_src("SSt"); dev->state = COMP_STATE_RUNNING; diff --git a/src/audio/tone.c b/src/audio/tone.c index cbc50ac..448c472 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -229,6 +229,7 @@ static inline void tonegen_set_f(struct tone_state *sg, int32_t f) sg->f = f; } +#if 0 /* Tone sweep parameters description: * fc - Multiplication factor for frequency as Q2.30 for logarithmic change * ac - Multiplication factor for amplitude as Q2.30 for logarithmic change @@ -250,6 +251,7 @@ static void tonegen_set_sweep(struct tone_state *sg, int32_t fc, int32_t ac, sg->tone_length = (l > 0) ? l : INT32_MAXVALUE; /* Count rate 125 us */ sg->tone_period = (p > 0) ? p : INT32_MAXVALUE; /* Count rate 125 us */ } +#endif /* Tone ramp parameters: * step - Value that is added or subtracted to amplitude. A zero or negative @@ -428,16 +430,22 @@ static int tone_params(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commands (with data) to component */ -static int tone_cmd(struct comp_dev *dev, int cmd, void *data) +static int tone_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_ipc_comp_tone *ct; - - trace_tone("tri"); - switch (cmd) { - case COMP_CMD_TONE: + switch (cdata->cmd) { + case SOF_CTRL_CMD_MUTE: + trace_tone("TMu"); + tonegen_mute(&cd->sg); + break; + case SOF_CTRL_CMD_UNMUTE: + trace_tone("TUm"); + tonegen_unmute(&cd->sg); + break; +/* TODO: use comp value list array to set this */ +#if 0 + case SOF_CTRL_TYPE_VALUE_COMP_SET: trace_tone("Tto"); ct = (struct sof_ipc_comp_tone *) data; /* Ignore channels while tone implementation is mono */ @@ -447,14 +455,25 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) ct->length, ct->period, ct->repeats); tonegen_set_linramp(&cd->sg, ct->ramp_step); break; - case COMP_CMD_MUTE: - trace_tone("TMu"); - tonegen_mute(&cd->sg); - break; - case COMP_CMD_UNMUTE: - trace_tone("TUm"); - tonegen_unmute(&cd->sg); - break; +#endif + default: + trace_tone_error("ec1"); + return -EINVAL; + } + + return 0; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int tone_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + + trace_tone("tri"); + + switch (cmd) { + case COMP_CMD_SET_VALUE: + return tone_ctrl_cmd(dev, cdata); case COMP_CMD_START: trace_tone("TSt"); dev->state = COMP_STATE_RUNNING; diff --git a/src/audio/volume.c b/src/audio/volume.c index 93a3839..6cbd6ff 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -69,16 +69,16 @@ struct comp_data { uint32_t sink_period_bytes; enum sof_ipc_frame source_format; enum sof_ipc_frame sink_format; - uint32_t chan[PLATFORM_MAX_CHANNELS]; - uint32_t volume[PLATFORM_MAX_CHANNELS]; /* current volume */ - uint32_t tvolume[PLATFORM_MAX_CHANNELS]; /* target volume */ - uint32_t mvolume[PLATFORM_MAX_CHANNELS]; /* mute volume */ + uint32_t chan[SOF_IPC_MAX_CHANNELS]; + uint32_t volume[SOF_IPC_MAX_CHANNELS]; /* current volume */ + uint32_t tvolume[SOF_IPC_MAX_CHANNELS]; /* target volume */ + uint32_t mvolume[SOF_IPC_MAX_CHANNELS]; /* mute volume */ void (*scale_vol)(struct comp_dev *dev, struct comp_buffer *sink, struct comp_buffer *source, uint32_t frames); struct work volwork; /* host volume readback */ - struct sof_ipc_ctrl_values *hvol; + struct sof_ipc_ctrl_value_chan *hvol; }; struct comp_func_map { @@ -234,9 +234,9 @@ static void vol_sync_host(struct comp_data *cd, uint32_t chan) if (cd->hvol == NULL) return; - for (i = 0; i < cd->hvol->num_values; i++) { - if (cd->hvol->values[i].channel == cd->chan[chan]) - cd->hvol->values[i].value = cd->volume[chan]; + for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { + if (cd->hvol[i].channel == cd->chan[chan]) + cd->hvol[i].value = cd->volume[chan]; } } @@ -380,50 +380,61 @@ static inline void volume_set_chan_unmute(struct comp_dev *dev, int chan) cd->tvolume[chan] = cd->mvolume[chan]; } -/* used to pass standard and bespoke commands (with data) to component */ -static int volume_cmd(struct comp_dev *dev, int cmd, void *data) +static int volume_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_ipc_ctrl_values *cv; int i, j; - trace_volume("cmd"); - - switch (cmd) { - case COMP_CMD_VOLUME: - cv = (struct sof_ipc_ctrl_values*)data; + switch (cdata->cmd) { + case SOF_CTRL_CMD_VOLUME: - for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - for (j = 0; j < cv->num_values; j++) { - if (cv->values[j].channel == cd->chan[i]) - volume_set_chan(dev, i, cv->values[j].value); + for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { + for (j = 0; j < cdata->num_elems; j++) { + if (cdata->chanv[j].value == cd->chan[i]) + volume_set_chan(dev, i, cdata->chanv[j].value); } } work_schedule_default(&cd->volwork, VOL_RAMP_US); break; - case COMP_CMD_MUTE: - cv = (struct sof_ipc_ctrl_values*)data; + case SOF_CTRL_CMD_MUTE: - for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - for (j = 0; j < cv->num_values; j++) { - if (cv->values[j].channel == cd->chan[i]) + for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { + for (j = 0; j < cdata->num_elems; j++) { + if (cdata->chanv[j].value == cd->chan[i]) volume_set_chan_mute(dev, i); } } work_schedule_default(&cd->volwork, VOL_RAMP_US); break; - case COMP_CMD_UNMUTE: - cv = (struct sof_ipc_ctrl_values*)data; + case SOF_CTRL_CMD_UNMUTE: - for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - for (j = 0; j < cv->num_values; j++) { - if (cv->values[j].channel == cd->chan[i]) + for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { + for (j = 0; j < cdata->num_elems; j++) { + if (cdata->chanv[j].value == cd->chan[i]) volume_set_chan_unmute(dev, i); } } work_schedule_default(&cd->volwork, VOL_RAMP_US); break; + default: + trace_volume_error("ec1"); + return -EINVAL; + } + + return 0; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int volume_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + + trace_volume("cmd"); + + switch (cmd) { + case COMP_CMD_SET_VALUE: + return volume_ctrl_cmd(dev, cdata); case COMP_CMD_START: dev->state = COMP_STATE_RUNNING; break; diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index e73a22a..35c80de 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -59,7 +59,9 @@ #define COMP_STATE_PAUSED 5 /* component paused */ #define COMP_STATE_RUNNING 6 /* component active */ -/* standard component commands */ +/* + * standard component stream commands + */ #define COMP_CMD_STOP 0 /* stop component stream */ #define COMP_CMD_START 1 /* start component stream */ @@ -69,18 +71,15 @@ #define COMP_CMD_SUSPEND 5 /* suspend component */ #define COMP_CMD_RESUME 6 /* resume component */ -#define COMP_CMD_VOLUME 100 -#define COMP_CMD_MUTE 101 -#define COMP_CMD_UNMUTE 102 -#define COMP_CMD_ROUTE 103 -#define COMP_CMD_SRC 104 -#define COMP_CMD_LOOPBACK 105 - -#define COMP_CMD_TONE 106 /* Tone generator amplitude and frequency */ -#define COMP_CMD_EQ_FIR_CONFIG 107 /* Configuration data for FIR EQ */ -#define COMP_CMD_EQ_FIR_SWITCH 108 /* Update request for FIR EQ */ -#define COMP_CMD_EQ_IIR_CONFIG 109 /* Configuration data for IIR EQ */ -#define COMP_CMD_EQ_IIR_SWITCH 110 /* Response update request for IIR EQ */ +/* + * standard component control commands + */ + +#define COMP_CMD_SET_VALUE 100 +#define COMP_CMD_GET_VALUE 101 +#define COMP_CMD_SET_DATA 102 +#define COMP_CMD_GET_DATA 103 + /* MMAP IPC status */ #define COMP_CMD_IPC_MMAP_RPOS 200 /* host read position */ diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 053390c..c8cdedb 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -88,15 +88,12 @@ #define SOF_IPC_PM_CLK_GET SOF_CMD_TYPE(0x005) #define SOF_IPC_PM_CLK_REQ SOF_CMD_TYPE(0x006) -/* component - multiple different types */ -#define SOF_IPC_COMP_SET_VOLUME SOF_CMD_TYPE(0x001) -#define SOF_IPC_COMP_GET_VOLUME SOF_CMD_TYPE(0x002) -#define SOF_IPC_COMP_SET_MIXER SOF_CMD_TYPE(0x003) -#define SOF_IPC_COMP_GET_MIXER SOF_CMD_TYPE(0x004) -#define SOF_IPC_COMP_SET_MUX SOF_CMD_TYPE(0x005) -#define SOF_IPC_COMP_GET_MUX SOF_CMD_TYPE(0x006) -#define SOF_IPC_COMP_SET_SRC SOF_CMD_TYPE(0x007) -#define SOF_IPC_COMP_GET_SRC SOF_CMD_TYPE(0x008) +/* component runtime config - multiple different types */ +#define SOF_IPC_COMP_SET_VALUE SOF_CMD_TYPE(0x001) +#define SOF_IPC_COMP_GET_VALUE SOF_CMD_TYPE(0x002) +#define SOF_IPC_COMP_SET_DATA SOF_CMD_TYPE(0x003) +#define SOF_IPC_COMP_GET_DATA SOF_CMD_TYPE(0x004) + /* DAI messages */ #define SOF_IPC_DAI_CONFIG SOF_CMD_TYPE(0x001) @@ -433,24 +430,69 @@ struct sof_ipc_stream_posn { * Component Mixers and Controls */ -struct sof_ipc_ctrl_chan { +/* control data type and direction */ +enum sof_ipc_ctrl_type { + SOF_CTRL_TYPE_VALUE_CHAN_GET = 0, + SOF_CTRL_TYPE_VALUE_CHAN_SET, + SOF_CTRL_TYPE_VALUE_COMP_GET, + SOF_CTRL_TYPE_VALUE_COMP_SET, + SOF_CTRL_TYPE_DATA_GET, + SOF_CTRL_TYPE_DATA_SET, +}; + +/* control command type */ +enum sof_ipc_ctrl_cmd { + SOF_CTRL_CMD_VOLUME = 0, + SOF_CTRL_CMD_ROUTE, + SOF_CTRL_CMD_SRC, + SOF_CTRL_CMD_LOOPBACK, + SOF_CTRL_CMD_EQ_SWITCH, + SOF_CTRL_CMD_EQ_CONFIG, + /* Mute is similar to volume, but maps better onto ALSA switch controls */ + SOF_CTRL_CMD_MUTE, + SOF_CTRL_CMD_UNMUTE, +}; + +/* generic channel mapped value data */ +struct sof_ipc_ctrl_value_chan { enum sof_ipc_chmap channel; uint32_t value; } __attribute__((packed)); -struct sof_ipc_ctrl_values { - struct sof_ipc_hdr hdr; - uint32_t comp_id; - uint32_t num_values; - struct sof_ipc_ctrl_chan values[SOF_IPC_MAX_CHANNELS]; +/* generic component mapped value data */ +struct sof_ipc_ctrl_value_comp { + uint32_t index; /* component source/sink/control index in control */ + union { + uint32_t uvalue; + int32_t svalue; + }; } __attribute__((packed)); -struct sof_ipc_ctrl_get_values { +/* generic control data */ +struct sof_ipc_ctrl_data { struct sof_ipc_hdr hdr; uint32_t comp_id; - uint32_t num_values; + + /* control access and data type */ + enum sof_ipc_ctrl_type type; + enum sof_ipc_ctrl_cmd cmd; + + /* control data - can either be appended or DMAed from host */ + struct sof_ipc_host_buffer buffer; + uint32_t num_elems; /* in array elems or bytes */ + + /* control data - add new types if needed */ + union { + /* channel values can be used by volume type controls */ + struct sof_ipc_ctrl_value_chan chanv[0]; + /* component values used by routing controls like mux, mixer */ + struct sof_ipc_ctrl_value_comp compv[0]; + /* data can be used by binary controls */ + char data[0]; + }; } __attribute__((packed)); + /* * Component */ @@ -599,28 +641,6 @@ struct sof_ipc_comp_eq_iir { struct sof_ipc_comp_config config; } __attribute__((packed)); -/* IPC to pass configuration blobs to equalizers and re-assign responses */ -struct sof_ipc_eq_fir_blob { - struct sof_ipc_comp comp; - struct sof_ipc_host_buffer buffer; - int32_t data[]; -} __attribute__((packed)); - -struct sof_ipc_eq_iir_blob { - struct sof_ipc_comp comp; - struct sof_ipc_host_buffer buffer; - int32_t data[]; -} __attribute__((packed)); - -struct sof_ipc_eq_fir_switch { - struct sof_ipc_comp comp; - int32_t data[]; -} __attribute__((packed)); - -struct sof_ipc_eq_iir_switch { - struct sof_ipc_comp comp; - int32_t data[]; -} __attribute__((packed)); /* frees components, buffers and pipelines * SOF_IPC_TPLG_COMP_FREE, SOF_IPC_TPLG_PIPE_FREE, SOF_IPC_TPLG_BUFFER_FREE diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 60001c3..4f397c1 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -559,48 +559,31 @@ static int ipc_glb_pm_message(uint32_t header) * Topology IPC Operations. */ -static int ipc_comp_set_value(uint32_t header, uint32_t cmd) +/* get/set component values or runtime data */ +static int ipc_comp_value(uint32_t header, uint32_t cmd) { struct ipc_comp_dev *stream_dev; - struct sof_ipc_ctrl_values *values = _ipc->comp_data; - - trace_ipc("VoS"); - - /* get the component */ - stream_dev = ipc_get_comp(_ipc, values->comp_id); - if (stream_dev == NULL) { - trace_ipc_error("eVs"); - return -ENODEV; - } - - /* set component values */ - return comp_cmd(stream_dev->cd, cmd, values); -} - -static int ipc_comp_get_value(uint32_t header, uint32_t cmd) -{ - struct ipc_comp_dev *stream_dev; - struct sof_ipc_ctrl_values *values = _ipc->comp_data; + struct sof_ipc_ctrl_data *data = _ipc->comp_data; int ret; trace_ipc("VoG"); /* get the component */ - stream_dev = ipc_get_comp(_ipc, values->comp_id); + stream_dev = ipc_get_comp(_ipc, data->comp_id); if (stream_dev == NULL){ trace_ipc_error("eVg"); return -ENODEV; } /* get component values */ - ret = comp_cmd(stream_dev->cd, COMP_CMD_VOLUME, values); + ret = comp_cmd(stream_dev->cd, cmd, data); if (ret < 0) { trace_ipc_error("eVG"); return ret; } /* write component values to the outbox */ - mailbox_outbox_write(values, 0, sizeof(*values)); + mailbox_outbox_write(0, data, data->hdr.size); return 0; } @@ -610,22 +593,14 @@ static int ipc_glb_comp_message(uint32_t header) uint32_t cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; switch (cmd) { - case iCS(SOF_IPC_COMP_SET_VOLUME): - return ipc_comp_set_value(header, COMP_CMD_VOLUME); - case iCS(SOF_IPC_COMP_GET_VOLUME): - return ipc_comp_get_value(header, COMP_CMD_VOLUME); - case iCS(SOF_IPC_COMP_SET_MIXER): - return ipc_comp_set_value(header, COMP_CMD_ROUTE); - case iCS(SOF_IPC_COMP_GET_MIXER): - return ipc_comp_get_value(header, COMP_CMD_ROUTE); - case iCS(SOF_IPC_COMP_SET_MUX): - return ipc_comp_set_value(header, COMP_CMD_ROUTE); - case iCS(SOF_IPC_COMP_GET_MUX): - return ipc_comp_get_value(header, COMP_CMD_ROUTE); - case iCS(SOF_IPC_COMP_SET_SRC): - return ipc_comp_set_value(header, COMP_CMD_SRC); - case iCS(SOF_IPC_COMP_GET_SRC): - return ipc_comp_get_value(header, COMP_CMD_SRC); + case iCS(SOF_IPC_COMP_SET_VALUE): + return ipc_comp_value(header, COMP_CMD_SET_VALUE); + case iCS(SOF_IPC_COMP_GET_VALUE): + return ipc_comp_value(header, COMP_CMD_GET_VALUE); + case iCS(SOF_IPC_COMP_SET_DATA): + return ipc_comp_value(header, COMP_CMD_SET_DATA); + case iCS(SOF_IPC_COMP_GET_DATA): + return ipc_comp_value(header, COMP_CMD_GET_DATA); default: trace_ipc_error("eCc"); trace_value(header); -- 2.11.0

2 1

[Sound-open-firmware] [PATCH v2 2/2] Passthrough component added
by Ranjani Sridharan 05 Sep '17

05 Sep '17

This patch adds a passthrough component that copies the input stream from the source buffer to the sink buffer. It is meant to serve as a template for creating new components. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/Makefile.am | 3 +- src/audio/passthrough.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++ src/include/reef/trace.h | 1 + src/include/uapi/ipc.h | 7 ++ 4 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 src/audio/passthrough.c diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 285422e..c71430c 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -17,7 +17,8 @@ libaudio_a_SOURCES = \ pipeline.c \ pipeline_static.c \ component.c \ - buffer.c + buffer.c \ + passthrough.c libaudio_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/audio/passthrough.c b/src/audio/passthrough.c new file mode 100644 index 0000000..4163db9 --- /dev/null +++ b/src/audio/passthrough.c @@ -0,0 +1,238 @@ +/* + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> + */ + +#include <stdio.h> +#include <stdint.h> +#include <stddef.h> +#include <reef/lock.h> +#include <reef/alloc.h> +#include <reef/list.h> +#include <reef/stream.h> +#include <reef/trace.h> +#include <reef/audio/component.h> +#include <reef/audio/pipeline.h> +#include <uapi/ipc.h> + +/* tracing */ +#define trace_pass(__e) trace_event(TRACE_CLASS_PASS, __e) +#define trace_pass_error(__e) trace_error(TRACE_CLASS_PASS, __e) +#define tracev_pass(__e) tracev_event(TRACE_CLASS_PASS, __e) + +/* The passthrough component, as the name inplies, allows the source buffer + * to pass through the component, without any processing, to the sink buffer. + * It supports 16-bits and 32-bits data formats. + * This code is intended to be used as a template for creating new components. + */ + +/* + * passthrough_comp_data structure: This is private data that cannot be touched + * outside the component. It contains: + * passthrough_func - function that performs the buffer copy + */ +struct passthrough_comp_data { + int (*passthrough_func)(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames); + +}; + +/* This function performs memcpy of the stream data from the source buffer to + * the sink buffer. It returns the number of frames that were copied. + */ +static int passthrough_function(struct comp_dev *dev, + struct comp_buffer *sink_buffer, + struct comp_buffer *source_buffer, uint32_t frames) +{ + struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); + int32_t *src = (int32_t *) source_buffer->r_ptr; + int32_t *dest = (int32_t *) sink_buffer->w_ptr; + int nch = dev->params.channels; + + /* copy frames from source to destination */ + switch (config->frame_fmt) { + case SOF_IPC_FRAME_S16_LE: + memcpy(dest, src, frames * nch * sizeof(int16_t)); + break; + case SOF_IPC_FRAME_S32_LE: + case SOF_IPC_FRAME_S24_4LE: + case SOF_IPC_FRAME_FLOAT: + memcpy(dest, src, frames * nch * sizeof(int32_t)); + break; + default: + trace_pass_error("PTp"); + return -EINVAL; + } + + return frames; +} + +/* passthrough_new create the new passthrough component and allocates + * memory for the component and its private data. + * It returns a pointer to struct comp_dev that was created. + */ +static struct comp_dev *passthrough_new(struct sof_ipc_comp *comp) +{ + struct comp_dev *dev; + struct passthrough_comp_data *cd; + + trace_pass("PTn"); + dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + COMP_SIZE(struct sof_ipc_comp_passthrough)); + if (dev == NULL) + return NULL; + + memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_passthrough)); + + cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + if (cd == NULL) { + rfree(dev); + return NULL; + } + + comp_set_drvdata(dev, cd); + cd->passthrough_func = passthrough_function; + + return dev; +} + +/* passthrough_free performs the clean-up */ +static void passthrough_free(struct comp_dev *dev) +{ + struct passthrough_comp_data *cd = comp_get_drvdata(dev); + + rfree(cd); + rfree(dev); +} + +/* passthrough_params sets the component audio stream parameters */ +static int passthrough_params(struct comp_dev *dev) +{ + return 0; +} + +/* passthrough_cmd is used to pass standard and bespoke commands (with data) + * to the component + */ +static int passthrough_cmd(struct comp_dev *dev, int cmd, void *data) +{ + int ret = 0; + + switch (cmd) { + case COMP_CMD_START: + case COMP_CMD_STOP: + case COMP_CMD_PAUSE: + case COMP_CMD_RELEASE: + default: + ret = comp_set_state(dev, cmd); + break; + } + + return ret; +} + +/* passthrough_copy is called when stream data flows through the pipeline + * It calls passthrough_function to copy the source buffer to the sink buffer. + * It returns the number of frames that were copied. + */ +static int passthrough_copy(struct comp_dev *dev) +{ + struct passthrough_comp_data *cd = comp_get_drvdata(dev); + struct comp_buffer *source_buffer = NULL, *sink_buffer = NULL; + uint32_t copy_bytes; + + /* get source and sink buffers */ + source_buffer = list_first_item(&dev->bsource_list, struct comp_buffer, + sink_list); + sink_buffer = list_first_item(&dev->bsink_list, struct comp_buffer, + source_list); + + /* check that source has enough frames available and sink enough + * frames free + */ + copy_bytes = comp_buffer_get_copy_bytes(dev, source_buffer, + sink_buffer); + + if (copy_bytes < dev->frames * dev->frame_bytes) { + trace_pass_error("PTc"); + return -EINVAL; + } + + /* Run passthrough if buffers have enough room */ + cd->passthrough_func(dev, sink_buffer, source_buffer, dev->frames); + + comp_update_buffer_consume(source_buffer, + dev->params.host_period_bytes); + comp_update_buffer_produce(sink_buffer, dev->params.host_period_bytes); + + return dev->frames; +} + +/* passthrough_preload is used for preloading the component buffers before + * pipeline start + */ +static int passthrough_preload(struct comp_dev *dev) +{ + return passthrough_copy(dev); +} + +/* passthrough_reset rests the component state */ +static int passthrough_reset(struct comp_dev *dev) +{ + trace_pass("PTe"); + dev->state = COMP_STATE_INIT; + return 0; +} + +/* passthrough_prepare prepares the component for receiving stream data */ +static int passthrough_prepare(struct comp_dev *dev) +{ + trace_pass("PTl"); + dev->state = COMP_STATE_PREPARE; + return 0; +} + +/* passthrough component driver ops */ +struct comp_driver comp_passthrough = { + .type = SOF_COMP_PASSTHROUGH, + .ops = { + .new = passthrough_new, + .free = passthrough_free, + .params = passthrough_params, + .cmd = passthrough_cmd, + .copy = passthrough_copy, + .prepare = passthrough_prepare, + .reset = passthrough_reset, + .preload = passthrough_preload, + }, +}; + +void sys_comp_passthrough_init(void) +{ + comp_register(&comp_passthrough); +} diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 300e8d8..b7ec31a 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -87,6 +87,7 @@ #define TRACE_CLASS_TONE (18 << 24) #define TRACE_CLASS_EQ_FIR (19 << 24) #define TRACE_CLASS_EQ_IIR (20 << 24) +#define TRACE_CLASS_PASS (21 << 24) /* move to config.h */ #define TRACE 1 diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index be4c9f2..127ecf1 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -516,6 +516,7 @@ enum sof_comp_type { SOF_COMP_EQ_FIR, SOF_COMP_FILEREAD, /* host test based file IO */ SOF_COMP_FILEWRITE, /* host test based file IO */ + SOF_COMP_PASSTHROUGH, }; /* XRUN action for component */ @@ -615,6 +616,12 @@ struct sof_ipc_comp_mux { struct sof_ipc_comp_config config; } __attribute__((packed)); +/* generic passthrough component */ +struct sof_ipc_comp_passthrough { + struct sof_ipc_comp comp; + struct sof_ipc_comp_config config; +} __attribute__((packed)); + /* generic tone generator component */ struct sof_ipc_comp_tone { struct sof_ipc_comp comp; -- 2.9.3

1 0