Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-02 16:49:41 +02:00
Code Issues Releases Wiki Activity

Remove test in Loudness effect for same clip boundaries in channels...

Browse Source 
... it was not correctly written, and anyway WaveTrack::Get doesn't really
report sufficient information to test as intended.
This commit is contained in:
Paul Licameli 2020-03-21 15:34:50 -04:00
parent 0fe483f0e2
commit 7ae5c65580
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/effects/Loudness.cpp
View File

@ -455,8 +455,7 @@ bool EffectLoudness::ProcessOne(TrackIterRange<WaveTrack> range, bool analyse)
const size_t remainingLen = (end - s).as_size_t();
blockLen = blockLen > remainingLen ? remainingLen : blockLen;
if(!LoadBufferBlock(range, s, blockLen))
return false;
LoadBufferBlock(range, s, blockLen);
// Process the buffer.
if(analyse)
@ -479,29 +478,17 @@ bool EffectLoudness::ProcessOne(TrackIterRange<WaveTrack> range, bool analyse)
return true;
}
bool EffectLoudness::LoadBufferBlock(TrackIterRange<WaveTrack> range,
void EffectLoudness::LoadBufferBlock(TrackIterRange<WaveTrack> range,
sampleCount pos, size_t len)
{
sampleCount read_size = -1;
sampleCount last_read_size = -1;
// Get the samples from the track and put them in the buffer
int idx = 0;
for(auto channel : range)
{
channel->Get((samplePtr) mTrackBuffer[idx].get(), floatSample, pos, len,
fillZero, true, &read_size);
// WaveTrack::Get returns the amount of read samples excluding zero
// filled samples from clip gaps. But in case of stereo tracks with
// asymmetric gaps it still returns the same number for both channels.
//
// Fail if we read different sample count from stereo pair tracks.
// Ignore this check during first iteration (last_read_size == -1).
if(read_size != last_read_size && last_read_size.as_long_long() != -1)
return false;
channel->Get((samplePtr) mTrackBuffer[idx].get(), floatSample, pos, len );
++idx;
}
mTrackBufferLen = len;
return true;
}
/// Calculates sample sum (for DC) and EBU R128 weighted square sum

2
src/effects/Loudness.h
View File

@ -64,7 +64,7 @@ private:
void FreeBuffers();
bool GetTrackRMS(WaveTrack* track, float& rms);
bool ProcessOne(TrackIterRange<WaveTrack> range, bool analyse);
bool LoadBufferBlock(TrackIterRange<WaveTrack> range,
void LoadBufferBlock(TrackIterRange<WaveTrack> range,
sampleCount pos, size_t len);
bool AnalyseBufferBlock();
bool ProcessBufferBlock();