david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If the output file extension differs from the input file extension and is one of the readily identified strings wav, w64, or ogg, then open the output file with that format; otherwise use the same format as the input (as we previously did always). See https://todo.sr.ht/~breakfastquay/rubberband/20

Browse Source
This commit is contained in:
Chris Cannam
2022-09-26 17:56:29 +01:00
parent 9e423cdd8c
commit f8d94082e0
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
main/main.cpp
View File

@@ -533,6 +533,18 @@ int main(int argc, char **argv)
char *fileName = strdup(argv[optind++]); char *fileName = strdup(argv[optind++]);
char *fileNameOut = strdup(argv[optind++]); char *fileNameOut = strdup(argv[optind++]);
std::string extIn, extOut;
for (int i = strlen(fileName); i > 0; ) {
if (fileName[--i] == '.') {
extIn = fileName + i + 1;
}
}
for (int i = strlen(fileNameOut); i > 0; ) {
if (fileNameOut[--i] == '.') {
extOut = fileNameOut + i + 1;
}
}
SNDFILE *sndfile; SNDFILE *sndfile;
SNDFILE *sndfileOut; SNDFILE *sndfileOut;
SF_INFO sfinfo; SF_INFO sfinfo;
@@ -562,12 +574,29 @@ int main(int argc, char **argv)
} }
sfinfoOut.channels = sfinfo.channels; sfinfoOut.channels = sfinfo.channels;
sfinfoOut.format = sfinfo.format;
sfinfoOut.frames = int(sfinfo.frames * ratio + 0.1); sfinfoOut.frames = int(sfinfo.frames * ratio + 0.1);
sfinfoOut.samplerate = sfinfo.samplerate; sfinfoOut.samplerate = sfinfo.samplerate;
sfinfoOut.sections = sfinfo.sections; sfinfoOut.sections = sfinfo.sections;
sfinfoOut.seekable = sfinfo.seekable; sfinfoOut.seekable = sfinfo.seekable;
if (extIn == extOut) {
sfinfoOut.format = sfinfo.format;
} else {
std::string ex = extOut;
for (size_t i = 0; i < ex.size(); ++i) {
ex[i] = tolower(ex[i]);
}
if (ex == "wav") {
sfinfoOut.format = SF_FORMAT_WAV | SF_FORMAT_PCM_24;
} else if (ex == "w64") {
sfinfoOut.format = SF_FORMAT_W64 | SF_FORMAT_PCM_24;
} else if (ex == "ogg") {
sfinfoOut.format = SF_FORMAT_OGG;
} else { // fall back to
sfinfoOut.format = sfinfo.format;
}
}
sndfileOut = sf_open(fileNameOut, SFM_WRITE, &sfinfoOut) ; sndfileOut = sf_open(fileNameOut, SFM_WRITE, &sfinfoOut) ;
if (!sndfileOut) { if (!sndfileOut) {
cerr << "ERROR: Failed to open output file \"" << fileNameOut << "\" for writing: " cerr << "ERROR: Failed to open output file \"" << fileNameOut << "\" for writing: "