oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/faad: call GetSize() only when needed

Browse Source
This commit is contained in:
Max Kellermann 2014-08-19 20:28:50 +02:00
parent 7087fdf6c0
commit 7a929fcd27
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/decoder/plugins/FaadDecoderPlugin.cxx
View File

@ -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)
(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