From: Andre Noll Date: Sun, 17 Mar 2024 11:38:23 +0000 (+0100) Subject: Merge topic branch t/sf_float into pu X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=a0df071fd1ae56eca58608370699bd125fbfbd2d;hp=-c;p=paraslash.git Merge topic branch t/sf_float into pu A single patch which adds two new sample formats for 32 bit IEEE float waveform data. * refs/heads/t/sf_float: New audio formats: 32 bit float (little and big endian). --- a0df071fd1ae56eca58608370699bd125fbfbd2d diff --combined check_wav.c index cb39eb54,82148327..48a204bb --- a/check_wav.c +++ b/check_wav.c @@@ -54,7 -54,7 +54,7 @@@ void check_wav_pre_monitor(struct sche sched_min_delay(s); } -static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result) +static int check_wav_exec(const struct btr_node *btrn, const char *cmd, char **result) { struct check_wav_context *cwc = btr_context(btrn); int val, header_val, given, arg; @@@ -127,7 -127,7 +127,7 @@@ int check_wav_post_monitor(struct check unsigned char *a; size_t sz; int ret; - uint16_t bps; /* bits per sample */ + uint16_t format_code, bps; /* bits per sample */ const char *sample_formats[] = {SAMPLE_FORMATS}; if (!btrn) @@@ -157,13 -157,24 +157,24 @@@ cwc->state = CWS_HAVE_HEADER; /* Only set those values which have not already been set. */ cwc->channels = a[22]; + format_code = read_u16(a + 20); + if (format_code != 1 && format_code != 3) { + cwc->state = CWS_NO_HEADER; + goto out; + } cwc->sample_rate = read_u32(a + 24); bps = read_u16(a + 34); - if (bps != 8 && bps != 16) { + if (bps != 8 && bps != 16 && bps != 32) { PARA_WARNING_LOG("%u bps not supported, assuming 16\n", bps); bps = 16; } + if ((bps < 32 && format_code != 1) || (bps == 32 && format_code != 3)) { + PARA_WARNING_LOG("invalid bps/format_code (%u/%u)\n", + bps, format_code); + cwc->state = CWS_NO_HEADER; + goto out; + } /* * 8-bit samples are stored as unsigned bytes, ranging from 0 * to 255. 16-bit samples are stored as 2's-complement signed @@@ -171,9 -182,12 +182,12 @@@ */ if (bps == 8) cwc->sample_format = SF_U8; - else + else if (bps == 16) cwc->sample_format = (a[3] == 'F')? SF_S16_LE : SF_S16_BE; + else /* 32 bit */ + cwc->sample_format = (a[3] == 'F')? + SF_FLOAT_LE : SF_FLOAT_BE; PARA_NOTICE_LOG("%uHz, %s, %s\n", cwc->sample_rate, cwc->channels == 1? "mono" : "stereo", sample_formats[cwc->sample_format]);