Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4353 from TheUbuntuGuy/master 

Fix dbz possibility with small buffers at end of track
This commit is contained in:
John Maguire 2014-05-18 18:06:36 +02:00
parent 22a454e405 b0b94163f9
commit 8fa96f68c8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/engines/gstengine.cpp
View File

@ -249,7 +249,7 @@ const Engine::Scope& GstEngine::scope(int chunk_length) {
if (have_new_buffer_) {
if (latest_buffer_ != nullptr) {
scope_chunks_ = ceil(((double)GST_BUFFER_DURATION(latest_buffer_) /
(double)(chunk_length * kNsecPerMsec)));
(double)(chunk_length * kNsecPerMsec)));
}
// if the buffer is shorter than the chunk length
@ -268,9 +268,14 @@ const Engine::Scope& GstEngine::scope(int chunk_length) {
void GstEngine::UpdateScope(int chunk_length) {
typedef Engine::Scope::value_type sample_type;
// prevent dbz or invalid chunk size
if (!GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(latest_buffer_))) return;
if (GST_BUFFER_DURATION(latest_buffer_) == 0) return;
// determine where to split the buffer
int chunk_density = GST_BUFFER_SIZE(latest_buffer_) /
(GST_BUFFER_DURATION(latest_buffer_) / kNsecPerMsec);
int chunk_density = (GST_BUFFER_SIZE(latest_buffer_) * kNsecPerMsec) /
GST_BUFFER_DURATION(latest_buffer_);
int chunk_size = chunk_length * chunk_density;
// determine the number of channels