diff --git a/src/audio/codec_adapter/codec/cadence.c b/src/audio/codec_adapter/codec/cadence.c index 34fbb6e13729..05e75f6b97f5 100644 --- a/src/audio/codec_adapter/codec/cadence.c +++ b/src/audio/codec_adapter/codec/cadence.c @@ -503,7 +503,7 @@ cadence_codec_process(struct processing_module *mod, struct input_stream_buffer *input_buffers, int num_input_buffers, struct output_stream_buffer *output_buffers, int num_output_buffers) { - struct comp_buffer *local_buff = mod->local_buff; + struct comp_buffer *local_buff; struct comp_dev *dev = mod->dev; struct module_data *codec = comp_get_module_data(dev); struct cadence_codec_data *cd = codec->private; @@ -533,6 +533,7 @@ cadence_codec_process(struct processing_module *mod, } /* do not proceed with processing if not enough free space left in the local buffer */ + local_buff = list_first_item(&mod->sink_buffer_list, struct comp_buffer, sink_list); if (local_buff->stream.free < output_bytes) return -ENOSPC; @@ -579,6 +580,11 @@ cadence_codec_process(struct processing_module *mod, input_buffers[0].consumed += codec->mpd.consumed; codec->mpd.consumed = input_buffers[0].consumed; + /* copy the produced samples into the output buffer */ + memcpy_s(output_buffers[0].data, codec->mpd.produced, codec->mpd.out_buff, + codec->mpd.produced); + output_buffers[0].size = codec->mpd.produced; + comp_dbg(dev, "cadence_codec_process() done"); return 0; diff --git a/src/audio/codec_adapter/codec/dts.c b/src/audio/codec_adapter/codec/dts.c index 47221a5efc00..028b1ec10fc8 100644 --- a/src/audio/codec_adapter/codec/dts.c +++ b/src/audio/codec_adapter/codec/dts.c @@ -253,8 +253,15 @@ dts_codec_process(struct processing_module *mod, codec->mpd.produced = !ret ? bytes_processed : 0; input_buffers[0].consumed = codec->mpd.consumed; - if (ret) + if (ret) { comp_err(dev, "dts_codec_process() failed %d %d", ret, dts_result); + return ret; + } + + /* copy the produced samples into the output buffer */ + memcpy_s(output_buffers[0].data, codec->mpd.produced, codec->mpd.out_buff, + codec->mpd.produced); + output_buffers[0].size = codec->mpd.produced; comp_dbg(dev, "dts_codec_process() done"); diff --git a/src/audio/codec_adapter/codec/passthrough.c b/src/audio/codec_adapter/codec/passthrough.c index 6673cf723cfa..031224ba277c 100644 --- a/src/audio/codec_adapter/codec/passthrough.c +++ b/src/audio/codec_adapter/codec/passthrough.c @@ -85,6 +85,11 @@ passthrough_codec_process(struct processing_module *mod, codec->mpd.consumed = mod->period_bytes; input_buffers[0].consumed = codec->mpd.consumed; + /* copy the produced samples into the output buffer */ + memcpy_s(output_buffers[0].data, codec->mpd.produced, codec->mpd.out_buff, + codec->mpd.produced); + output_buffers[0].size = codec->mpd.produced; + return 0; } diff --git a/src/audio/codec_adapter/codec/waves.c b/src/audio/codec_adapter/codec/waves.c index 7cb79df8e62b..065a38ac0590 100644 --- a/src/audio/codec_adapter/codec/waves.c +++ b/src/audio/codec_adapter/codec/waves.c @@ -766,6 +766,10 @@ waves_codec_process(struct processing_module *mod, codec->mpd.consumed = codec->mpd.produced; input_buffers[0].consumed = codec->mpd.consumed; ret = 0; + /* copy the produced samples into the output buffer */ + memcpy_s(output_buffers[0].data, codec->mpd.produced, codec->mpd.out_buff, + codec->mpd.produced); + output_buffers[0].size = codec->mpd.produced; } if (ret) diff --git a/src/audio/codec_adapter/codec_adapter.c b/src/audio/codec_adapter/codec_adapter.c index 95ff7a4ef3f3..943977950a8e 100644 --- a/src/audio/codec_adapter/codec_adapter.c +++ b/src/audio/codec_adapter/codec_adapter.c @@ -13,7 +13,6 @@ * \brief Processing component aimed to work with external codec libraries * \author Marcin Rajwa */ - #include #include #include @@ -22,6 +21,8 @@ #include #include #include +#include +#include /** * \brief Create a codec adapter component. @@ -66,6 +67,7 @@ struct comp_dev *codec_adapter_new(const struct comp_driver *drv, mod->dev = dev; comp_set_drvdata(dev, mod); + list_init(&mod->sink_buffer_list); /* Copy initial config */ if (ipc_codec_adapter->size) { @@ -108,7 +110,7 @@ int codec_adapter_prepare(struct comp_dev *dev) int ret; struct processing_module *mod = comp_get_drvdata(dev); struct module_data *md = &mod->priv; - struct list_item *blist; + struct list_item *blist, *_blist; uint32_t buff_periods; uint32_t buff_size; /* size of local buffer */ int i = 0; @@ -227,7 +229,7 @@ int codec_adapter_prepare(struct comp_dev *dev) /* allocate memory for output buffer data */ i = 0; list_for_item(blist, &dev->bsink_list) { - mod->output_buffers[i].data = rballoc(0, SOF_MEM_CAPS_RAM, buff_size); + mod->output_buffers[i].data = rballoc(0, SOF_MEM_CAPS_RAM, md->mpd.out_buff_size); if (!mod->output_buffers[i].data) { comp_err(mod->dev, "codec_adapter_prepare(): Failed to alloc output buffer data"); ret = -ENOMEM; @@ -236,31 +238,48 @@ int codec_adapter_prepare(struct comp_dev *dev) i++; } - /* Allocate local buffer */ - if (mod->local_buff) { - ret = buffer_set_size(mod->local_buff, buff_size); - if (ret < 0) { - comp_err(dev, "codec_adapter_prepare(): buffer_set_size() failed, buff_size = %u", - buff_size); - goto out_free; + /* allocate buffer for all sinks */ + if (list_is_empty(&mod->sink_buffer_list)) { + for (i = 0; i < mod->num_output_buffers; i++) { + struct comp_buffer *buffer = buffer_alloc(buff_size, SOF_MEM_CAPS_RAM, + PLATFORM_DCACHE_ALIGN); + if (!buffer) { + comp_err(dev, "codec_adapter_prepare(): failed to allocate local buffer"); + ret = -ENOMEM; + goto free; + } + list_item_append(&buffer->sink_list, &mod->sink_buffer_list); + buffer_set_params(buffer, &mod->stream_params, BUFFER_UPDATE_FORCE); + buffer_reset_pos(buffer, NULL); } } else { - mod->local_buff = buffer_alloc(buff_size, SOF_MEM_CAPS_RAM, PLATFORM_DCACHE_ALIGN); - if (!mod->local_buff) { - comp_err(dev, "codec_adapter_prepare(): failed to allocate local buffer"); - ret = -ENOMEM; - goto out_free; + list_for_item(blist, &mod->sink_buffer_list) { + struct comp_buffer *buffer = container_of(blist, struct comp_buffer, + sink_list); + + ret = buffer_set_size(buffer, buff_size); + if (ret < 0) { + comp_err(dev, "codec_adapter_prepare(): buffer_set_size() failed, buff_size = %u", + buff_size); + goto free; + } + buffer_set_params(buffer, &mod->stream_params, BUFFER_UPDATE_FORCE); + buffer_reset_pos(buffer, NULL); } - } - buffer_set_params(mod->local_buff, &mod->stream_params, - BUFFER_UPDATE_FORCE); - buffer_reset_pos(mod->local_buff, NULL); comp_dbg(dev, "codec_adapter_prepare() done"); return 0; +free: + list_for_item_safe(blist, _blist, &mod->sink_buffer_list) { + struct comp_buffer *buffer = container_of(blist, struct comp_buffer, + sink_list); + + list_item_del(&buffer->sink_list); + buffer_free(buffer); + } out_free: for (i = 0; i < mod->num_output_buffers; i++) rfree(mod->output_buffers[i].data); @@ -373,38 +392,73 @@ static void generate_zeroes(struct comp_buffer *sink, uint32_t bytes) comp_update_buffer_produce(sink, bytes); } -int codec_adapter_copy(struct comp_dev *dev) +static void module_copy_samples(struct comp_dev *dev, struct comp_buffer *src_buffer, + struct comp_buffer *sink_buffer, uint32_t produced) { - int ret = 0; - uint32_t bytes_to_process, copy_bytes, processed = 0, produced = 0; - struct comp_buffer *source = list_first_item(&dev->bsource_list, struct comp_buffer, - sink_list); - struct comp_buffer *sink = list_first_item(&dev->bsink_list, struct comp_buffer, - source_list); struct processing_module *mod = comp_get_drvdata(dev); - struct module_data *md = &mod->priv; - struct comp_buffer *local_buff = mod->local_buff; struct comp_copy_limits cl; - struct list_item *blist; - size_t size = MAX(mod->deep_buff_bytes, mod->period_bytes); - int i = 0; + uint32_t copy_bytes; - if (!source || !sink) { - comp_err(dev, "codec_adapter_copy(): source/sink buffer not found"); - return -EINVAL; + if (!produced && !mod->deep_buff_bytes) { + comp_dbg(dev, "module_copy_samples(): nothing processed in this call"); + /* + * No data produced anything in this period but there still be data in the buffer + * to copy to sink + */ + if (audio_stream_get_avail_bytes(&src_buffer->stream) >= mod->period_bytes) + goto copy_period; + + return; } - comp_dbg(dev, "codec_adapter_copy() start: local_buff free: %d source avail %d", - local_buff->stream.free, source->stream.avail); + if (mod->deep_buff_bytes) { + if (mod->deep_buff_bytes >= audio_stream_get_avail_bytes(&src_buffer->stream)) { + generate_zeroes(sink_buffer, mod->period_bytes); + return; + } + + comp_dbg(dev, "module_copy_samples(): deep buffering has ended after gathering %d bytes of processed data", + audio_stream_get_avail_bytes(&src_buffer->stream)); + mod->deep_buff_bytes = 0; + } + +copy_period: + comp_get_copy_limits_with_lock(src_buffer, sink_buffer, &cl); + copy_bytes = cl.frames * cl.source_frame_bytes; + audio_stream_copy(&src_buffer->stream, 0, &sink_buffer->stream, 0, + copy_bytes / mod->stream_params.sample_container_bytes); + buffer_stream_writeback(sink_buffer, copy_bytes); + + comp_update_buffer_produce(sink_buffer, copy_bytes); + comp_update_buffer_consume(src_buffer, copy_bytes); +} + +int codec_adapter_copy(struct comp_dev *dev) +{ + struct comp_buffer *source; + struct comp_buffer *sink; + struct processing_module *mod = comp_get_drvdata(dev); + struct list_item *blist; + size_t size = MAX(mod->deep_buff_bytes, mod->period_bytes); + uint32_t min_free_frames = UINT_MAX; + int ret, i = 0; + + /* get the least number of free frames from all sinks */ + list_for_item(blist, &mod->sink_buffer_list) { + sink = container_of(blist, struct comp_buffer, sink_list); + min_free_frames = MIN(min_free_frames, + audio_stream_get_free_frames(&sink->stream)); + } /* copy source samples into input buffer */ list_for_item(blist, &dev->bsource_list) { + uint32_t bytes_to_process; int frames, source_frame_bytes; source = container_of(blist, struct comp_buffer, sink_list); source = buffer_acquire(source); - frames = audio_stream_avail_frames(&source->stream, &local_buff->stream); + frames = MIN(min_free_frames, audio_stream_get_avail_frames(&source->stream)); source_frame_bytes = audio_stream_frame_bytes(&source->stream); source = buffer_release(source); @@ -429,19 +483,19 @@ int codec_adapter_copy(struct comp_dev *dev) goto out; } - /* skip copying if module has not produced anything */ - if (md->mpd.produced == 0) { - comp_err(dev, "codec_adapter_copy() error %x: module hasn't processed anything", - ret); - goto db_verify; - } - - ca_copy_from_module_to_sink(&local_buff->stream, md->mpd.out_buff, md->mpd.produced); + /* copy all produced output samples to output buffers */ + i = 0; + list_for_item(blist, &mod->sink_buffer_list) { + struct comp_buffer *buffer = container_of(blist, struct comp_buffer, sink_list); - processed += md->mpd.consumed; - produced += md->mpd.produced; + if (mod->output_buffers[i].size > 0) { + ca_copy_from_module_to_sink(&buffer->stream, mod->output_buffers[i].data, + mod->output_buffers[i].size); + audio_stream_produce(&buffer->stream, mod->output_buffers[i].size); + } + i++; + } - audio_stream_produce(&local_buff->stream, md->mpd.produced); consume: /* consume from all input buffers */ i = 0; @@ -451,46 +505,28 @@ int codec_adapter_copy(struct comp_dev *dev) i++; } -db_verify: - if (!produced && !mod->deep_buff_bytes) { - comp_dbg(dev, "codec_adapter_copy(): nothing processed in this call"); - /* we haven't produced anything in this period but we - * still have data in the local buffer to copy to sink - */ - if (audio_stream_get_avail_bytes(&local_buff->stream) >= mod->period_bytes) - goto copy_period; - - goto end; - } - - if (mod->deep_buff_bytes) { - if (mod->deep_buff_bytes >= audio_stream_get_avail_bytes(&local_buff->stream)) { - generate_zeroes(sink, mod->period_bytes); - goto end; + /* copy from all output local buffers to sink buffers */ + i = 0; + list_for_item(blist, &dev->bsink_list) { + struct comp_buffer *src_buffer; + struct list_item *_blist; + int j = 0; + + sink = container_of(blist, struct comp_buffer, source_list); + list_for_item(_blist, &mod->sink_buffer_list) { + src_buffer = container_of(_blist, struct comp_buffer, sink_list); + + if (i == j) { + module_copy_samples(dev, src_buffer, sink, + mod->output_buffers[i].size); + break; + } + j++; } - - comp_dbg(dev, "codec_adapter_copy(): deep buffering has ended after gathering %d bytes of processed data", - audio_stream_get_avail_bytes(&local_buff->stream)); - mod->deep_buff_bytes = 0; } - -copy_period: - comp_get_copy_limits_with_lock(local_buff, sink, &cl); - copy_bytes = cl.frames * cl.source_frame_bytes; - audio_stream_copy(&local_buff->stream, 0, - &sink->stream, 0, - copy_bytes / mod->stream_params.sample_container_bytes); - buffer_stream_writeback(sink, copy_bytes); - - comp_update_buffer_produce(sink, copy_bytes); - comp_update_buffer_consume(local_buff, copy_bytes); -end: - comp_dbg(dev, "codec_adapter_copy(): processed %d in this call", processed); out: - for (i = 0; i < mod->num_output_buffers; i++) { - bzero(mod->output_buffers[i].data, mod->output_buffer_size); + for (i = 0; i < mod->num_output_buffers; i++) mod->output_buffers[i].size = 0; - } for (i = 0; i < mod->num_input_buffers; i++) { bzero(mod->input_buffers[i].data, size); @@ -609,6 +645,7 @@ int codec_adapter_reset(struct comp_dev *dev) { int ret, i; struct processing_module *mod = comp_get_drvdata(dev); + struct list_item *blist; comp_dbg(dev, "codec_adapter_reset(): resetting"); @@ -618,10 +655,6 @@ int codec_adapter_reset(struct comp_dev *dev) ret); } - /* if module is not prepared, local_buffer won't be allocated */ - if (mod->local_buff) - buffer_zero(mod->local_buff); - for (i = 0; i < mod->num_output_buffers; i++) rfree(mod->output_buffers[i].data); @@ -635,6 +668,13 @@ int codec_adapter_reset(struct comp_dev *dev) mod->num_input_buffers = 0; mod->num_output_buffers = 0; + list_for_item(blist, &mod->sink_buffer_list) { + struct comp_buffer *buffer = container_of(blist, struct comp_buffer, + sink_list); + + buffer_zero(buffer); + } + comp_dbg(dev, "codec_adapter_reset(): done"); return comp_set_state(dev, COMP_TRIGGER_RESET); @@ -644,6 +684,7 @@ void codec_adapter_free(struct comp_dev *dev) { int ret; struct processing_module *mod = comp_get_drvdata(dev); + struct list_item *blist, *_blist; comp_dbg(dev, "codec_adapter_free(): start"); @@ -651,7 +692,14 @@ void codec_adapter_free(struct comp_dev *dev) if (ret) comp_err(dev, "codec_adapter_free(): error %d, codec free failed", ret); - buffer_free(mod->local_buff); + list_for_item_safe(blist, _blist, &mod->sink_buffer_list) { + struct comp_buffer *buffer = container_of(blist, struct comp_buffer, + sink_list); + + list_item_del(&buffer->sink_list); + buffer_free(buffer); + } + rfree(mod); rfree(dev); } diff --git a/src/include/sof/audio/codec_adapter/codec/generic.h b/src/include/sof/audio/codec_adapter/codec/generic.h index 2b01a4c7e211..a105ec71fa8b 100644 --- a/src/include/sof/audio/codec_adapter/codec/generic.h +++ b/src/include/sof/audio/codec_adapter/codec/generic.h @@ -273,8 +273,9 @@ struct module_data { /* codec_adapter private, runtime data */ struct processing_module { struct module_data priv; /**< module private data */ - struct comp_buffer *local_buff; struct sof_ipc_stream_params stream_params; + struct list_item sink_buffer_list; /* list of sink buffers to save produced output */ + /* * This is a temporary change in order to support the trace messages in the modules. This * will be removed once the trace API is updated.