dsdplay: make separate dsffile

This commit is contained in:
Wim Taymans 2021-09-17 21:33:08 +02:00
parent fb0c5f503f
commit 275b8a0f9e
4 changed files with 326 additions and 242 deletions

261
src/tools/dsffile.c Normal file
View file

@ -0,0 +1,261 @@
/* PipeWire
*
* Copyright © 2021 Wim Taymans
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#include <errno.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <math.h>
#include <spa/utils/string.h>
#include "dsffile.h"
struct dsf_file {
uint8_t *data;
size_t size;
int mode;
int fd;
struct dsf_file_info info;
uint8_t *p;
size_t offset;
};
static inline uint16_t parse_le16(const uint8_t *in)
{
return in[0] | (in[1] << 8);
}
static inline uint32_t parse_le32(const uint8_t *in)
{
return in[0] | (in[1] << 8) | (in[2] << 16) | (in[3] << 24);
}
static inline uint64_t parse_le64(const uint8_t *in)
{
uint64_t res = in[0];
res |= ((uint64_t)in[1]) << 8;
res |= ((uint64_t)in[2]) << 16;
res |= ((uint64_t)in[3]) << 24;
res |= ((uint64_t)in[4]) << 32;
res |= ((uint64_t)in[5]) << 40;
res |= ((uint64_t)in[6]) << 48;
res |= ((uint64_t)in[7]) << 56;
return res;
}
static inline int f_avail(struct dsf_file *f)
{
if (f->p < f->data + f->size)
return f->size + f->data - f->p;
return 0;
}
static int read_DSD(struct dsf_file *f)
{
uint64_t size;
if (f_avail(f) < 28 ||
memcmp(f->p, "DSD ", 4) != 0)
return -EINVAL;
size = parse_le64(f->p + 4); /* size of this chunk */
parse_le64(f->p + 12); /* total size */
parse_le64(f->p + 20); /* metadata */
f->p += size;
return 0;
}
static int read_fmt(struct dsf_file *f)
{
uint64_t size;
if (f_avail(f) < 52 ||
memcmp(f->p, "fmt ", 4) != 0)
return -EINVAL;
size = parse_le64(f->p + 4); /* size of this chunk */
if (parse_le32(f->p + 12) != 1) /* version */
return -EINVAL;
if (parse_le32(f->p + 16) != 0) /* format id */
return -EINVAL;
f->info.channel_type = parse_le32(f->p + 20);
f->info.channels = parse_le32(f->p + 24);
f->info.rate = parse_le32(f->p + 28);
f->info.lsb = parse_le32(f->p + 32) == 1;
f->info.samples = parse_le64(f->p + 36);
f->info.blocksize = parse_le32(f->p + 44);
f->p += size;
return 0;
}
static int read_data(struct dsf_file *f)
{
uint64_t size;
if (f_avail(f) < 12 ||
memcmp(f->p, "data", 4) != 0)
return -EINVAL;
size = parse_le64(f->p + 4); /* size of this chunk */
f->info.length = size - 12;
f->p += 12;
return 0;
}
static int open_read(struct dsf_file *f, const char *filename, struct dsf_file_info *info)
{
int res;
struct stat st;
if ((f->fd = open(filename, O_RDONLY)) < 0) {
res = -errno;
goto exit;
}
if (fstat(f->fd, &st) < 0) {
res = -errno;
goto exit_close;
}
f->size = st.st_size;
f->data = mmap(NULL, f->size, PROT_READ, MAP_SHARED, f->fd, 0);
if (f->data == MAP_FAILED) {
res = -errno;
goto exit_close;
}
f->p = f->data;
if ((res = read_DSD(f)) < 0)
goto exit_unmap;
if ((res = read_fmt(f)) < 0)
goto exit_unmap;
if ((res = read_data(f)) < 0)
goto exit_unmap;
f->mode = 1;
*info = f->info;
return 0;
exit_unmap:
munmap(f->data, f->size);
exit_close:
close(f->fd);
exit:
return res;
}
struct dsf_file *
dsf_file_open(const char *filename, const char *mode, struct dsf_file_info *info)
{
int res;
struct dsf_file *f;
f = calloc(1, sizeof(struct dsf_file));
if (f == NULL)
return NULL;
if (spa_streq(mode, "r")) {
if ((res = open_read(f, filename, info)) < 0)
goto exit_free;
} else {
res = -EINVAL;
goto exit_free;
}
return f;
exit_free:
free(f);
errno = -res;
return NULL;
}
static const uint8_t bitrev[256] = {
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
};
ssize_t
dsf_file_read(struct dsf_file *f, void *data, size_t samples, const struct dsf_layout *layout)
{
uint8_t *d = data;
const uint8_t *s;
uint32_t i, j, k, total, stride, bytes;
int32_t interleave = layout->interleave;
bool rev = layout->lsb != f->info.lsb;
stride = layout->channels * layout->interleave;
bytes = samples * stride;
bytes -= bytes % f->info.blocksize;
for (total = 0; total < bytes; total += layout->channels * f->info.blocksize) {
s = f->p + f->offset;
for (i = 0; i < f->info.blocksize; i += interleave) {
for (j = 0; j < layout->channels; j++) {
const uint8_t *c = &s[f->info.blocksize * j + i];
if (interleave > 0) {
for (k = 0; k < (uint32_t)interleave; k++)
*d++ = rev ? bitrev[c[k]] : c[k];
} else {
for (k = -interleave; k > 0; k--)
*d++ = rev ? bitrev[c[k-1]] : c[k-1];
}
}
}
f->offset += f->info.channels * f->info.blocksize;
}
return total / stride;
}
int dsf_file_close(struct dsf_file *f)
{
if (f->mode == 1) {
munmap(f->data, f->size);
} else
return -EINVAL;
close(f->fd);
free(f);
return 0;
}

