Skip to content

M
mpd
Commit 7a929fcd authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/faad: call GetSize() only when needed

parent 7087fdf6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
src/decoder/plugins/FaadDecoderPlugin.cxx
View file @ 7a929fcd
...@@ -166,9 +166,6 @@ adts_song_duration(DecoderBuffer *buffer) ...@@ -166,9 +166,6 @@ adts_song_duration(DecoderBuffer *buffer)
static float static float
faad_song_duration(DecoderBuffer *buffer, InputStream &is) faad_song_duration(DecoderBuffer *buffer, InputStream &is)
{ {
const auto size = is.GetSize();
const size_t fileread = size >= 0 ? size : 0;
auto data = ConstBuffer<uint8_t>::FromVoid(decoder_buffer_need(buffer, 5)); auto data = ConstBuffer<uint8_t>::FromVoid(decoder_buffer_need(buffer, 5));
if (data.IsNull()) if (data.IsNull())
return -1; return -1;
...@@ -217,6 +214,8 @@ faad_song_duration(DecoderBuffer *buffer, InputStream &is) ...@@ -217,6 +214,8 @@ faad_song_duration(DecoderBuffer *buffer, InputStream &is)
(data.data[6 + skip_size] << 3) | (data.data[6 + skip_size] << 3) |
(data.data[7 + skip_size] & 0xE0); (data.data[7 + skip_size] & 0xE0);
const auto size = is.GetSize();
const size_t fileread = size >= 0 ? size : 0;
if (fileread != 0 && bit_rate != 0) if (fileread != 0 && bit_rate != 0)
return fileread * 8.0 / bit_rate; return fileread * 8.0 / bit_rate;
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment