From 96155a3376ef40eac9ca7a7b882da6447ab53979 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 10 Oct 2008 14:41:37 +0200 Subject: audio_format: added audio_format_frame_size() A frame contains one sample per channel, thus it is sample_size * channels. This patch includes some cleanup for various locations where the sample size for 24 bit audio was still 3 bytes (instead of 4). --- src/audio_format.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/audio_format.h') diff --git a/src/audio_format.h b/src/audio_format.h index 2475aa77..bbebc51b 100644 --- a/src/audio_format.h +++ b/src/audio_format.h @@ -61,9 +61,15 @@ static inline unsigned audio_format_sample_size(const struct audio_format *af) return 4; } +static inline unsigned +audio_format_frame_size(const struct audio_format *af) +{ + return audio_format_sample_size(af) * af->channels; +} + static inline double audio_format_time_to_size(const struct audio_format *af) { - return af->sample_rate * af->channels * audio_format_sample_size(af); + return af->sample_rate * audio_format_frame_size(af); } static inline double audioFormatSizeToTime(const struct audio_format *af) -- cgit v1.2.3