52
src/tools/dsffile.h Normal file
View file

@ -0,0 +1,52 @@
/* PipeWire
*
* Copyright © 2021 Wim Taymans
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include <spa/utils/defs.h>
struct dsf_file;
struct dsf_file_info {
uint32_t channel_type;
uint32_t channels;
uint32_t rate;
bool lsb;
uint64_t samples;
uint64_t length;
uint32_t blocksize;
};
struct dsf_layout {
int32_t interleave;
uint32_t channels;
bool lsb;
};
struct dsf_file * dsf_file_open(const char *filename, const char *mode, struct dsf_file_info *info);
ssize_t dsf_file_read(struct dsf_file *f, void *data, size_t samples, const struct dsf_layout *layout);
int dsf_file_close(struct dsf_file *f);

View file

@ -5,7 +5,7 @@ tools_sources = [
[ 'pw-dump', [ 'pw-dump.c' ] ],
[ 'pw-profiler', [ 'pw-profiler.c' ] ],
[ 'pw-mididump', [ 'pw-mididump.c', 'midifile.c' ] ],
[ 'pw-dsdplay', [ 'pw-dsdplay.c' ] ],
[ 'pw-dsdplay', [ 'pw-dsdplay.c', 'dsffile.c' ] ],
[ 'pw-metadata', [ 'pw-metadata.c' ] ],
[ 'pw-loopback', [ 'pw-loopback.c' ] ],
[ 'pw-link', [ 'pw-link.c' ] ],
@ -34,6 +34,7 @@ if not get_option('pw-cat').disabled() and sndfile_dep.found()
pwcat_sources = [
'pw-cat.c',
'midifile.c',
'dsffile.c',
]
pwcat_aliases = [

View file

@ -37,238 +37,7 @@
#include <pipewire/pipewire.h>
struct dsf_file_info {
uint32_t channel_type;
uint32_t channels;
uint32_t rate;
bool lsb;
uint64_t samples;
uint64_t length;
uint32_t blocksize;
};
struct dsf_file {
uint8_t *data;
size_t size;
int mode;
int fd;
struct dsf_file_info info;
uint8_t *p;
};
static inline uint16_t parse_le16(const uint8_t *in)
{
return in[0] | (in[1] << 8);
}
static inline uint32_t parse_le32(const uint8_t *in)
{
return in[0] | (in[1] << 8) | (in[2] << 16) | (in[3] << 24);
}
static inline uint64_t parse_le64(const uint8_t *in)
{
uint64_t res = in[0];
res |= ((uint64_t)in[1]) << 8;
res |= ((uint64_t)in[2]) << 16;
res |= ((uint64_t)in[3]) << 24;
res |= ((uint64_t)in[4]) << 32;
res |= ((uint64_t)in[5]) << 40;
res |= ((uint64_t)in[6]) << 48;
res |= ((uint64_t)in[7]) << 56;
return res;
}
static inline int f_avail(struct dsf_file *f)
{
if (f->p < f->data + f->size)
return f->size + f->data - f->p;
return 0;
}
static int read_DSD(struct dsf_file *f)
{
uint64_t size;
if (f_avail(f) < 28 ||
memcmp(f->p, "DSD ", 4) != 0)
return -EINVAL;
size = parse_le64(f->p + 4); /* size of this chunk */
parse_le64(f->p + 12); /* total size */
parse_le64(f->p + 20); /* metadata */
f->p += size;
return 0;
}
static int read_fmt(struct dsf_file *f)
{
uint64_t size;
if (f_avail(f) < 52 ||
memcmp(f->p, "fmt ", 4) != 0)
return -EINVAL;
size = parse_le64(f->p + 4); /* size of this chunk */
if (parse_le32(f->p + 12) != 1) /* version */
return -EINVAL;
if (parse_le32(f->p + 16) != 0) /* format id */
return -EINVAL;
f->info.channel_type = parse_le32(f->p + 20);
f->info.channels = parse_le32(f->p + 24);
f->info.rate = parse_le32(f->p + 28);
f->info.lsb = parse_le32(f->p + 32) == 1;
f->info.samples = parse_le64(f->p + 36);
f->info.blocksize = parse_le32(f->p + 44);
f->p += size;
return 0;
}
static int read_data(struct dsf_file *f)
{
uint64_t size;
if (f_avail(f) < 12 ||
memcmp(f->p, "data", 4) != 0)
return -EINVAL;
size = parse_le64(f->p + 4); /* size of this chunk */
f->info.length = size - 12;
f->p += 12;
return 0;
}
static int open_read(struct dsf_file *f, const char *filename, struct dsf_file_info *info)
{
int res;
struct stat st;
if ((f->fd = open(filename, O_RDONLY)) < 0) {
res = -errno;
goto exit;
}
if (fstat(f->fd, &st) < 0) {
res = -errno;
goto exit_close;
}
f->size = st.st_size;
f->data = mmap(NULL, f->size, PROT_READ, MAP_SHARED, f->fd, 0);
if (f->data == MAP_FAILED) {
res = -errno;
goto exit_close;
}
f->p = f->data;
if ((res = read_DSD(f)) < 0)
goto exit_unmap;
if ((res = read_fmt(f)) < 0)
goto exit_unmap;
if ((res = read_data(f)) < 0)
goto exit_unmap;
f->mode = 1;
*info = f->info;
return 0;
exit_unmap:
munmap(f->data, f->size);
exit_close:
close(f->fd);
exit:
return res;
}
struct dsf_file *
dsf_file_open(const char *filename, const char *mode, struct dsf_file_info *info)
{
int res;
struct dsf_file *f;
f = calloc(1, sizeof(struct dsf_file));
if (f == NULL)
return NULL;
if (spa_streq(mode, "r")) {
if ((res = open_read(f, filename, info)) < 0)
goto exit_free;
} else {
res = -EINVAL;
goto exit_free;
}
return f;
exit_free:
free(f);
errno = -res;
return NULL;
}
static const uint8_t bitrev[256] = {
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
};
ssize_t
dsf_file_read(struct dsf_file *f, void *data, size_t samples, uint32_t interleave, bool lsb)
{
uint8_t *d = data;
const uint8_t *s;
uint32_t i, j, k, total = 0, size, stride, bytes;
bool rev = lsb != f->info.lsb;
stride = f->info.channels * interleave;
size = f->info.channels * f->info.blocksize;
bytes = samples * stride;
bytes -= bytes % f->info.blocksize;
s = f->p;
while (total < bytes) {
for (i = 0; i < f->info.blocksize; i += interleave) {
for (j = 0; j < f->info.channels; j++) {
const uint8_t *c = &s[f->info.blocksize * j + i];
for (k = 0; k < interleave; k++)
*d++ = rev ? bitrev[c[k]] : c[k];
}
}
s += size;
total += size;
}
f->p += total;
return total / stride;
}
int dsf_file_close(struct dsf_file *f)
{
if (f->mode == 1) {
munmap(f->data, f->size);
} else
return -EINVAL;
close(f->fd);
free(f);
return 0;
}
#include "dsffile.h"
struct data {
struct pw_main_loop *loop;
@ -279,8 +48,7 @@ struct data {
struct dsf_file *f;
struct dsf_file_info info;
struct spa_audio_info_dsd format;
struct dsf_layout layout;
};
static void on_process(void *userdata)
@ -301,11 +69,10 @@ static void on_process(void *userdata)
if ((d = buf->datas[0].data) == NULL)
return;
stride = data->info.channels * data->format.interleave;
stride = data->info.channels * data->layout.interleave;
samples = dsf_file_read(data->f, d, buf->datas[0].maxsize / stride,
data->format.interleave,
data->format.bitorder == SPA_PARAM_BITORDER_lsb);
&data->layout);
buf->datas[0].chunk->offset = 0;
buf->datas[0].chunk->stride = stride;
@ -334,11 +101,14 @@ on_param_changed(void *userdata, uint32_t id, const struct spa_pod *param)
if (spa_format_audio_dsd_parse(param, &info.info.dsd) < 0)
return;
data->format = info.info.dsd;
data->layout.interleave = info.info.dsd.interleave,
data->layout.channels = info.info.dsd.channels;
data->layout.lsb = info.info.dsd.bitorder == SPA_PARAM_BITORDER_lsb;
fprintf(stderr, "output:\n");
fprintf(stderr, " bitorder: %s\n",
data->format.bitorder == SPA_PARAM_BITORDER_lsb ? "lsb" : "msb");
fprintf(stderr, " interleave: %d\n", data->format.interleave);
fprintf(stderr, " bitorder: %s\n", data->layout.lsb ? "lsb" : "msb");
fprintf(stderr, " channels: %u\n", data->layout.channels);
fprintf(stderr, " interleave: %d\n", data->layout.interleave);
}
static const struct pw_stream_events stream_events = {