diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-01-04 16:05:58 -0600 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-01-07 20:41:34 +0000 |
| commit | 584bfb872e470e8596e1d7b640e8f5bc6dcaa0fe (patch) | |
| tree | a7a92a2e9c08c4bf681dea5d9ada4d157a6ef84e | |
| parent | 6e93570b3690bfea6d635db24a78746b8877ff04 (diff) | |
| parent | ed79f2cc961d7d35fdbbafdd235c1436bcd74358 (diff) | |
| download | android_hardware_qcom_audio-cm-14.1_prerebase.tar.gz android_hardware_qcom_audio-cm-14.1_prerebase.tar.bz2 android_hardware_qcom_audio-cm-14.1_prerebase.zip | |
Merge tag 'android-7.1.1_r9' into cm-14.1cm-14.1_prerebase
Android 7.1.1 release 9
Change-Id: I012f600f44fb6729e9d42cc6ccb5c0aac657dda3
| -rw-r--r-- | post_proc/equalizer.c | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/post_proc/equalizer.c b/post_proc/equalizer.c index 7cff3488..1cd40d26 100644 --- a/post_proc/equalizer.c +++ b/post_proc/equalizer.c @@ -265,8 +265,12 @@ int equalizer_get_parameter(effect_context_t *context, effect_param_t *p, case EQ_PARAM_BAND_LEVEL: ALOGV("%s: EQ_PARAM_BAND_LEVEL", __func__); param2 = *param_tmp; - if (param2 >= NUM_EQ_BANDS) { + if (param2 < 0 || param2 >= NUM_EQ_BANDS) { p->status = -EINVAL; + if (param2 < 0) { + android_errorWriteLog(0x534e4554, "32438598"); + ALOGW("\tERROR EQ_PARAM_BAND_LEVEL band %d", param2); + } break; } *(int16_t *)value = (int16_t)equalizer_get_band_level(eq_ctxt, param2); @@ -275,8 +279,12 @@ int equalizer_get_parameter(effect_context_t *context, effect_param_t *p, case EQ_PARAM_CENTER_FREQ: ALOGV("%s: EQ_PARAM_CENTER_FREQ", __func__); param2 = *param_tmp; - if (param2 >= NUM_EQ_BANDS) { - p->status = -EINVAL; + if (param2 < 0 || param2 >= NUM_EQ_BANDS) { + p->status = -EINVAL; + if (param2 < 0) { + android_errorWriteLog(0x534e4554, "32436341"); + ALOGW("\tERROR EQ_PARAM_CENTER_FREQ band %d", param2); + } break; } *(int32_t *)value = equalizer_get_center_frequency(eq_ctxt, param2); @@ -285,8 +293,12 @@ int equalizer_get_parameter(effect_context_t *context, effect_param_t *p, case EQ_PARAM_BAND_FREQ_RANGE: ALOGV("%s: EQ_PARAM_BAND_FREQ_RANGE", __func__); param2 = *param_tmp; - if (param2 >= NUM_EQ_BANDS) { + if (param2 < 0 || param2 >= NUM_EQ_BANDS) { p->status = -EINVAL; + if (param2 < 0) { + android_errorWriteLog(0x534e4554, "32247948"); + ALOGW("\tERROR EQ_PARAM_BAND_FREQ_RANGE band %d", param2); + } break; } equalizer_get_band_freq_range(eq_ctxt, param2, (uint32_t *)value, @@ -313,9 +325,14 @@ int equalizer_get_parameter(effect_context_t *context, effect_param_t *p, ALOGV("%s: EQ_PARAM_GET_PRESET_NAME", __func__); param2 = *param_tmp; ALOGV("param2: %d", param2); - if (param2 >= equalizer_get_num_presets(eq_ctxt)) { - p->status = -EINVAL; - break; + if ((param2 < 0 && param2 != PRESET_CUSTOM) || + param2 >= equalizer_get_num_presets(eq_ctxt)) { + p->status = -EINVAL; + if (param2 < 0) { + android_errorWriteLog(0x534e4554, "32588016"); + ALOGW("\tERROR EQ_PARAM_GET_PRESET_NAME preset %d", param2); + } + break; } name = (char *)value; strlcpy(name, equalizer_get_preset_name(eq_ctxt, param2), p->vsize - 1); @@ -373,8 +390,12 @@ int equalizer_set_parameter(effect_context_t *context, effect_param_t *p, ALOGV("EQ_PARAM_BAND_LEVEL"); band = *param_tmp; level = (int32_t)(*(int16_t *)value); - if (band >= NUM_EQ_BANDS) { - p->status = -EINVAL; + if (band < 0 || band >= NUM_EQ_BANDS) { + p->status = -EINVAL; + if (band < 0) { + android_errorWriteLog(0x534e4554, "32585400"); + ALOGW("\tERROR EQ_PARAM_BAND_LEVEL band %d", band); + } break; } equalizer_set_band_level(eq_ctxt, band, level); |