diff options
Diffstat (limited to 'src/plugins/Input/aac/aacfile.cpp')
| -rw-r--r-- | src/plugins/Input/aac/aacfile.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/Input/aac/aacfile.cpp b/src/plugins/Input/aac/aacfile.cpp index 48f659890..ad0eef4d2 100644 --- a/src/plugins/Input/aac/aacfile.cpp +++ b/src/plugins/Input/aac/aacfile.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,7 +34,7 @@ static int adts_sample_rates[] = {96000,88200,64000,48000,44100,32000,24000,2205 AACFile::AACFile(QIODevice *input, bool metaData, bool adts) { m_isValid = false; - m_length = 0; + m_duration = 0; m_bitrate = 0; m_samplerate = 0; m_input = input; @@ -121,9 +121,9 @@ AACFile::AACFile(QIODevice *input, bool metaData, bool adts) (buf[7 + skip_size] & 0xE0); if (!input->isSequential ()) - m_length = (qint64) (((float)input->size()*8.f)/((float)m_bitrate) + 0.5f); + m_duration = (qint64) (((float)input->size()*8000.f)/((float)m_bitrate) + 0.5f); else - m_length = 0; + m_duration = 0; m_bitrate = (int)((float)m_bitrate/1000.0f + 0.5f); m_isValid = true; } @@ -132,17 +132,17 @@ AACFile::AACFile(QIODevice *input, bool metaData, bool adts) AACFile::~AACFile() {} -qint64 AACFile::length() +qint64 AACFile::duration() const { - return m_length; + return m_duration; } -quint32 AACFile::bitrate() +quint32 AACFile::bitrate() const { return m_bitrate; } -quint32 AACFile::samplerate() +quint32 AACFile::samplerate() const { return m_samplerate; } @@ -152,12 +152,12 @@ int AACFile::offset() const return m_offset; } -bool AACFile::isValid() +bool AACFile::isValid() const { return m_isValid; } -const QMap<Qmmp::MetaData, QString> AACFile::metaData() +const QMap<Qmmp::MetaData, QString> &AACFile::metaData() { return m_metaData; } @@ -228,9 +228,9 @@ void AACFile::parseADTS() m_bitrate = (quint32)(8. * bytes_per_frame * frames_per_sec + 0.5); if (frames_per_sec != 0) - m_length = frames/frames_per_sec; + m_duration = frames * 1000 / frames_per_sec; else - m_length = 1; + m_duration = 1000; m_input->seek(0); //restore inital position } |