diff --git a/spa/include/spa/param/audio/dsd.h b/spa/include/spa/param/audio/dsd.h new file mode 100644 index 000000000..31ce7314d --- /dev/null +++ b/spa/include/spa/param/audio/dsd.h @@ -0,0 +1,80 @@ +/* Simple Plugin API + * + * 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. + */ + +#ifndef SPA_AUDIO_DSD_H +#define SPA_AUDIO_DSD_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +/** + * \addtogroup spa_param + * \{ + */ + +/** Extra DSD audio flags */ +#define SPA_AUDIO_DSD_FLAG_NONE (0) /*< no valid flag */ + +/* DSD bits are transfered in a buffer grouped in bytes with the bitorder + * defined by \a bitorder. + * + * Channels are placed in separate planes or interleaved using the stride + * field of the buffer. The stride is then the number of bytes grouped per + * channel. + * + * Planar: + * plane1: l1 l2 l3 l4 l5 ... + * plane2: r1 r2 r3 r4 r5 ... + * + * Interleaved stride 4: + * plane1: l1 l2 l3 l4 r1 r2 r3 r4 l5 l6 l7 l8 r5 r6 r7 r8 l9 ... + * + * Interleaved stride 2: + * plane1: l1 l2 r1 r2 l3 l4 r3 r4 ... + */ +struct spa_audio_info_dsd { + enum spa_param_bitorder bitorder; /*< the order of the bits */ + uint32_t flags; /*< extra flags */ + uint32_t rate; /*< sample rate */ + uint32_t channels; /*< channels */ + uint32_t position[SPA_AUDIO_MAX_CHANNELS]; /*< channel position from enum spa_audio_channel */ +}; + +#define SPA_AUDIO_INFO_DSD_INIT(...) (struct spa_audio_info_dsd) { __VA_ARGS__ } + +/** + * \} + */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* SPA_AUDIO_DSD_H */ diff --git a/spa/include/spa/param/audio/format-utils.h b/spa/include/spa/param/audio/format-utils.h index 80e84f2ba..98ff605b2 100644 --- a/spa/include/spa/param/audio/format-utils.h +++ b/spa/include/spa/param/audio/format-utils.h @@ -79,6 +79,25 @@ spa_format_audio_iec958_parse(const struct spa_pod *format, struct spa_audio_inf return res; } +static inline int +spa_format_audio_dsd_parse(const struct spa_pod *format, struct spa_audio_info_dsd *info) +{ + struct spa_pod *position = NULL; + int res; + info->flags = 0; + res = spa_pod_parse_object(format, + SPA_TYPE_OBJECT_Format, NULL, + SPA_FORMAT_AUDIO_bitorder, SPA_POD_Id(&info->bitorder), + SPA_FORMAT_AUDIO_rate, SPA_POD_Int(&info->rate), + SPA_FORMAT_AUDIO_channels, SPA_POD_Int(&info->channels), + SPA_FORMAT_AUDIO_position, SPA_POD_OPT_Pod(&position)); + if (position == NULL || + !spa_pod_copy_array(position, SPA_TYPE_Id, info->position, SPA_AUDIO_MAX_CHANNELS)) + SPA_FLAG_SET(info->flags, SPA_AUDIO_FLAG_UNPOSITIONED); + + return res; +} + static inline struct spa_pod * spa_format_audio_raw_build(struct spa_pod_builder *builder, uint32_t id, struct spa_audio_info_raw *info) { @@ -139,6 +158,32 @@ spa_format_audio_iec958_build(struct spa_pod_builder *builder, uint32_t id, stru SPA_FORMAT_AUDIO_rate, SPA_POD_Int(info->rate), 0); return (struct spa_pod*)spa_pod_builder_pop(builder, &f); } + +static inline struct spa_pod * +spa_format_audio_dsd_build(struct spa_pod_builder *builder, uint32_t id, struct spa_audio_info_dsd *info) +{ + struct spa_pod_frame f; + spa_pod_builder_push_object(builder, &f, SPA_TYPE_OBJECT_Format, id); + spa_pod_builder_add(builder, + SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), + SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_dsd), + SPA_FORMAT_AUDIO_bitorder, SPA_POD_Id(info->bitorder), + 0); + if (info->rate != 0) + spa_pod_builder_add(builder, + SPA_FORMAT_AUDIO_rate, SPA_POD_Int(info->rate), 0); + if (info->channels != 0) { + spa_pod_builder_add(builder, + SPA_FORMAT_AUDIO_channels, SPA_POD_Int(info->channels), 0); + if (!SPA_FLAG_IS_SET(info->flags, SPA_AUDIO_FLAG_UNPOSITIONED)) { + spa_pod_builder_add(builder, SPA_FORMAT_AUDIO_position, + SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, + info->channels, info->position), 0); + } + } + return (struct spa_pod*)spa_pod_builder_pop(builder, &f); +} + /** * \} */ diff --git a/spa/include/spa/param/audio/format.h b/spa/include/spa/param/audio/format.h index 0cce49bb9..ed3f13cbb 100644 --- a/spa/include/spa/param/audio/format.h +++ b/spa/include/spa/param/audio/format.h @@ -37,6 +37,7 @@ extern "C" { #include #include #include +#include struct spa_audio_info { uint32_t media_type; @@ -45,6 +46,7 @@ struct spa_audio_info { struct spa_audio_info_raw raw; struct spa_audio_info_dsp dsp; struct spa_audio_info_iec958 iec958; + struct spa_audio_info_dsd dsd; } info; }; diff --git a/spa/include/spa/param/audio/type-info.h b/spa/include/spa/param/audio/type-info.h index c8d64f22b..f8a29d9df 100644 --- a/spa/include/spa/param/audio/type-info.h +++ b/spa/include/spa/param/audio/type-info.h @@ -285,7 +285,6 @@ static const struct spa_type_info spa_type_audio_iec958_codec[] = { { 0, 0, NULL, NULL }, }; - /** * \} */ diff --git a/spa/include/spa/param/format.h b/spa/include/spa/param/format.h index d95ca326d..b2e91f272 100644 --- a/spa/include/spa/param/format.h +++ b/spa/include/spa/param/format.h @@ -53,6 +53,7 @@ enum spa_media_subtype { SPA_MEDIA_SUBTYPE_raw, SPA_MEDIA_SUBTYPE_dsp, SPA_MEDIA_SUBTYPE_iec958, /** S/PDIF */ + SPA_MEDIA_SUBTYPE_dsd, SPA_MEDIA_SUBTYPE_START_Audio = 0x10000, SPA_MEDIA_SUBTYPE_mp3, @@ -111,7 +112,9 @@ enum spa_format { SPA_FORMAT_AUDIO_channels, /**< number of audio channels (Int) */ SPA_FORMAT_AUDIO_position, /**< channel positions (Id enum spa_audio_position) */ - SPA_FORMAT_AUDIO_iec958Codec, /**< codec used (IEC958) (Id enum spa_audio_iec958_codec) */ + SPA_FORMAT_AUDIO_iec958Codec, /**< codec used (IEC958) (Id enum spa_audio_iec958_codec) */ + + SPA_FORMAT_AUDIO_bitorder, /**< bit order (Id enum spa_param_bitorder) */ /* Video Format keys */ SPA_FORMAT_START_Video = 0x20000, diff --git a/spa/include/spa/param/param.h b/spa/include/spa/param/param.h index e2c3c5c8a..4921439c3 100644 --- a/spa/include/spa/param/param.h +++ b/spa/include/spa/param/param.h @@ -194,6 +194,11 @@ enum spa_param_process_latency { SPA_PARAM_PROCESS_LATENCY_ns, /**< latency (Long) in nanoseconds */ }; +enum spa_param_bitorder { + SPA_PARAM_BITORDER_msb, /**< most significant bit */ + SPA_PARAM_BITORDER_lsb, /**< least significant bit */ +}; + /** * \} */ diff --git a/spa/include/spa/param/type-info.h b/spa/include/spa/param/type-info.h index 483c5b75b..2591154d7 100644 --- a/spa/include/spa/param/type-info.h +++ b/spa/include/spa/param/type-info.h @@ -90,6 +90,15 @@ static const struct spa_type_info spa_type_prop_iec958_codec[] = { { 0, 0, NULL, NULL }, }; +#define SPA_TYPE_INFO_ParamBitorder SPA_TYPE_INFO_ENUM_BASE "ParamBitorder" +#define SPA_TYPE_INFO_PARAM_BITORDER_BASE SPA_TYPE_INFO_ParamBitorder ":" + +static const struct spa_type_info spa_type_param_bitorder[] = { + { SPA_PARAM_BITORDER_msb, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_BITORDER_BASE "msb", NULL }, + { SPA_PARAM_BITORDER_lsb, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_BITORDER_BASE "lsb", NULL }, + { 0, 0, NULL, NULL }, +}; + static const struct spa_type_info spa_type_props[] = { { SPA_PROP_START, SPA_TYPE_Id, SPA_TYPE_INFO_PROPS_BASE, spa_type_param, }, { SPA_PROP_unknown, SPA_TYPE_None, SPA_TYPE_INFO_PROPS_BASE "unknown", NULL }, @@ -203,6 +212,7 @@ static const struct spa_type_info spa_type_media_subtype[] = { { SPA_MEDIA_SUBTYPE_raw, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "raw", NULL }, { SPA_MEDIA_SUBTYPE_dsp, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "dsp", NULL }, { SPA_MEDIA_SUBTYPE_iec958, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "iec958", NULL }, + { SPA_MEDIA_SUBTYPE_dsd, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "dsd", NULL }, /* audio subtypes */ { SPA_MEDIA_SUBTYPE_mp3, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mp3", NULL }, { SPA_MEDIA_SUBTYPE_aac, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "aac", NULL }, @@ -268,6 +278,9 @@ static const struct spa_type_info spa_type_format[] = { { SPA_FORMAT_AUDIO_iec958Codec, SPA_TYPE_Id, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "iec958Codec", spa_type_audio_iec958_codec }, + { SPA_FORMAT_AUDIO_bitorder, SPA_TYPE_Id, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "bitorder", + spa_type_param_bitorder }, + { SPA_FORMAT_VIDEO_format, SPA_TYPE_Id, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "format", spa_type_video_format, }, { SPA_FORMAT_VIDEO_modifier, SPA_TYPE_Long, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "modifier", NULL },