hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

Browse Source 
This makes AudioDevice::resample return the actual number of generated samples.
This commit is contained in:
thmueller64
2020-07-10 03:58:52 +02:00
committed by GitHub
parent 9895472efd
commit 4b4f117add
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AudioDevice.h
View File

@@ -115,7 +115,7 @@ protected:
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,

11
src/core/audio/AudioDevice.cpp
View File

@@ -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,7 +182,7 @@ 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,
@@ -192,7 +190,7 @@ void AudioDevice::resample( const surroundSampleFrame * _src,
{
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);
}