aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-03-03 18:03:14 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-03-03 18:03:14 +0000
commit7559299d77b3c375e9b718f986bc079215bf1d27 (patch)
treefeb70c6d76dee9dc39157d989a3b2a4728ab99aa
parent1e1097d7d0ecbc5c48a2cc2ccfd3d4c262013da0 (diff)
downloadqmmp-7559299d77b3c375e9b718f986bc079215bf1d27.tar.gz
qmmp-7559299d77b3c375e9b718f986bc079215bf1d27.tar.bz2
qmmp-7559299d77b3c375e9b718f986bc079215bf1d27.zip
aac plugin: removed useless debug message, fixed bitrate
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2669 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/Input/aac/decoder_aac.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp
index bbb5c4061..c55bddd2b 100644
--- a/src/plugins/Input/aac/decoder_aac.cpp
+++ b/src/plugins/Input/aac/decoder_aac.cpp
@@ -168,6 +168,7 @@ qint64 DecoderAAC::read(char *audio, qint64 maxSize)
m_sample_buf = NeAACDecDecode(data()->handle, &frame_info, (uchar *)m_input_buf, m_input_at);
memmove(m_input_buf, m_input_buf + frame_info.bytesconsumed,
m_input_at - frame_info.bytesconsumed);
+
m_input_at -= frame_info.bytesconsumed;
if (frame_info.error > 0)
@@ -176,6 +177,9 @@ qint64 DecoderAAC::read(char *audio, qint64 maxSize)
qDebug("DecoderAAC: %s", NeAACDecGetErrorMessage(frame_info.error));
return -1;
}
+ if(frame_info.samples > 0)
+ m_bitrate = frame_info.bytesconsumed * 8 * frame_info.samplerate * frame_info.channels
+ / frame_info.samples / 1000;
m_sample_buf_size = frame_info.samples * 2;
}