From fb838de4137b72a57d08e933f0cb78a09b14fe3e Mon Sep 17 00:00:00 2001 From: Karol Trzcinski Date: Fri, 16 Oct 2020 15:08:20 +0200 Subject: [PATCH] buffer: Move buffer_params_match() implementation to buffer.c file Assertions don't show proper location for functions implemented in header file. Before changes, example location of this assert was: Location: src/audio/pipeline.c:303 Signed-off-by: Karol Trzcinski --- src/audio/buffer.c | 20 ++++++++++++++++ src/include/sof/audio/buffer.h | 24 +++---------------- .../src/audio/pipeline/pipeline_mocks.c | 9 +++++++ 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/audio/buffer.c b/src/audio/buffer.c index 42805ee3c..47b6e64b0 100644 --- a/src/audio/buffer.c +++ b/src/audio/buffer.c @@ -131,6 +131,26 @@ int buffer_set_size(struct comp_buffer *buffer, uint32_t size) return 0; } +bool buffer_params_match(struct comp_buffer *buffer, struct sof_ipc_stream_params *params, + uint32_t flag) +{ + assert(params && buffer); + + if ((flag & BUFF_PARAMS_FRAME_FMT) && + buffer->stream.frame_fmt != params->frame_fmt) + return false; + + if ((flag & BUFF_PARAMS_RATE) && + buffer->stream.rate != params->rate) + return false; + + if ((flag & BUFF_PARAMS_CHANNELS) && + buffer->stream.channels != params->channels) + return false; + + return true; +} + /* free component in the pipeline */ void buffer_free(struct comp_buffer *buffer) { diff --git a/src/include/sof/audio/buffer.h b/src/include/sof/audio/buffer.h index 5339dbcc7..d70f0d1f1 100644 --- a/src/include/sof/audio/buffer.h +++ b/src/include/sof/audio/buffer.h @@ -165,6 +165,9 @@ void comp_update_buffer_produce(struct comp_buffer *buffer, uint32_t bytes); /* called by a component after consuming data from this buffer */ void comp_update_buffer_consume(struct comp_buffer *buffer, uint32_t bytes); +bool buffer_params_match(struct comp_buffer *buffer, struct sof_ipc_stream_params *params, + uint32_t flag); + static inline void buffer_invalidate(struct comp_buffer *buffer, uint32_t bytes) { if (!buffer->inter_core) @@ -296,25 +299,4 @@ static inline int buffer_set_params(struct comp_buffer *buffer, return 0; } -static inline bool buffer_params_match(struct comp_buffer *buffer, - struct sof_ipc_stream_params *params, - uint32_t flag) -{ - assert(params && buffer); - - if ((flag & BUFF_PARAMS_FRAME_FMT) && - buffer->stream.frame_fmt != params->frame_fmt) - return false; - - if ((flag & BUFF_PARAMS_RATE) && - buffer->stream.rate != params->rate) - return false; - - if ((flag & BUFF_PARAMS_CHANNELS) && - buffer->stream.channels != params->channels) - return false; - - return true; -} - #endif /* __SOF_AUDIO_BUFFER_H__ */ diff --git a/test/cmocka/src/audio/pipeline/pipeline_mocks.c b/test/cmocka/src/audio/pipeline/pipeline_mocks.c index 029b75080..6e1fabaab 100644 --- a/test/cmocka/src/audio/pipeline/pipeline_mocks.c +++ b/test/cmocka/src/audio/pipeline/pipeline_mocks.c @@ -130,3 +130,12 @@ int comp_verify_params(struct comp_dev *dev, uint32_t flag, (void)params; return 0; } + +bool buffer_params_match(struct comp_buffer *buffer, struct sof_ipc_stream_params *params, + uint32_t flag) +{ + (void)buffer; + (void)params; + (void)flag; + return 0; +}