mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-cat: fix s24 formats

Browse source 
Treat s24 format as s32 and let sndfile convert for us. This is
needed because using the raw read bypasses decoding in some cases.
This makes 24 bits flac work.
This commit is contained in:
Wim Taymans 2020-01-27 15:47:13 +01:00
parent f4387e0568
commit e1e93e5a88
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tools/pw-cat.c
View file

@ -223,11 +223,7 @@ sf_format_to_pw(int format)
return endianess == 1 ? SPA_AUDIO_FORMAT_S16_LE : return endianess == 1 ? SPA_AUDIO_FORMAT_S16_LE :
endianess == 2 ? SPA_AUDIO_FORMAT_S16_BE : endianess == 2 ? SPA_AUDIO_FORMAT_S16_BE :
SPA_AUDIO_FORMAT_S16; SPA_AUDIO_FORMAT_S16;
case SF_FORMAT_PCM_24: case SF_FORMAT_PCM_24:
return endianess == 1 ? SPA_AUDIO_FORMAT_S24_LE :
endianess == 2 ? SPA_AUDIO_FORMAT_S24_BE :
SPA_AUDIO_FORMAT_S24;
case SF_FORMAT_PCM_32: case SF_FORMAT_PCM_32:
return endianess == 1 ? SPA_AUDIO_FORMAT_S32_LE : return endianess == 1 ? SPA_AUDIO_FORMAT_S32_LE :
endianess == 2 ? SPA_AUDIO_FORMAT_S32_BE : endianess == 2 ? SPA_AUDIO_FORMAT_S32_BE :
@ -258,7 +254,6 @@ sf_format_samplesize(int format)
case SF_FORMAT_PCM_16: case SF_FORMAT_PCM_16:
return 2; return 2;
case SF_FORMAT_PCM_24: case SF_FORMAT_PCM_24:
return 3;
case SF_FORMAT_PCM_32: case SF_FORMAT_PCM_32:
return 4; return 4;
case SF_FORMAT_FLOAT: case SF_FORMAT_FLOAT:
@ -288,13 +283,6 @@ static int sf_playback_fill_s16(struct data *d, void *dest, unsigned int n_frame
return (int)rn; return (int)rn;
} }
static int sf_playback_fill_s24(struct data *d, void *dest, unsigned int n_frames)
{
sf_count_t rn;
rn = sf_read_raw(d->file, dest, (sf_count_t) n_frames * d->stride);
return (int)rn / d->stride;
}
static int sf_playback_fill_s32(struct data *d, void *dest, unsigned int n_frames) static int sf_playback_fill_s32(struct data *d, void *dest, unsigned int n_frames)
{ {
sf_count_t rn; sf_count_t rn;
@ -336,8 +324,6 @@ sf_fmt_playback_fill_fn(int format)
if (sizeof(int16_t) != sizeof(short)) if (sizeof(int16_t) != sizeof(short))
return NULL; return NULL;
return sf_playback_fill_s16; return sf_playback_fill_s16;
case SPA_AUDIO_FORMAT_S24:
return sf_playback_fill_s24;
case SPA_AUDIO_FORMAT_S32_LE: case SPA_AUDIO_FORMAT_S32_LE:
case SPA_AUDIO_FORMAT_S32_BE: case SPA_AUDIO_FORMAT_S32_BE:
/* sndfile check */ /* sndfile check */