Fix garbage in exported audio caused by resampling (LMMS#5552)

This makes AudioDevice::resample return the actual number of generated samples.
sdasda7777 · Jul 10, 2020 · e2bbce8 · e2bbce8
1 parent 3ab0103
commit e2bbce8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/include/AudioDevice.h b/include/AudioDevice.h
@@ -115,7 +115,7 @@ class AudioDevice
  const fpp_t _frames );
 
  // resample given buffer from samplerate _src_sr to samplerate _dst_sr
- void resample( const surroundSampleFrame * _src,
+ fpp_t resample( const surroundSampleFrame * _src,
  const fpp_t _frames,
  surroundSampleFrame * _dst,
  const sample_rate_t _src_sr,

diff --git a/src/core/audio/AudioDevice.cpp b/src/core/audio/AudioDevice.cpp
@@ -93,10 +93,8 @@ fpp_t AudioDevice::getNextBuffer( surroundSampleFrame * _ab )
  // resample if necessary
  if( mixer()->processingSampleRate() != m_sampleRate )
  {
- resample( b, frames, _ab, mixer()->processingSampleRate(),
- m_sampleRate );
- frames = frames * m_sampleRate /
- mixer()->processingSampleRate();
+ frames = resample( b, frames, _ab, mixer()->processingSampleRate(),
+ m_sampleRate );
  }
  else
  {
@@ -184,15 +182,15 @@ void AudioDevice::renamePort( AudioPort * )
 
 
 
-void AudioDevice::resample( const surroundSampleFrame * _src,
+fpp_t AudioDevice::resample( const surroundSampleFrame * _src,
  const fpp_t _frames,
  surroundSampleFrame * _dst,
  const sample_rate_t _src_sr,
  const sample_rate_t _dst_sr )
 {
  if( m_srcState == NULL )
  {
- return;
+ return _frames;
  }
  m_srcData.input_frames = _frames;
  m_srcData.output_frames = _frames;
@@ -206,6 +204,7 @@ void AudioDevice::resample( const surroundSampleFrame * _src,
  printf( "AudioDevice::resample(): error while resampling: %s\n",
  src_strerror( error ) );
  }
+ return static_cast<fpp_t>(m_srcData.output_frames_gen);
 }