mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa-resample: improve output format selection

Browse source 
Setting a format does not automatically mean making a wav file.

Instead, check for the extension on the output file name and when we
can't find any good containet, use the same as the input file.

This makes more sense than doing `spa-resample test.flac -r 44100 test.wav`
and ending up with a FLAC file named test.wav. Or
`spa-resample test.flac -r 44100 -f s16 test2.flac` and ending up with a
wav file named test2.flac.
This commit is contained in:
Wim Taymans 2025-01-31 09:19:07 +01:00
parent 1cc00923db
commit 5e6b77cf1e
1 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
spa/plugins/audioconvert/spa-resample.c
View file

@ -119,6 +119,8 @@ sf_str_to_fmt(const char *str)
static int open_files(struct data *d)
{
int i, count = 0, format = -1;
d->ifile = sf_open(d->iname, SFM_READ, &d->iinfo);
if (d->ifile == NULL) {
fprintf(stderr, "error: failed to open input file \"%s\": %s\n",
@ -128,8 +130,32 @@ static int open_files(struct data *d)
d->oinfo.channels = d->iinfo.channels;
d->oinfo.samplerate = d->rate > 0 ? d->rate : d->iinfo.samplerate;
d->oinfo.format = d->format > 0 ? d->format : d->iinfo.format;
d->oinfo.format |= SF_FORMAT_WAV;
d->oinfo.format = d->format > 0 ? d->format : (d->iinfo.format & SF_FORMAT_SUBMASK);
/* try to guess the format from the extension */
if (sf_command(NULL, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof(int)) != 0)
count = 0;
for (i = 0; i < count; i++) {
SF_FORMAT_INFO fi;
spa_zero(fi);
fi.format = i;
if (sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) != 0)
continue;
if (spa_strendswith(d->oname, fi.extension)) {
format = fi.format;
break;
}
}
if (format == -1)
/* use the same format as the input file otherwise */
format = d->iinfo.format & ~SF_FORMAT_SUBMASK;
if (format == SF_FORMAT_WAV && d->oinfo.channels > 2)
format = SF_FORMAT_WAVEX;
d->oinfo.format |= format;
d->ofile = sf_open(d->oname, SFM_WRITE, &d->oinfo);
if (d->ofile == NULL) {