Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-22 07:10:06 +02:00
Code Issues Releases Wiki Activity

Bug 2471 - Mix Stereo down to Mono fails if space at start of track

Browse Source 
Fix:
In the constructor for Mixer, the start and end times should be in seconds, not sample numbers.

Also fixed in passing, in computing end time of a track, the max of the two channels should be used, rather than the min.
This commit is contained in:
David Bailes 2020-06-05 14:33:45 +01:00
parent 278b40c50d
commit 13ec3300a9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/effects/StereoToMono.cpp
View File

@ -98,7 +98,7 @@ bool EffectStereoToMono::Process()
{ {
auto start = wxMin(left->TimeToLongSamples(left->GetStartTime()), auto start = wxMin(left->TimeToLongSamples(left->GetStartTime()),
right->TimeToLongSamples(right->GetStartTime())); right->TimeToLongSamples(right->GetStartTime()));
auto end = wxMin(left->TimeToLongSamples(left->GetEndTime()), auto end = wxMax(left->TimeToLongSamples(left->GetEndTime()),
right->TimeToLongSamples(right->GetEndTime())); right->TimeToLongSamples(right->GetEndTime()));
totalTime += (end - start); totalTime += (end - start);
@ -155,10 +155,8 @@ bool EffectStereoToMono::ProcessOne(sampleCount & curTime, sampleCount totalTime
bool bResult = true; bool bResult = true;
sampleCount processed = 0; sampleCount processed = 0;
auto start = wxMin(left->TimeToLongSamples(left->GetStartTime()), auto start = wxMin(left->GetStartTime(), right->GetStartTime());
right->TimeToLongSamples(right->GetStartTime())); auto end = wxMax(left->GetEndTime(), right->GetEndTime());
auto end = wxMin(left->TimeToLongSamples(left->GetEndTime()),
right->TimeToLongSamples(right->GetEndTime()));
WaveTrackConstArray tracks; WaveTrackConstArray tracks;
tracks.push_back(left->SharedPointer< const WaveTrack >()); tracks.push_back(left->SharedPointer< const WaveTrack >());
@ -169,8 +167,8 @@ bool EffectStereoToMono::ProcessOne(sampleCount & curTime, sampleCount totalTime
Mixer mixer(tracks, Mixer mixer(tracks,
true, // Throw to abort mix-and-render if read fails: true, // Throw to abort mix-and-render if read fails:
Mixer::WarpOptions(timeTrack ? timeTrack->GetEnvelope() : nullptr), Mixer::WarpOptions(timeTrack ? timeTrack->GetEnvelope() : nullptr),
start.as_double(), start,
end.as_double(), end,
1, 1,
idealBlockLen, idealBlockLen,
false, // Not interleaved false, // Not interleaved