From 6585e18571df900c4ffe862ec02cd7376af7bbbd Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 11 Jul 2014 23:12:08 +0200 Subject: decoder/faad: check sample_rate, not frames_per_second Checking the integer is faster, easier and more reliable. --- src/decoder/FaadDecoderPlugin.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx index bca4ecd95..7279d7107 100644 --- a/src/decoder/FaadDecoderPlugin.cxx +++ b/src/decoder/FaadDecoderPlugin.cxx @@ -148,10 +148,12 @@ adts_song_duration(DecoderBuffer *buffer) decoder_buffer_consume(buffer, frame_length); } - float frames_per_second = (float)sample_rate / 1024.0; - if (frames_per_second <= 0) + if (sample_rate == 0) return -1; + float frames_per_second = (float)sample_rate / 1024.0; + assert(frames_per_second > 0); + return (float)frames / frames_per_second; } -- cgit v1.2.3