OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

codec_adapter: Remove processing loop 

Calling codec_process() multiple times in a loop limits the minimum
pipeline period we can choose.

For example with AAC one codec_process() can take up to 0.7ms which
means that we cannot reliable set pipeline period to 1ms on i.MX where
DSP has only 1 core.

In order to avoid this and to simplify the code remove the processing
loop hence each codec_adapter_copy() call will call exactly once the
codec_process() function.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
This commit is contained in:
Daniel Baluta 2021-05-04 11:29:07 +03:00 committed by Liam Girdwood
parent 234faf1879
commit cdd64aa9f6
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/audio/codec_adapter/codec_adapter.c
View File

@ -401,49 +401,48 @@ int codec_adapter_copy(struct comp_dev *dev)
comp_update_buffer_consume(source, codec->cpd.consumed);
}
while (bytes_to_process) {
/* Proceed only if we have enough data to fill the lib buffer
* completely. If you don't fill whole buffer
* the lib won't process it.
*/
if (bytes_to_process < codec_buff_size) {
comp_dbg(dev, "codec_adapter_copy(): source has less data than codec buffer size - processing terminated.");
break;
}
/* Process only we have enough free data in the local
* buffer. If we don't have enough free space process()
* will override the data in the local buffer
*/
if (local_buff->stream.free < get_output_bytes(dev))
goto db_verify;
buffer_invalidate(source, codec_buff_size);
codec_adapter_copy_from_source_to_lib(&source->stream, &codec->cpd,
codec_buff_size);
codec->cpd.avail = codec_buff_size;
ret = codec_process(dev);
if (ret) {
comp_err(dev, "codec_adapter_copy() error %x: lib processing failed",
ret);
break;
} else if (codec->cpd.produced == 0) {
/* skipping as lib has not produced anything */
comp_err(dev, "codec_adapter_copy() error %x: lib hasn't processed anything",
ret);
break;
}
codec_adapter_copy_from_lib_to_sink(&codec->cpd, &local_buff->stream,
codec->cpd.produced);
bytes_to_process -= codec->cpd.consumed;
processed += codec->cpd.consumed;
produced += codec->cpd.produced;
audio_stream_produce(&local_buff->stream, codec->cpd.produced);
comp_update_buffer_consume(source, codec->cpd.consumed);
/* Proceed only if we have enough data to fill the lib buffer
* completely. If you don't fill whole buffer
* the lib won't process it.
*/
if (bytes_to_process < codec_buff_size) {
comp_dbg(dev, "codec_adapter_copy(): source has less data than codec buffer size - processing terminated.");
goto db_verify;
}
/* Process only we have enough free data in the local
* buffer. If we don't have enough free space process()
* will override the data in the local buffer
*/
if (local_buff->stream.free < get_output_bytes(dev))
goto db_verify;
buffer_invalidate(source, codec_buff_size);
codec_adapter_copy_from_source_to_lib(&source->stream, &codec->cpd,
codec_buff_size);
codec->cpd.avail = codec_buff_size;
ret = codec_process(dev);
if (ret) {
comp_err(dev, "codec_adapter_copy() error %x: lib processing failed",
ret);
goto db_verify;
} else if (codec->cpd.produced == 0) {
/* skipping as lib has not produced anything */
comp_err(dev, "codec_adapter_copy() error %x: lib hasn't processed anything",
ret);
goto db_verify;
}
codec_adapter_copy_from_lib_to_sink(&codec->cpd, &local_buff->stream,
codec->cpd.produced);
bytes_to_process -= codec->cpd.consumed;
processed += codec->cpd.consumed;
produced += codec->cpd.produced;
audio_stream_produce(&local_buff->stream, codec->cpd.produced);
comp_update_buffer_consume(source, codec->cpd.consumed);
db_verify:
if (!produced && !cd->deep_buff_bytes) {
comp_dbg(dev, "codec_adapter_copy(): nothing processed in this call");
/* we haven't produced anything in this period but we
@ -455,7 +454,6 @@ int codec_adapter_copy(struct comp_dev *dev)
goto end;
}
db_verify:
if (cd->deep_buff_bytes) {
if (cd->deep_buff_bytes >= audio_stream_get_avail_bytes(&local_buff->stream)) {
generate_zeroes(sink, cd->period_bytes);