mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-29 05:40:27 -04:00
spa: add definitions for IEC958 (S/PDIF)
Add Format subtype and codec property. Add codecs to include in the format codec property. Add property to configure elements with supported codecs. Add type info.
This commit is contained in:
Wim Taymans
parent
0af0cceca2
commit
8147772cf5
5 changed files with 95 additions and 0 deletions
59
spa/include/spa/param/audio/iec958.h
Normal file
59
spa/include/spa/param/audio/iec958.h
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
/* 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_IEC958_H
|
||||
#define SPA_AUDIO_IEC958_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* \addtogroup spa_param
|
||||
* \{
|
||||
*/
|
||||
enum spa_audio_iec958_codec {
|
||||
SPA_AUDIO_IEC958_CODEC_UNKNOWN,
|
||||
|
||||
SPA_AUDIO_IEC958_CODEC_PCM,
|
||||
SPA_AUDIO_IEC958_CODEC_DTS,
|
||||
SPA_AUDIO_IEC958_CODEC_AC3,
|
||||
SPA_AUDIO_IEC958_CODEC_MPEG, /**< MPEG-1 or MPEG-2 (Part 3, not AAC) */
|
||||
SPA_AUDIO_IEC958_CODEC_MPEG2_AAC, /**< MPEG-2 AAC */
|
||||
|
||||
SPA_AUDIO_IEC958_CODEC_EAC3,
|
||||
|
||||
SPA_AUDIO_IEC958_CODEC_TRUEHD, /**< Dolby TrueHD */
|
||||
SPA_AUDIO_IEC958_CODEC_DTSHD, /**< DTS-HD Master Audio */
|
||||
};
|
||||
|
||||
/**
|
||||
* \}
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* SPA_AUDIO_IEC958_H */
|
||||
|
|
@ -266,6 +266,26 @@ static const struct spa_type_info spa_type_audio_channel[] = {
|
|||
{ 0, 0, NULL, NULL },
|
||||
};
|
||||
|
||||
|
||||
#include <spa/param/audio/iec958.h>
|
||||
|
||||
#define SPA_TYPE_INFO_AudioIEC958Codec SPA_TYPE_INFO_ENUM_BASE "AudioIEC958Codec"
|
||||
#define SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE SPA_TYPE_INFO_AudioIEC958Codec ":"
|
||||
|
||||
static const struct spa_type_info spa_type_audio_iec958_codec[] = {
|
||||
{ SPA_AUDIO_IEC958_CODEC_UNKNOWN, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "UNKNOWN", NULL },
|
||||
{ SPA_AUDIO_IEC958_CODEC_PCM, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "PCM", NULL },
|
||||
{ SPA_AUDIO_IEC958_CODEC_DTS, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "DTS", NULL },
|
||||
{ SPA_AUDIO_IEC958_CODEC_AC3, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "AC3", NULL },
|
||||
{ SPA_AUDIO_IEC958_CODEC_MPEG, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "MPEG", NULL },
|
||||
{ SPA_AUDIO_IEC958_CODEC_MPEG2_AAC, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "MPEG2-AAC", NULL },
|
||||
{ SPA_AUDIO_IEC958_CODEC_EAC3, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "EAC3", NULL },
|
||||
{ SPA_AUDIO_IEC958_CODEC_TRUEHD, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "TrueHD", NULL },
|
||||
{ SPA_AUDIO_IEC958_CODEC_DTSHD, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_IEC958_CODEC_BASE "DTS-HD", NULL },
|
||||
{ 0, 0, NULL, NULL },
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* \}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ enum spa_media_subtype {
|
|||
SPA_MEDIA_SUBTYPE_unknown,
|
||||
SPA_MEDIA_SUBTYPE_raw,
|
||||
SPA_MEDIA_SUBTYPE_dsp,
|
||||
SPA_MEDIA_SUBTYPE_iec958, /** S/PDIF */
|
||||
|
||||
SPA_MEDIA_SUBTYPE_START_Audio = 0x10000,
|
||||
SPA_MEDIA_SUBTYPE_mp3,
|
||||
|
|
@ -110,6 +111,8 @@ 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) */
|
||||
|
||||
/* Video Format keys */
|
||||
SPA_FORMAT_START_Video = 0x20000,
|
||||
SPA_FORMAT_VIDEO_format, /**< video format (Id enum spa_video_format) */
|
||||
|
|
|
|||
|
|
@ -96,6 +96,9 @@ enum spa_prop {
|
|||
SPA_PROP_softVolumes, /**< a volume array, one volume per
|
||||
* channel (Array of Float) */
|
||||
|
||||
SPA_PROP_iec958Codecs, /**< enabled IEC958 (S/PDIF) codecs,
|
||||
* (Array (Id enum spa_audio_iec958_codec) */
|
||||
|
||||
SPA_PROP_START_Video = 0x20000, /**< video related properties */
|
||||
SPA_PROP_brightness,
|
||||
SPA_PROP_contrast,
|
||||
|
|
|
|||
|
|
@ -85,6 +85,11 @@ static const struct spa_type_info spa_type_prop_channel_map[] = {
|
|||
{ 0, 0, NULL, NULL },
|
||||
};
|
||||
|
||||
static const struct spa_type_info spa_type_prop_iec958_codec[] = {
|
||||
{ SPA_PROP_START, SPA_TYPE_Id, SPA_TYPE_INFO_BASE "iec958Codec", spa_type_audio_iec958_codec, },
|
||||
{ 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 },
|
||||
|
|
@ -119,6 +124,7 @@ static const struct spa_type_info spa_type_props[] = {
|
|||
{ SPA_PROP_latencyOffsetNsec, SPA_TYPE_Long, SPA_TYPE_INFO_PROPS_BASE "latencyOffsetNsec", NULL },
|
||||
{ SPA_PROP_softMute, SPA_TYPE_Bool, SPA_TYPE_INFO_PROPS_BASE "softMute", NULL },
|
||||
{ SPA_PROP_softVolumes, SPA_TYPE_Array, SPA_TYPE_INFO_PROPS_BASE "softVolumes", spa_type_prop_float_array },
|
||||
{ SPA_PROP_iec958Codecs, SPA_TYPE_Array, SPA_TYPE_INFO_PROPS_BASE "iec958Codecs", spa_type_prop_iec958_codec },
|
||||
|
||||
{ SPA_PROP_brightness, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "brightness", NULL },
|
||||
{ SPA_PROP_contrast, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "contrast", NULL },
|
||||
|
|
@ -196,6 +202,7 @@ static const struct spa_type_info spa_type_media_subtype[] = {
|
|||
/* generic subtypes */
|
||||
{ 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 },
|
||||
/* 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 },
|
||||
|
|
@ -258,6 +265,9 @@ static const struct spa_type_info spa_type_format[] = {
|
|||
{ SPA_FORMAT_AUDIO_position, SPA_TYPE_Array, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "position",
|
||||
spa_type_prop_channel_map },
|
||||
|
||||
{ SPA_FORMAT_AUDIO_iec958Codec, SPA_TYPE_Id, SPA_TYPE_INFO_FORMAT_AUDIO_BASE "iec958Codec",
|
||||
spa_type_audio_iec958_codec },
|
||||
|
||||
{ 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 },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue