diff options
Diffstat (limited to 'src/codec')
| -rw-r--r-- | src/codec/codec.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/codec/codec.h b/src/codec/codec.h index fac3be8..b70e3cb 100644 --- a/src/codec/codec.h +++ b/src/codec/codec.h @@ -248,10 +248,10 @@ static const char *camu_audio_format_name(s32 format) #endif } -static inline s32 camu_audio_format_bytes_per_sample(struct camu_audio_format *fmt) +static inline size_t camu_audio_format_bytes_per_sample(struct camu_audio_format *fmt) { #ifdef CAMU_HAVE_FFMPEG - return av_get_bytes_per_sample(fmt->format); + return (size_t)av_get_bytes_per_sample(fmt->format); #else switch (fmt->format) { case CAMU_SAMPLE_FORMAT_U8: @@ -271,15 +271,14 @@ static inline s32 camu_audio_format_bytes_per_sample(struct camu_audio_format *f case CAMU_SAMPLE_FORMAT_DBLP: return 8; default: - al_assert_and_return(-1); + al_assert_and_return(0); } #endif } static inline size_t camu_audio_format_samples_to_bytes(struct camu_audio_format *fmt, size_t samples) { - s32 bytes_per_sample = camu_audio_format_bytes_per_sample(fmt); - return samples * bytes_per_sample * fmt->channel_count; + return samples * camu_audio_format_bytes_per_sample(fmt) * fmt->channel_count; } static inline f64 camu_audio_format_samples_to_sec(struct camu_audio_format *fmt, size_t samples) |