diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-07-11 05:04:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-10 21:52:20 +0000 |
| commit | 6fe316102a17b644ea2525a393e1f2ea4b299f8d (patch) | |
| tree | ab0e1077c41e4f565db36a8a9e4c65960a54a544 /include/system | |
| parent | 2c7cfc10f5d869a52038198aed6bd6e8e6fc9a54 (diff) | |
| parent | f7e5aeadb71cf786bea6a9ee8c86069e939e8267 (diff) | |
| download | system_core-6fe316102a17b644ea2525a393e1f2ea4b299f8d.zip system_core-6fe316102a17b644ea2525a393e1f2ea4b299f8d.tar.gz system_core-6fe316102a17b644ea2525a393e1f2ea4b299f8d.tar.bz2 | |
Merge "Fix size of "values" fields of audio_gain_config."
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/audio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index 8530efa..5967b24 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -645,10 +645,10 @@ struct audio_gain_config { audio_gain_mode_t mode; /* mode requested for this command */ audio_channel_mask_t channel_mask; /* channels which gain value follows. N/A in joint mode */ - int values[sizeof(audio_channel_mask_t)]; /* gain values in millibels for each - channel ordered from LSb to MSb in channel mask. - The number of values is 1 in joint mode or - popcount(channel_mask) */ + int values[sizeof(audio_channel_mask_t) * 8]; /* gain values in millibels + for each channel ordered from LSb to MSb in + channel mask. The number of values is 1 in joint + mode or popcount(channel_mask) */ unsigned int ramp_duration_ms; /* ramp duration in ms */ }; |