int
-mm_player_get_foreach_present_supported_effect_type(MMHandleType hplayer, MMAudioEffectType effect_type, mmplayer_supported_audio_effect_cb foreach_cb, void *user_data)
+mm_player_get_foreach_present_supported_effect_type(MMHandleType hplayer, mm_audio_effect_type_e effect_type, mmplayer_supported_audio_effect_cb foreach_cb, void *user_data)
{
- mm_player_t *player = NULL;
+ mmplayer_t *player = NULL;
int result = MM_ERROR_NONE;
mm_sound_device_flags_e flags = MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG | MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG;
- MMSoundDeviceList_t device_list;
+ MMSoundDeviceList_t device_list = NULL;
MMSoundDevice_t device_h = NULL;
mm_sound_device_type_e device_type;
int i = 0;
/* get status if speaker is activated */
/* (1) get current device list */
- result = mm_sound_get_current_device_list(flags, &device_list);
-
- if (result) {
- LOGE("mm_sound_get_current_device_list() failed [%x]!!", result);
+ result = mm_sound_get_device_list(flags, &device_list);
+ if (result != MM_ERROR_NONE) {
+ LOGE("mm_sound_get_device_list() failed [0x%x]!!", result);
MMPLAYER_FLEAVE();
return result;
}
/* (2) get device handle of device list */
result = mm_sound_get_next_device(device_list, &device_h);
-
- if (result) {
- LOGE("mm_sound_get_next_device() failed [%x]!!", result);
- MMPLAYER_FLEAVE();
- return result;
+ if (result != MM_ERROR_NONE) {
+ LOGE("mm_sound_get_next_device() failed [0x%x]!!", result);
+ goto EXIT;
}
/* (3) get device type */
result = mm_sound_get_device_type(device_h, &device_type);
-
- if (result) {
- LOGE("mm_sound_get_device_type() failed [%x]!!", result);
- MMPLAYER_FLEAVE();
- return result;
+ if (result != MM_ERROR_NONE) {
+ LOGE("mm_sound_get_device_type() failed [0x%x]!!", result);
+ goto EXIT;
}
if (effect_type == MM_AUDIO_EFFECT_TYPE_PRESET) {
player->ini.audio_effect_preset_earphone_only_list[i])
continue;
- if (!foreach_cb(effect_type, i, user_data))
- goto CALLBACK_ERROR;
+ if (!foreach_cb(effect_type, i, user_data)) {
+ LOGE("foreach callback returned error");
+ result = MM_ERROR_PLAYER_INTERNAL;
+ goto EXIT;
+ }
}
}
} else if (effect_type == MM_AUDIO_EFFECT_TYPE_CUSTOM) {
player->ini.audio_effect_custom_earphone_only_list[i]) {
continue;
}
- if (!foreach_cb(effect_type, i, user_data))
- goto CALLBACK_ERROR;
+ if (!foreach_cb(effect_type, i, user_data)) {
+ LOGE("foreach callback returned error");
+ result = MM_ERROR_PLAYER_INTERNAL;
+ goto EXIT;
+ }
}
}
} else {
result = MM_ERROR_INVALID_ARGUMENT;
}
- MMPLAYER_FLEAVE();
-
- return result;
+EXIT:
+ if (device_list)
+ mm_sound_free_device_list(device_list);
-CALLBACK_ERROR:
- LOGE("foreach callback returned error");
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_INTERNAL;
+ return result;
}
-int
-__mmplayer_set_harmony_effect(mm_player_t *player, GstElement *audio_effect_element)
+static int
+__mmplayer_set_harmony_effect(mmplayer_t *player, GstElement *audio_effect_element)
{
gint *ext_effect_level_list = NULL;
int count = 1; /* start from 1, because of excepting eq index */
LOGD("pass custom extension level list to audio effect plugin");
ext_effect_level_list = player->audio_effect_info.custom_ext_level_for_plugin;
if (!ext_effect_level_list) {
- ext_effect_level_list = (gint*) malloc(sizeof(gint)*player->ini.audio_effect_custom_ext_num);
+ ext_effect_level_list = (gint *)malloc(sizeof(gint) * player->ini.audio_effect_custom_ext_num);
if (!ext_effect_level_list) {
LOGE("memory allocation for extension effect list failed");
return MM_ERROR_OUT_OF_MEMORY;
while (count < MM_AUDIO_EFFECT_CUSTOM_NUM) {
if (player->ini.audio_effect_custom_list[count]) {
- ext_effect_level_list[ext_level_index] = player->audio_effect_info.custom_ext_level[count-1];
+ ext_effect_level_list[ext_level_index] = player->audio_effect_info.custom_ext_level[count - 1];
ext_level_index++;
if (ext_level_index == player->ini.audio_effect_custom_ext_num)
break;
/* set custom-extension effects level list */
g_object_set(audio_effect_element, "custom-ext", ext_effect_level_list, NULL);
- } else
+ } else {
LOGW("no custom extension effect");
+ }
/* order action to audio effect plugin */
g_object_set(audio_effect_element, "filter-action", MM_AUDIO_EFFECT_TYPE_CUSTOM, NULL);
}
-gboolean
-__mmplayer_is_earphone_only_effect_type(mm_player_t *player, MMAudioEffectType effect_type, int effect)
+static gboolean
+__mmplayer_is_earphone_only_effect_type(mmplayer_t *player, mm_audio_effect_type_e effect_type, int effect)
{
gboolean result = FALSE;
int i = 0;
/* it starts from 1(except testing for EQ) */
if (player->ini.audio_effect_custom_earphone_only_list[i]) {
/* check if the earphone only custom effect was set */
- if (player->audio_effect_info.custom_ext_level[i-1]) {
+ if (player->audio_effect_info.custom_ext_level[i - 1]) {
LOGI("this custom effect(%d) is only available with earphone", i);
result = TRUE;
}
}
}
- } else
+ } else {
LOGE("invalid effect type(%d)", effect_type);
+ }
MMPLAYER_FLEAVE();
return result;
}
-int
-__mmplayer_audio_set_output_type(mm_player_t *player, MMAudioEffectType effect_type, int effect)
+static int
+__mmplayer_audio_set_output_type(mmplayer_t *player, mm_audio_effect_type_e effect_type, int effect)
{
GstElement *audio_effect_element = NULL;
mm_sound_device_flags_e flags = MM_SOUND_DEVICE_ALL_FLAG;
- MMSoundDeviceList_t device_list;
+ MMSoundDeviceList_t device_list = NULL;
MMSoundDevice_t device_h = NULL;
mm_sound_device_type_e device_type;
int output_type = 0;
audio_effect_element = player->pipeline->audiobin[MMPLAYER_A_FILTER].gst;
/* (1) get current device list */
- result = mm_sound_get_current_device_list(flags, &device_list);
-
- if (result) {
- LOGE("mm_sound_get_current_device_list() failed [%x]!!", result);
+ result = mm_sound_get_device_list(flags, &device_list);
+ if (result != MM_ERROR_NONE) {
+ LOGE("mm_sound_get_device_list() failed [0x%x]!!", result);
MMPLAYER_FLEAVE();
return result;
}
/* (2) get device handle of device list */
result = mm_sound_get_next_device(device_list, &device_h);
-
- if (result) {
- LOGE("mm_sound_get_next_device() failed [%x]!!", result);
- MMPLAYER_FLEAVE();
- return result;
+ if (result != MM_ERROR_NONE) {
+ LOGE("mm_sound_get_next_device() failed [0x%x]!!", result);
+ goto EXIT;
}
/* (3) get device type */
result = mm_sound_get_device_type(device_h, &device_type);
-
- if (result) {
- LOGE("mm_sound_get_device_type() failed [%x]!!", result);
- MMPLAYER_FLEAVE();
- return result;
+ if (result != MM_ERROR_NONE) {
+ LOGE("mm_sound_get_device_type() failed [0x%x]!!", result);
+ goto EXIT;
}
/* SPEAKER case */
if (MM_AUDIO_EFFECT_TYPE_SQUARE != effect_type) {
if (__mmplayer_is_earphone_only_effect_type(player, effect_type, effect)) {
LOGE("earphone is not equipped, this filter will not be applied");
- MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_INVALID_STATUS;
+ result = MM_ERROR_PLAYER_SOUND_EFFECT_INVALID_STATUS;
+ goto EXIT;
}
}
output_type = MM_AUDIO_EFFECT_OUTPUT_SPK;
/* set filter output mode */
g_object_set(audio_effect_element, "filter-output-mode", output_type, NULL);
+EXIT:
+ if (device_list)
+ mm_sound_free_device_list(device_list);
+
+ MMPLAYER_FLEAVE();
return result;
}
-gboolean
-_mmplayer_is_supported_effect_type(mm_player_t* player, MMAudioEffectType effect_type, int effect)
+static gboolean
+__mmplayer_is_supported_effect_type(mmplayer_t *player, mm_audio_effect_type_e effect_type, int effect)
{
gboolean result = TRUE;
mm_sound_device_flags_e flags = MM_SOUND_DEVICE_ALL_FLAG;
- MMSoundDeviceList_t device_list;
+ MMSoundDeviceList_t device_list = NULL;
MMSoundDevice_t device_h = NULL;
mm_sound_device_type_e device_type;
int ret = MM_ERROR_NONE;
/* get status if speaker is activated */
/* (1) get current device list */
- ret = mm_sound_get_current_device_list(flags, &device_list);
- if (ret) {
+ ret = mm_sound_get_device_list(flags, &device_list);
+ if (ret != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- LOGE("mm_sound_get_current_device_list() failed [%x]!!", ret);
+ LOGE("mm_sound_get_device_list() failed [0x%x]!!", ret);
return FALSE;
}
/* (2) get device handle of device list */
ret = mm_sound_get_next_device(device_list, &device_h);
-
- if (ret) {
- LOGE("mm_sound_get_next_device() failed [%x]!!", ret);
- MMPLAYER_FLEAVE();
- return FALSE;
+ if (ret != MM_ERROR_NONE) {
+ LOGE("mm_sound_get_next_device() failed [0x%x]!!", ret);
+ goto EXIT;
}
/* (3) get device type */
ret = mm_sound_get_device_type(device_h, &device_type);
-
- if (ret) {
- LOGE("mm_sound_get_device_type() failed [%x]!!", ret);
- MMPLAYER_FLEAVE();
- return FALSE;
+ if (ret != MM_ERROR_NONE) {
+ LOGE("mm_sound_get_device_type() failed [0x%x]!!", ret);
+ goto EXIT;
}
/* preset */
result = FALSE;
} else {
if (device_type == MM_SOUND_DEVICE_TYPE_BUILTIN_SPEAKER &&
- player->ini.audio_effect_custom_earphone_only_list[effect]) {
+ player->ini.audio_effect_custom_earphone_only_list[effect])
result = FALSE;
- }
}
}
} else if (effect_type == MM_AUDIO_EFFECT_TYPE_SQUARE) {
result = FALSE;
}
+EXIT:
+ if (device_list)
+ mm_sound_free_device_list(device_list);
MMPLAYER_FLEAVE();
-
return result;
}
+static int
+__mmplayer_audio_effect_check_condition(mmplayer_t *player, mm_audio_effect_type_e effect_type, int effect)
+{
+ int ret = MM_ERROR_NONE;
+ int enabled = 0;
+ bool available = false;
+
+ MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+
+ mm_attrs_get_int_by_name(player->attrs, MM_PLAYER_AUDIO_OFFLOAD, &enabled);
+ if (enabled) {
+ LOGW("audio offload is enabled.");
+ return MM_ERROR_PLAYER_SOUND_EFFECT_INVALID_STATUS;
+ }
+
+ ret = _mmplayer_is_audio_control_available((MMHandleType)player, MM_PLAYER_AUDIO_CONTROL_OPT_EFFECT, &available);
+ if (ret != MM_ERROR_NONE || !available)
+ return MM_ERROR_PLAYER_SOUND_EFFECT_INVALID_STATUS;
+
+ if (!__mmplayer_is_supported_effect_type(player, effect_type, effect)) {
+ LOGW("not supported effect filter %d %d", effect_type, effect);
+ return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ }
+
+ return MM_ERROR_NONE;
+}
+
int
-_mmplayer_audio_effect_custom_apply(mm_player_t *player)
+_mmplayer_audio_effect_custom_apply(mmplayer_t *player)
{
GstElement *audio_effect_element = NULL;
int result = MM_ERROR_NONE;
/* get status if speaker is activated */
result = __mmplayer_audio_set_output_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, 0);
-
if (result != MM_ERROR_NONE) {
LOGE("failed to set output mode");
MMPLAYER_FLEAVE();
result = __mmplayer_set_harmony_effect(player, audio_effect_element);
if (result) {
- LOGE("_set_harmony_effect() failed(%x)", result);
+ LOGE("_set_harmony_effect() failed(0x%x)", result);
MMPLAYER_FLEAVE();
return result;
}
}
- player->set_mode.rich_audio = TRUE;
+ player->set_mode.rich_audio = true;
MMPLAYER_FLEAVE();
}
int
-_mmplayer_audio_effect_custom_update_level(mm_player_t *player)
+_mmplayer_audio_effect_custom_update_level(mmplayer_t *player)
{
GstElement *audio_effect_element = NULL;
int result = MM_ERROR_NONE;
LOGD("updated custom-eq [%d] = %d", i, player->audio_effect_info.custom_eq_level[i]);
/* get custom ext effect */
-
g_object_get(audio_effect_element, "custom-ext", &custom_ext_effect_level_list, NULL);
while (count < MM_AUDIO_EFFECT_CUSTOM_NUM) {
if (player->ini.audio_effect_custom_list[count]) {
- player->audio_effect_info.custom_ext_level[count-1]
+ player->audio_effect_info.custom_ext_level[count - 1]
= custom_ext_effect_level_list[ext_level_index];
- LOGD("updated custom-ext [%d] = %d", count, player->audio_effect_info.custom_ext_level[count-1]);
+ LOGD("updated custom-ext [%d] = %d", count, player->audio_effect_info.custom_ext_level[count - 1]);
ext_level_index++;
}
count++;
}
-
MMPLAYER_FLEAVE();
return result;
}
mm_player_audio_effect_custom_clear_eq_all(MMHandleType hplayer)
{
int result = MM_ERROR_NONE;
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
MMPLAYER_FENTER();
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* clear EQ custom effect */
- memset(player->audio_effect_info.custom_eq_level, MM_AUDIO_EFFECT_CUSTOM_LEVEL_INIT, sizeof(int)*MM_AUDIO_EFFECT_EQ_BAND_NUM_MAX);
+ memset(player->audio_effect_info.custom_eq_level, MM_AUDIO_EFFECT_CUSTOM_LEVEL_INIT, sizeof(int) * MM_AUDIO_EFFECT_EQ_BAND_NUM_MAX);
LOGI("All the EQ bands clearing success");
{
int i;
int result = MM_ERROR_NONE;
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
MMPLAYER_FENTER();
return result;
}
-
int
-mm_player_is_supported_preset_effect_type(MMHandleType hplayer, MMAudioEffectPresetType effect)
+mm_player_is_available_preset_effect(MMHandleType hplayer, mm_audio_effect_preset_type_e effect, bool *available)
{
- mm_player_t* player = (mm_player_t*)hplayer;
- int result = MM_ERROR_NONE;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
MMPLAYER_FENTER();
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL(available, MM_ERROR_INVALID_ARGUMENT);
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_PRESET, effect))
- result = MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ if (__mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_PRESET, effect) == MM_ERROR_NONE)
+ *available = true;
+ else
+ *available = false;
MMPLAYER_FLEAVE();
- return result;
+ return MM_ERROR_NONE;
}
-
int
-mm_player_is_supported_custom_effect_type(MMHandleType hplayer, MMAudioEffectCustomType effect)
+mm_player_is_available_custom_effect(MMHandleType hplayer, mm_audio_effect_custom_type_e effect, bool *available)
{
- mm_player_t* player = (mm_player_t*)hplayer;
- int result = MM_ERROR_NONE;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
MMPLAYER_FENTER();
-
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL(available, MM_ERROR_INVALID_ARGUMENT);
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, effect))
- result = MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ if (__mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, effect) == MM_ERROR_NONE)
+ *available = true;
+ else
+ *available = false;
MMPLAYER_FLEAVE();
- return result;
+ return MM_ERROR_NONE;
}
int
mm_player_audio_effect_custom_apply(MMHandleType hplayer)
{
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
int result = MM_ERROR_NONE;
MMPLAYER_FENTER();
int
mm_player_audio_effect_bypass(MMHandleType hplayer)
{
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
int result = MM_ERROR_NONE;
GstElement *audio_effect_element = NULL;
}
-int
-_mmplayer_audio_effect_custom_set_level_ext(mm_player_t *player, MMAudioEffectCustomType custom_effect_type, int level)
+static int
+__mmplayer_audio_effect_custom_set_level_ext(mmplayer_t *player, mm_audio_effect_custom_type_e custom_effect_type, int level)
{
int effect_level_max = 0;
int effect_level_min = 0;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if EQ is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, custom_effect_type)) {
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, custom_effect_type);
+ if (result != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ return result;
}
while (count < MM_AUDIO_EFFECT_CUSTOM_NUM) {
LOGE("out of range, level(%d)", level);
result = MM_ERROR_INVALID_ARGUMENT;
} else {
- player->audio_effect_info.custom_ext_level[custom_effect_type-1] = level;
+ player->audio_effect_info.custom_ext_level[custom_effect_type - 1] = level;
LOGI("set ext[%d] = %d", custom_effect_type-1, level);
}
return result;
}
-
-int
-_mmplayer_audio_effect_custom_set_level_eq(mm_player_t *player, int index, int level)
+static int
+__mmplayer_audio_effect_custom_set_level_eq(mmplayer_t *player, int index, int level)
{
gint eq_level_max = 0;
gint eq_level_min = 0;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if EQ is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ)) {
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ);
+ if (result != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ return result;
}
if (index < 0 || index > player->ini.audio_effect_custom_eq_band_num - 1) {
/* NOTE : parameter eq_index is only used for _set_eq_level() */
int
-mm_player_audio_effect_custom_set_level(MMHandleType hplayer, MMAudioEffectCustomType effect_custom_type, int eq_index, int level)
+mm_player_audio_effect_custom_set_level(MMHandleType hplayer, mm_audio_effect_custom_type_e effect_custom_type, int eq_index, int level)
{
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
int result = MM_ERROR_NONE;
MMPLAYER_FENTER();
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if this effect type is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, effect_custom_type)) {
- result = MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, effect_custom_type);
+ if (result != MM_ERROR_NONE) {
+ MMPLAYER_FLEAVE();
+ return result;
+ }
+
+ if (effect_custom_type == MM_AUDIO_EFFECT_CUSTOM_EQ) {
+ result = __mmplayer_audio_effect_custom_set_level_eq(player, eq_index, level);
+ } else if (effect_custom_type > MM_AUDIO_EFFECT_CUSTOM_EQ && effect_custom_type < MM_AUDIO_EFFECT_CUSTOM_NUM) {
+ result = __mmplayer_audio_effect_custom_set_level_ext(player, effect_custom_type, level);
} else {
- if (effect_custom_type == MM_AUDIO_EFFECT_CUSTOM_EQ) {
- result = _mmplayer_audio_effect_custom_set_level_eq(player, eq_index, level);
- } else if (effect_custom_type > MM_AUDIO_EFFECT_CUSTOM_EQ && effect_custom_type < MM_AUDIO_EFFECT_CUSTOM_NUM) {
- result = _mmplayer_audio_effect_custom_set_level_ext(player, effect_custom_type, level);
- } else {
- LOGE("out of range, effect type(%d)", effect_custom_type);
- result = MM_ERROR_INVALID_ARGUMENT;
- }
+ LOGE("out of range, effect type(%d)", effect_custom_type);
+ result = MM_ERROR_INVALID_ARGUMENT;
}
MMPLAYER_FLEAVE();
int
mm_player_audio_effect_custom_get_eq_bands_number(MMHandleType hplayer, int *bands)
{
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
int result = MM_ERROR_NONE;
MMPLAYER_FENTER();
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if EQ is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ)) {
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ);
+ if (result != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ return result;
}
*bands = player->ini.audio_effect_custom_eq_band_num;
int
mm_player_audio_effect_custom_get_eq_bands_width(MMHandleType hplayer, int band_idx, int *width)
{
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
int result = MM_ERROR_NONE;
unsigned int eq_num = 0;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if EQ is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ)) {
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ);
+ if (result != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ return result;
}
eq_num = player->ini.audio_effect_custom_eq_band_num;
- if (band_idx < 0 || band_idx > eq_num-1) {
+ if (band_idx < 0 || band_idx > eq_num - 1) {
LOGE("out of range, invalid band_idx(%d)", band_idx);
result = MM_ERROR_INVALID_ARGUMENT;
} else {
int
mm_player_audio_effect_custom_get_eq_bands_freq(MMHandleType hplayer, int band_idx, int *freq)
{
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
int result = MM_ERROR_NONE;
unsigned int eq_num = 0;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if EQ is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ)) {
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ);
+ if (result != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ return result;
}
eq_num = player->ini.audio_effect_custom_eq_band_num;
- if (band_idx < 0 || band_idx > eq_num-1) {
+ if (band_idx < 0 || band_idx > eq_num - 1) {
LOGE("out of range, invalid band_idx(%d)", band_idx);
result = MM_ERROR_INVALID_ARGUMENT;
} else {
int
-mm_player_audio_effect_custom_get_level(MMHandleType hplayer, MMAudioEffectCustomType type, int eq_index, int *level)
+mm_player_audio_effect_custom_get_level(MMHandleType hplayer, mm_audio_effect_custom_type_e type, int eq_index, int *level)
{
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
int result = MM_ERROR_NONE;
MMPLAYER_FENTER();
MMPLAYER_RETURN_VAL_IF_FAIL(level, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if this effect type is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, type)) {
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, type);
+ if (result != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ return result;
}
if (type == MM_AUDIO_EFFECT_CUSTOM_EQ) {
LOGD("EQ index = %d, level = %d", eq_index, *level);
}
} else if (type > MM_AUDIO_EFFECT_CUSTOM_EQ && type < MM_AUDIO_EFFECT_CUSTOM_NUM) {
- *level = player->audio_effect_info.custom_ext_level[type-1];
+ *level = player->audio_effect_info.custom_ext_level[type - 1];
LOGD("extension effect index = %d, level = %d", type, *level);
} else {
LOGE("out of range, type(%d)", type);
int
-mm_player_audio_effect_custom_get_level_range(MMHandleType hplayer, MMAudioEffectCustomType type, int *min, int *max)
+mm_player_audio_effect_custom_get_level_range(MMHandleType hplayer, mm_audio_effect_custom_type_e type, int *min, int *max)
{
- mm_player_t* player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
int result = MM_ERROR_NONE;
int count = 1; /* start from 1, because of excepting eq index */
int ext_level_index = 1; /* start from 1, because of excepting eq index */
MMPLAYER_RETURN_VAL_IF_FAIL(max, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if this effect type is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, type)) {
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, type);
+ if (result != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ return result;
}
if (type == MM_AUDIO_EFFECT_CUSTOM_EQ) {
int
mm_player_audio_effect_custom_set_level_eq_from_list(MMHandleType hplayer, int *level_list, int size)
{
- mm_player_t *player = (mm_player_t*)hplayer;
+ mmplayer_t *player = (mmplayer_t *)hplayer;
gint i = 0;
gint eq_level_min = 0;
gint eq_level_max = 0;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* check if EQ is supported */
- if (!_mmplayer_is_supported_effect_type(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ)) {
+ result = __mmplayer_audio_effect_check_condition(player, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_CUSTOM_EQ);
+ if (result != MM_ERROR_NONE) {
MMPLAYER_FLEAVE();
- return MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER;
+ return result;
}
if (size != player->ini.audio_effect_custom_eq_band_num) {
projects / platform / core / multimedia / libmm-player.git / blobdiff