diff options
author | Eric Laurent <elaurent@google.com> | 2011-12-16 15:30:36 -0800 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2011-12-19 17:08:31 -0800 |
commit | 3d5188bd6abe55898f10a0edf3c05aff8aa2ef67 (patch) | |
tree | 7dd2eba6d9a65d42628ffe55d12e640776285035 /media/libeffects/visualizer/EffectVisualizer.cpp | |
parent | 42968939dfce0954d6540011199045ec4ed7de80 (diff) | |
download | frameworks_av-3d5188bd6abe55898f10a0edf3c05aff8aa2ef67.zip frameworks_av-3d5188bd6abe55898f10a0edf3c05aff8aa2ef67.tar.gz frameworks_av-3d5188bd6abe55898f10a0edf3c05aff8aa2ef67.tar.bz2 |
audio effects: rename configure command
Renamed audio effect library interface command for audio format
configuration from EFFECT_CMD_CONFIGURE to EFFECT_CMD_SET_CONFIG.
This makes the naming more consistent with other exixsting commands
and allow adding a new command to get the configuration (EFFECT_CMD_GET_CONFIG).
Same change for reverse channel configuration renamed from
EFFECT_CMD_CONFIGURE_REVERSE to EFFECT_CMD_SET_CONFIG_REVERSE.
Implemented EFFECT_CMD_GET_CONFIG in exisitng effect libraries.
Change-Id: Ia7b1c620f13797fe5aceb3b0b4acbacce09fb067
Diffstat (limited to 'media/libeffects/visualizer/EffectVisualizer.cpp')
-rw-r--r-- | media/libeffects/visualizer/EffectVisualizer.cpp | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp index e9b8042..b2a7a35 100644 --- a/media/libeffects/visualizer/EffectVisualizer.cpp +++ b/media/libeffects/visualizer/EffectVisualizer.cpp @@ -78,7 +78,7 @@ void Visualizer_reset(VisualizerContext *pContext) } //---------------------------------------------------------------------------- -// Visualizer_configure() +// Visualizer_setConfig() //---------------------------------------------------------------------------- // Purpose: Set input and output audio configuration. // @@ -91,9 +91,9 @@ void Visualizer_reset(VisualizerContext *pContext) // //---------------------------------------------------------------------------- -int Visualizer_configure(VisualizerContext *pContext, effect_config_t *pConfig) +int Visualizer_setConfig(VisualizerContext *pContext, effect_config_t *pConfig) { - ALOGV("Visualizer_configure start"); + ALOGV("Visualizer_setConfig start"); if (pConfig->inputCfg.samplingRate != pConfig->outputCfg.samplingRate) return -EINVAL; if (pConfig->inputCfg.channels != pConfig->outputCfg.channels) return -EINVAL; @@ -112,6 +112,26 @@ int Visualizer_configure(VisualizerContext *pContext, effect_config_t *pConfig) //---------------------------------------------------------------------------- +// Visualizer_getConfig() +//---------------------------------------------------------------------------- +// Purpose: Get input and output audio configuration. +// +// Inputs: +// pContext: effect engine context +// pConfig: pointer to effect_config_t structure holding input and output +// configuration parameters +// +// Outputs: +// +//---------------------------------------------------------------------------- + +void Visualizer_getConfig(VisualizerContext *pContext, effect_config_t *pConfig) +{ + memcpy(pConfig, &pContext->mConfig, sizeof(effect_config_t)); +} + + +//---------------------------------------------------------------------------- // Visualizer_init() //---------------------------------------------------------------------------- // Purpose: Initialize engine with default configuration. @@ -144,7 +164,7 @@ int Visualizer_init(VisualizerContext *pContext) pContext->mCaptureSize = VISUALIZER_CAPTURE_SIZE_MAX; - Visualizer_configure(pContext, &pContext->mConfig); + Visualizer_setConfig(pContext, &pContext->mConfig); return 0; } @@ -337,14 +357,21 @@ int Visualizer_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, } *(int *) pReplyData = Visualizer_init(pContext); break; - case EFFECT_CMD_CONFIGURE: + case EFFECT_CMD_SET_CONFIG: if (pCmdData == NULL || cmdSize != sizeof(effect_config_t) || pReplyData == NULL || *replySize != sizeof(int)) { return -EINVAL; } - *(int *) pReplyData = Visualizer_configure(pContext, + *(int *) pReplyData = Visualizer_setConfig(pContext, (effect_config_t *) pCmdData); break; + case EFFECT_CMD_GET_CONFIG: + if (pReplyData == NULL || + *replySize != sizeof(effect_config_t)) { + return -EINVAL; + } + Visualizer_getConfig(pContext, (effect_config_t *)pReplyData); + break; case EFFECT_CMD_RESET: Visualizer_reset(pContext); break; |