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

pw-cat: Use default channel layout when nothing given

Browse source 
Make channel layout definitions a little more useful. We can now
assign them to a layout_info struct or in the raw_info.
Make some default channel layouts for use in pw-cat
This commit is contained in:
Wim Taymans 2020-02-04 15:54:57 +01:00
parent 25e81d844a
commit 8abbf653e6
2 changed files with 195 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -442,22 +442,27 @@ static int channelmap_from_sf(struct channelmap *map)
}
return 0;
}
struct mapping {
const char *name;
unsigned int values[33];
unsigned int channels;
unsigned int values[32];
};
static const struct mapping maps[] =
{
{ "stereo", { SPA_AUDIO_LAYOUT_Stereo } },
{ "quad", { SPA_AUDIO_LAYOUT_Quad } },
{ "surround-40", { SPA_AUDIO_LAYOUT_Quad } },
{ "surround-31", { SPA_AUDIO_LAYOUT_3_1 } },
{ "surround-41", { SPA_AUDIO_LAYOUT_4_1 } },
{ "surround-50", { SPA_AUDIO_LAYOUT_5_0 } },
{ "surround-51", { SPA_AUDIO_LAYOUT_5_1 } },
{ "surround-71", { SPA_AUDIO_LAYOUT_7_1 } },
{ "mono", SPA_AUDIO_LAYOUT_Mono },
{ "stereo", SPA_AUDIO_LAYOUT_Stereo },
{ "surround-21", SPA_AUDIO_LAYOUT_2_1 },
{ "quad", SPA_AUDIO_LAYOUT_Quad },
{ "surround-22", SPA_AUDIO_LAYOUT_2_2 },
{ "surround-40", SPA_AUDIO_LAYOUT_4_0 },
{ "surround-31", SPA_AUDIO_LAYOUT_3_1 },
{ "surround-41", SPA_AUDIO_LAYOUT_4_1 },
{ "surround-50", SPA_AUDIO_LAYOUT_5_0 },
{ "surround-51", SPA_AUDIO_LAYOUT_5_1 },
{ "surround-51r", SPA_AUDIO_LAYOUT_5_1R },
{ "surround-70", SPA_AUDIO_LAYOUT_7_0 },
{ "surround-71", SPA_AUDIO_LAYOUT_7_1 },
};
static unsigned int find_channel(const char *name)
@ -478,8 +483,8 @@ static int parse_channelmap(const char *channelmap, struct channelmap *map)
for (i = 0; i < (int) SPA_N_ELEMENTS(maps); i++) {
if (strcmp(maps[i].name, channelmap) == 0) {
map->n_channels = maps[i].values[0];
spa_memcpy(map->channels, &maps[i].values[1],
map->n_channels = maps[i].channels;
spa_memcpy(map->channels, &maps[i].values,
map->n_channels * sizeof(unsigned int));
return 0;
}
@ -499,6 +504,41 @@ static int parse_channelmap(const char *channelmap, struct channelmap *map)
return 0;
}
static int channelmap_default(struct channelmap *map, int n_channels)
{
switch(n_channels) {
case 1:
parse_channelmap("mono", map);
break;
case 2:
parse_channelmap("stereo", map);
break;
case 3:
parse_channelmap("surround-21", map);
break;
case 4:
parse_channelmap("quad", map);
break;
case 5:
parse_channelmap("surround-50", map);
break;
case 6:
parse_channelmap("surround-51", map);
break;
case 7:
parse_channelmap("surround-70", map);
break;
case 8:
parse_channelmap("surround-71", map);
break;
default:
n_channels = 0;
break;
}
map->n_channels = n_channels;
return 0;
}
static void
target_destroy(struct target *target)
{
@ -1090,18 +1130,19 @@ int main(int argc, char *argv[])
data.channels = data.info.channels;
if (data.channelmap.n_channels == 0) {
if (!sf_command(data.file, SFC_GET_CHANNEL_MAP_INFO,
if (sf_command(data.file, SFC_GET_CHANNEL_MAP_INFO,
data.channelmap.channels,
sizeof(data.channelmap.channels[0]) * data.channels)) {
printf("no channel map, assuming default\n");
data.channelmap.n_channels = 0;
} else {
data.channelmap.n_channels = data.channels;
if (channelmap_from_sf(&data.channelmap) < 0)
data.channelmap.n_channels = 0;
}
if (data.channelmap.n_channels > 0)
if (data.channelmap.n_channels > 0) {
printf("got channel map\n");
} else {
printf("no channel map, assuming default\n");
channelmap_default(&data.channelmap, data.channels);
}
}
}
data.samplesize = sf_format_samplesize(format);
@ -1230,8 +1271,9 @@ int main(int argc, char *argv[])
info = SPA_AUDIO_INFO_RAW_INIT(
.flags = data.channelmap.n_channels ? 0 : SPA_AUDIO_FLAG_UNPOSITIONED,
.format = data.spa_format,
.channels = data.channels,
.rate = data.rate);
.rate = data.rate,
.channels = data.channels);
if (data.channelmap.n_channels)
memcpy(info.position, data.channelmap.channels, data.channels * sizeof(int));