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

Bug 2378 - FFmpeg export can fail due to unsupported sample rate

Browse Source
This commit is contained in:
Leland Lucius 2020-03-30 16:05:23 -05:00
parent ddadd8d429
commit f8053b73e2
1 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/export/ExportFFmpeg.cpp
View File

@ -384,9 +384,25 @@ bool ExportFFmpeg::Init(const char *shortname, AudacityProject *project, const T
bool ExportFFmpeg::CheckSampleRate(int rate, int lowrate, int highrate, const int *sampRates) bool ExportFFmpeg::CheckSampleRate(int rate, int lowrate, int highrate, const int *sampRates)
{ {
if (rate < lowrate || rate > highrate) return false; if (lowrate && highrate)
for (int i = 0; sampRates[i] > 0; i++) {
if (rate == sampRates[i]) return true; if (rate < lowrate || rate > highrate)
{
return false;
}
}
if (sampRates)
{
for (int i = 0; sampRates[i] > 0; i++)
{
if (rate == sampRates[i])
{
return true;
}
}
}
return false; return false;
} }
@ -559,6 +575,20 @@ bool ExportFFmpeg::InitCodecs(AudacityProject *project)
} }
} }
if (codec->supported_samplerates)
{
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;
}
}
}
if (mEncFormatCtx->oformat->flags & AVFMT_GLOBALHEADER) if (mEncFormatCtx->oformat->flags & AVFMT_GLOBALHEADER)
{ {
mEncAudioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; mEncAudioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
@ -569,12 +599,26 @@ bool ExportFFmpeg::InitCodecs(AudacityProject *project)
int rc = avcodec_open2(mEncAudioCodecCtx.get(), codec, &options); int rc = avcodec_open2(mEncAudioCodecCtx.get(), codec, &options);
if (rc < 0) if (rc < 0)
{ {
char buf[AV_ERROR_MAX_STRING_SIZE]; TranslatableString errmsg;
av_strerror(rc, buf, sizeof(buf));
switch (rc)
{
case -EPERM:
errmsg = XO("The codec reported a generic error (EPERM)");
break;
case -EINVAL:
errmsg = XO("The codec reported an invalid parameter (EINVAL)");
break;
default:
char buf[AV_ERROR_MAX_STRING_SIZE];
av_strerror(rc, buf, sizeof(buf));
errmsg = Verbatim(buf);
}
AudacityMessageBox( AudacityMessageBox(
/* i18n-hint: "codec" is short for a "coder-decoder" algorithm */ /* i18n-hint: "codec" is short for a "coder-decoder" algorithm */
XO("FFmpeg : ERROR - Can't open audio codec 0x%x\n\n%s") XO("Can't open audio codec \"%s\" (0x%x)\n\n%s")
.Format(mEncAudioCodecCtx->codec_id, wxString(buf)), .Format(codec->name, mEncAudioCodecCtx->codec_id, errmsg),
XO("FFmpeg Error"), XO("FFmpeg Error"),
wxOK|wxCENTER|wxICON_EXCLAMATION); wxOK|wxCENTER|wxICON_EXCLAMATION);
return false; return false;
@ -1085,7 +1129,7 @@ int ExportFFmpeg::AskResample(int bitrate, int rate, int lowrate, int highrate,
for (int i = 0; sampRates[i] > 0; i++) for (int i = 0; sampRates[i] > 0; i++)
{ {
int label = sampRates[i]; int label = sampRates[i];
if (label >= lowrate && label <= highrate) if ((!lowrate || label >= lowrate) && (!highrate || label <= highrate))
{ {
wxString name = wxString::Format(wxT("%d"),label); wxString name = wxString::Format(wxT("%d"),label);
choices.push_back( Verbatim( name ) ); choices.push_back( Verbatim( name ) );