Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-18 17:10:55 +02:00
Code Issues Releases Wiki Activity

Bug 1572 - Dither not applied when exporting 24-bit WAV from 32-bit float

Browse Source
This commit is contained in:
Leland Lucius 2021-02-14 17:53:45 -06:00
parent 217ba2bbec
commit 3f4fbd1c8c
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/export/ExportPCM.cpp
View File

@ -610,6 +610,11 @@ ProgressResult ExportPCM::Export(AudacityProject *project,
size_t maxBlockLen = 44100 * 5;
{
std::vector<char> dither;
if (info.format & SF_FORMAT_PCM_24) {
dither.reserve(maxBlockLen * info.channels * SAMPLE_SIZE(int24Sample));
}
wxASSERT(info.channels >= 0);
auto mixer = CreateMixer(tracks, selectionOnly,
t0, t1,
@ -632,6 +637,21 @@ ProgressResult ExportPCM::Export(AudacityProject *project,
samplePtr mixed = mixer->GetBuffer();
// Bug 1572: Not ideal, but it does add the desired dither
if (info.format & SF_FORMAT_PCM_24) {
for (int c = 0; c < info.channels; ++c) {
CopySamples(
mixed + (c * SAMPLE_SIZE(format)), format,
dither.data() + (c * SAMPLE_SIZE(int24Sample)), int24Sample,
numSamples, true, info.channels, info.channels
);
CopySamplesNoDither(
dither.data() + (c * SAMPLE_SIZE(int24Sample)), int24Sample,
mixed + (c * SAMPLE_SIZE(format)), format,
numSamples, info.channels, info.channels);
}
}
if (format == int16Sample)
samplesWritten = SFCall<sf_count_t>(sf_writef_short, sf.get(), (short *)mixed, numSamples);
else