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

Workaround for crash in bug #2378

Browse Source 
The proper "fix" is to upgrade FFmpeg, but we'll just protect
the users by excluding sample rate 7350 when using "aac".
This commit is contained in:
Leland Lucius 2020-04-04 13:00:39 -05:00
parent a41e16cb1f
commit 281af790b0
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/export/ExportFFmpeg.cpp
View File

@ -585,15 +585,35 @@ bool ExportFFmpeg::InitCodecs(AudacityProject *project)
if (codec->supported_samplerates)
{
if (!CheckSampleRate(mSampleRate, 0, 0, codec->supported_samplerates))
// Workaround for crash in bug #2378. Proper fix is to get a newer version of FFmpeg.
if (codec->id == AV_CODEC_ID_AAC)
{
mEncAudioCodecCtx->sample_rate = mSampleRate = AskResample(0, mSampleRate, 0, 0, codec->supported_samplerates);
std::vector<int> rates;
int i = 0;
// This happens if user refused to resample the project
if (mSampleRate == 0)
while (codec->supported_samplerates[i] && codec->supported_samplerates[i] != 7350)
{
return false;
rates.push_back(codec->supported_samplerates[i++]);
}
rates.push_back(0);
if (!CheckSampleRate(mSampleRate, 0, 0, rates.data()))
{
mEncAudioCodecCtx->sample_rate = mSampleRate = AskResample(0, mSampleRate, 0, 0, rates.data());
}
}
else
{
if (!CheckSampleRate(mSampleRate, 0, 0, codec->supported_samplerates))
{
mEncAudioCodecCtx->sample_rate = mSampleRate = AskResample(0, mSampleRate, 0, 0, codec->supported_samplerates);
}
}
// This happens if user refused to resample the project
if (mSampleRate == 0)
{
return false;
}
}