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

codec_adapter: rename codec_allocate/free_memory() 

to module_allocate/free_memory(). No functional change.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2022-01-07 18:03:12 -08:00 committed by Daniel Baluta
parent 032cddc854
commit 77deb27e33
5 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/audio/codec_adapter/codec/cadence.c
View File

@ -104,7 +104,7 @@ int cadence_codec_init(struct comp_dev *dev)
comp_dbg(dev, "cadence_codec_init() start");
cd = codec_allocate_memory(dev, sizeof(struct cadence_codec_data), 0);
cd = module_allocate_memory(dev, sizeof(struct cadence_codec_data), 0);
if (!cd) {
comp_err(dev, "cadence_codec_init(): failed to allocate memory for cadence codec data");
return -ENOMEM;
@ -137,7 +137,7 @@ int cadence_codec_init(struct comp_dev *dev)
if (ret != LIB_NO_ERROR) {
comp_err(dev, "cadence_codec_init() error %x: failed to get lib name",
ret);
codec_free_memory(dev, cd);
module_free_memory(dev, cd);
goto out;
}
/* Get codec object size */
@ -145,14 +145,14 @@ int cadence_codec_init(struct comp_dev *dev)
if (ret != LIB_NO_ERROR) {
comp_err(dev, "cadence_codec_init() error %x: failed to get lib object size",
ret);
codec_free_memory(dev, cd);
module_free_memory(dev, cd);
goto out;
}
/* Allocate space for codec object */
cd->self = codec_allocate_memory(dev, obj_size, 0);
cd->self = module_allocate_memory(dev, obj_size, 0);
if (!cd->self) {
comp_err(dev, "cadence_codec_init(): failed to allocate space for lib object");
codec_free_memory(dev, cd);
module_free_memory(dev, cd);
goto out;
} else {
comp_dbg(dev, "cadence_codec_init(): allocated %d bytes for lib object",
@ -277,7 +277,7 @@ static int init_memory_tables(struct comp_dev *dev)
goto err;
}
/* Allocate memory for this type, taking alignment into account */
ptr = codec_allocate_memory(dev, mem_size, mem_alignment);
ptr = module_allocate_memory(dev, mem_size, mem_alignment);
if (!ptr) {
comp_err(dev, "init_memory_tables() error %x: failed to allocate memory for %d",
ret, mem_type);
@ -321,13 +321,13 @@ static int init_memory_tables(struct comp_dev *dev)
return 0;
err:
if (scratch)
codec_free_memory(dev, scratch);
module_free_memory(dev, scratch);
if (persistent)
codec_free_memory(dev, persistent);
module_free_memory(dev, persistent);
if (codec->mpd.in_buff)
codec_free_memory(dev, codec->mpd.in_buff);
module_free_memory(dev, codec->mpd.in_buff);
if (codec->mpd.out_buff)
codec_free_memory(dev, codec->mpd.out_buff);
module_free_memory(dev, codec->mpd.out_buff);
return ret;
}
@ -436,7 +436,7 @@ int cadence_codec_prepare(struct comp_dev *dev)
goto err;
}
cd->mem_tabs = codec_allocate_memory(dev, mem_tabs_size, 4);
cd->mem_tabs = module_allocate_memory(dev, mem_tabs_size, 4);
if (!cd->mem_tabs) {
comp_err(dev, "cadence_codec_prepare() error: failed to allocate space for memtabs");
ret = -ENOMEM;
@ -482,7 +482,7 @@ int cadence_codec_prepare(struct comp_dev *dev)
comp_dbg(dev, "cadence_codec_prepare() done");
return 0;
free:
codec_free_memory(dev, cd->mem_tabs);
module_free_memory(dev, cd->mem_tabs);
err:
return ret;
}

2
src/audio/codec_adapter/codec/dts.c
View File

@ -24,7 +24,7 @@ static void *dts_effect_allocate_codec_memory(void *dev_void, unsigned int lengt
comp_dbg(dev, "dts_effect_allocate_codec_memory() start");
pMem = codec_allocate_memory(dev, (uint32_t)length, (uint32_t)alignment);
pMem = module_allocate_memory(dev, (uint32_t)length, (uint32_t)alignment);
if (pMem == NULL)
comp_err(dev,

15
src/audio/codec_adapter/codec/generic.c
View File

@ -122,15 +122,14 @@ out:
return ret;
}
void *codec_allocate_memory(struct comp_dev *dev, uint32_t size,
uint32_t alignment)
void *module_allocate_memory(struct comp_dev *dev, uint32_t size, uint32_t alignment)
{
struct module_memory *container;
void *ptr;
struct processing_module *mod = comp_get_drvdata(dev);
if (!size) {
comp_err(dev, "codec_allocate_memory: requested allocation of 0 bytes.");
comp_err(dev, "module_allocate_memory: requested allocation of 0 bytes.");
return NULL;
}
@ -138,18 +137,18 @@ void *codec_allocate_memory(struct comp_dev *dev, uint32_t size,
container = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
sizeof(struct module_memory));
if (!container) {
comp_err(dev, "codec_allocate_memory: failed to allocate memory container.");
comp_err(dev, "module_allocate_memory: failed to allocate memory container.");
return NULL;
}
/* Allocate memory for codec */
/* Allocate memory for module */
if (alignment)
ptr = rballoc_align(0, SOF_MEM_CAPS_RAM, size, alignment);
else
ptr = rballoc(0, SOF_MEM_CAPS_RAM, size);
if (!ptr) {
comp_err(dev, "codec_allocate_memory: failed to allocate memory for codec %x.",
comp_err(dev, "module_allocate_memory: failed to allocate memory for module %x.",
mod->ca_config.codec_id);
return NULL;
}
@ -160,7 +159,7 @@ void *codec_allocate_memory(struct comp_dev *dev, uint32_t size,
return ptr;
}
int codec_free_memory(struct comp_dev *dev, void *ptr)
int module_free_memory(struct comp_dev *dev, void *ptr)
{
struct processing_module *mod = comp_get_drvdata(dev);
struct module_memory *mem;
@ -181,7 +180,7 @@ int codec_free_memory(struct comp_dev *dev, void *ptr)
}
}
comp_err(dev, "codec_free_memory: error: could not find memory pointed by %p",
comp_err(dev, "module_free_memory: error: could not find memory pointed by %p",
(uint32_t)ptr);
return -EINVAL;

20
src/audio/codec_adapter/codec/waves.c
View File

@ -199,7 +199,7 @@ static int waves_effect_allocate(struct comp_dev *dev)
return -EINVAL;
}
waves_codec->effect = (MaxxEffect_t *)codec_allocate_memory(dev,
waves_codec->effect = (MaxxEffect_t *)module_allocate_memory(dev,
waves_codec->effect_size, 16);
if (!waves_codec->effect) {
@ -375,7 +375,7 @@ static int waves_effect_buffers(struct comp_dev *dev)
goto err;
}
response = codec_allocate_memory(dev, waves_codec->response_max_bytes, 16);
response = module_allocate_memory(dev, waves_codec->response_max_bytes, 16);
if (!response) {
comp_err(dev, "waves_effect_buffers() failed to allocate %d bytes for response",
waves_codec->response_max_bytes);
@ -383,7 +383,7 @@ static int waves_effect_buffers(struct comp_dev *dev)
goto err;
}
i_buffer = codec_allocate_memory(dev, waves_codec->buffer_bytes, 16);
i_buffer = module_allocate_memory(dev, waves_codec->buffer_bytes, 16);
if (!i_buffer) {
comp_err(dev, "waves_effect_buffers() failed to allocate %d bytes for i_buffer",
waves_codec->buffer_bytes);
@ -391,7 +391,7 @@ static int waves_effect_buffers(struct comp_dev *dev)
goto err;
}
o_buffer = codec_allocate_memory(dev, waves_codec->buffer_bytes, 16);
o_buffer = module_allocate_memory(dev, waves_codec->buffer_bytes, 16);
if (!o_buffer) {
comp_err(dev, "waves_effect_buffers() failed to allocate %d bytes for o_buffer",
waves_codec->buffer_bytes);
@ -416,11 +416,11 @@ static int waves_effect_buffers(struct comp_dev *dev)
err:
if (i_buffer)
codec_free_memory(dev, i_buffer);
module_free_memory(dev, i_buffer);
if (o_buffer)
codec_free_memory(dev, o_buffer);
module_free_memory(dev, o_buffer);
if (response)
codec_free_memory(dev, response);
module_free_memory(dev, response);
return ret;
}
@ -606,7 +606,7 @@ int waves_codec_init(struct comp_dev *dev)
comp_dbg(dev, "waves_codec_init() start");
waves_codec = codec_allocate_memory(dev, sizeof(struct waves_codec_data), 16);
waves_codec = module_allocate_memory(dev, sizeof(struct waves_codec_data), 16);
if (!waves_codec) {
comp_err(dev, "waves_codec_init() failed to allocate %d bytes for waves_codec_data",
sizeof(struct waves_codec_data));
@ -617,7 +617,7 @@ int waves_codec_init(struct comp_dev *dev)
ret = waves_effect_allocate(dev);
if (ret) {
codec_free_memory(dev, waves_codec);
module_free_memory(dev, waves_codec);
codec->private = NULL;
}
}
@ -759,7 +759,7 @@ int waves_codec_reset(struct comp_dev *dev)
int waves_codec_free(struct comp_dev *dev)
{
/* codec is using codec_adapter method codec_allocate_memory for all allocations
/* codec is using codec_adapter method module_allocate_memory for all allocations
* codec_adapter will free it all on component free call
* nothing to do here
*/

5
src/include/sof/audio/codec_adapter/codec/generic.h
View File

@ -223,9 +223,8 @@ struct processing_module {
/*****************************************************************************/
int module_load_config(struct comp_dev *dev, void *cfg, size_t size, enum module_cfg_type type);
int module_init(struct comp_dev *dev, struct module_interface *interface);
void *codec_allocate_memory(struct comp_dev *dev, uint32_t size,
uint32_t alignment);
int codec_free_memory(struct comp_dev *dev, void *ptr);
void *module_allocate_memory(struct comp_dev *dev, uint32_t size, uint32_t alignment);
int module_free_memory(struct comp_dev *dev, void *ptr);
void codec_free_all_memory(struct comp_dev *dev);
int module_prepare(struct comp_dev *dev);
int module_process(struct comp_dev *dev);