From: Jaechul Lee Date: Tue, 20 Jun 2023 04:59:28 +0000 (+0900) Subject: Fix NO_CAST.INTEGER_OVERFLOW X-Git-Tag: accepted/tizen/unified/20230621.023257^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1114d227d036ef04202bbe6ac6d8c641feaf1f1a;p=platform%2Fcore%2Fmultimedia%2Flibaudio-effect.git Fix NO_CAST.INTEGER_OVERFLOW [Version] 0.0.3 [Issue Type] SVACE Change-Id: I8ac8f4d419c1e2500737c336290a428ecd558976 Signed-off-by: Jaechul Lee --- diff --git a/packaging/libaudio-effect.spec b/packaging/libaudio-effect.spec index 193618c..06f2c61 100644 --- a/packaging/libaudio-effect.spec +++ b/packaging/libaudio-effect.spec @@ -1,6 +1,6 @@ Name: libaudio-effect Summary: audio effect library -Version: 0.0.2 +Version: 0.0.3 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/src/audio_effect_util.c b/src/audio_effect_util.c index 11714bf..ccf71f2 100644 --- a/src/audio_effect_util.c +++ b/src/audio_effect_util.c @@ -21,25 +21,26 @@ #define CLAMP(value, min, max) (value < min ? min : (value > max ? max : value)) -static struct sample_size_table { - int sample_size; - audio_effect_format_e format; -} sample_size_table[] = { - { 1, AUDIO_EFFECT_FORMAT_S8 }, - { 2, AUDIO_EFFECT_FORMAT_S16 }, - { 3, AUDIO_EFFECT_FORMAT_S24 }, - { 4, AUDIO_EFFECT_FORMAT_S32 }, - { 4, AUDIO_EFFECT_FORMAT_FLOAT }, +static size_t sample_size_table[] = { + [AUDIO_EFFECT_FORMAT_S8] = 1, + [AUDIO_EFFECT_FORMAT_S16] = 2, + [AUDIO_EFFECT_FORMAT_S24] = 3, + [AUDIO_EFFECT_FORMAT_S32] = 4, + [AUDIO_EFFECT_FORMAT_FLOAT] = 4, }; size_t audio_effect_util_get_sample_size(audio_effect_format_e format) { - return sample_size_table[format].sample_size; + assert(format < AUDIO_EFFECT_FORMAT_MAX); + + return sample_size_table[format]; } size_t audio_effect_util_get_frame_size(audio_effect_format_e format, int channels) { - return sample_size_table[format].sample_size * channels; + assert(format < AUDIO_EFFECT_FORMAT_MAX); + + return sample_size_table[format] * channels; } size_t audio_effect_util_msec_to_frame(size_t msec, int rate) @@ -49,7 +50,7 @@ size_t audio_effect_util_msec_to_frame(size_t msec, int rate) size_t audio_effect_util_msec_to_bytes(size_t msec, int rate, int channels, audio_effect_format_e format) { - return ((msec * rate) / 1000) * channels * sample_size_table[format].sample_size; + return ((msec * rate) / 1000) * channels * sample_size_table[format]; } void audio_effect_util_convert_s16le_to_float(size_t n, const short *a, float *b)