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

spa: add WMA type

Browse source
This commit is contained in:
Wim Taymans 2023-01-13 13:10:06 +01:00 • committed by Wim Taymans
parent d24b3f29b2
commit 6c962d8258
8 changed files with 230 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spa/include/spa/param/audio/format-utils.h
View file

@ -41,6 +41,7 @@ extern "C" {
#include <spa/param/audio/mp3-utils.h>
#include <spa/param/audio/aac-utils.h>
#include <spa/param/audio/vorbis-utils.h>
#include <spa/param/audio/wma-utils.h>
/**
@ -74,6 +75,8 @@ spa_format_audio_parse(const struct spa_pod *format, struct spa_audio_info *info
return spa_format_audio_aac_parse(format, &info->info.aac);
case SPA_MEDIA_SUBTYPE_vorbis:
return spa_format_audio_vorbis_parse(format, &info->info.vorbis);
case SPA_MEDIA_SUBTYPE_wma:
return spa_format_audio_wma_parse(format, &info->info.wma);
}
return -ENOTSUP;
}
@ -96,6 +99,8 @@ spa_format_audio_build(struct spa_pod_builder *builder, uint32_t id, struct spa_
return spa_format_audio_aac_build(builder, id, &info->info.aac);
case SPA_MEDIA_SUBTYPE_vorbis:
return spa_format_audio_vorbis_build(builder, id, &info->info.vorbis);
case SPA_MEDIA_SUBTYPE_wma:
return spa_format_audio_wma_build(builder, id, &info->info.wma);
}
errno = ENOTSUP;
return NULL;

2
spa/include/spa/param/audio/format.h
View file

@ -42,6 +42,7 @@ extern "C" {
#include <spa/param/audio/mp3.h>
#include <spa/param/audio/aac.h>
#include <spa/param/audio/vorbis.h>
#include <spa/param/audio/wma.h>
struct spa_audio_info {
uint32_t media_type;
@ -54,6 +55,7 @@ struct spa_audio_info {
struct spa_audio_info_mp3 mp3;
struct spa_audio_info_aac aac;
struct spa_audio_info_vorbis vorbis;
struct spa_audio_info_wma wma;
} info;
};

1
spa/include/spa/param/audio/type-info.h
View file

@ -29,5 +29,6 @@
#include <spa/param/audio/iec958-types.h>
#include <spa/param/audio/mp3-types.h>
#include <spa/param/audio/aac-types.h>
#include <spa/param/audio/wma-types.h>
#endif /* SPA_AUDIO_TYPES_H */

57
spa/include/spa/param/audio/wma-types.h Normal file
View file

@ -0,0 +1,57 @@
/* Simple Plugin API
*
* Copyright © 2018 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_WMA_TYPES_H
#define SPA_AUDIO_WMA_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif
#include <spa/utils/type.h>
#include <spa/param/audio/wma.h>
#define SPA_TYPE_INFO_AudioWMAProfile SPA_TYPE_INFO_ENUM_BASE "AudioWMAProfile"
#define SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE SPA_TYPE_INFO_AudioWMAProfile ":"
static const struct spa_type_info spa_type_audio_wma_profile[] = {
{ SPA_AUDIO_WMA_PROFILE_UNKNOWN, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE "UNKNOWN", NULL },
{ SPA_AUDIO_WMA_PROFILE_WMA7, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE "WMA7", NULL },
{ SPA_AUDIO_WMA_PROFILE_WMA8, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE "WMA8", NULL },
{ SPA_AUDIO_WMA_PROFILE_WMA9, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE "WMA9", NULL },
{ SPA_AUDIO_WMA_PROFILE_WMA10, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE "WMA10", NULL },
{ SPA_AUDIO_WMA_PROFILE_WMA9_PRO, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE "WMA9-Pro", NULL },
{ SPA_AUDIO_WMA_PROFILE_WMA9_LOSSLESS, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE "WMA9-Lossless", NULL },
{ SPA_AUDIO_WMA_PROFILE_WMA10_LOSSLESS, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_WMA_PROFILE_BASE "WMA10-Lossless", NULL },
{ 0, 0, NULL, NULL },
};
/**
* \}
*/
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* SPA_AUDIO_WMA_TYPES_H */

92
spa/include/spa/param/audio/wma-utils.h Normal file
View file

@ -0,0 +1,92 @@
/* Simple Plugin API
*
* Copyright © 2023 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_WMA_UTILS_H
#define SPA_AUDIO_WMA_UTILS_H
#ifdef __cplusplus
extern "C" {
#endif
/**
* \addtogroup spa_param
* \{
*/
#include <spa/pod/parser.h>
#include <spa/pod/builder.h>
#include <spa/param/audio/format.h>
#include <spa/param/format-utils.h>
static inline int
spa_format_audio_wma_parse(const struct spa_pod *format, struct spa_audio_info_wma *info)
{
int res;
res = spa_pod_parse_object(format,
SPA_TYPE_OBJECT_Format, NULL,
SPA_FORMAT_AUDIO_rate, SPA_POD_OPT_Int(&info->rate),
SPA_FORMAT_AUDIO_channels, SPA_POD_OPT_Int(&info->channels),
SPA_FORMAT_AUDIO_bitrate, SPA_POD_OPT_Int(&info->bitrate),
SPA_FORMAT_AUDIO_blockAlign, SPA_POD_OPT_Int(&info->block_align),
SPA_FORMAT_AUDIO_WMA_profile, SPA_POD_OPT_Id(&info->profile));
return res;
}
static inline struct spa_pod *
spa_format_audio_wma_build(struct spa_pod_builder *builder, uint32_t id, struct spa_audio_info_wma *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_wma),
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 (info->bitrate != 0)
spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_bitrate, SPA_POD_Int(info->bitrate), 0);
if (info->block_align != 0)
spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_blockAlign, SPA_POD_Int(info->block_align), 0);
if (info->profile != 0)
spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_WMA_profile, SPA_POD_Id(info->profile), 0);
return (struct spa_pod*)spa_pod_builder_pop(builder, &f);
}
/**
* \}
*/
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* SPA_AUDIO_WMA_UTILS_H */

67
spa/include/spa/param/audio/wma.h Normal file
View file

@ -0,0 +1,67 @@
/* Simple Plugin API
*
* Copyright © 2023 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_WMA_H
#define SPA_AUDIO_WMA_H
#ifdef __cplusplus
extern "C" {
#endif
#include <spa/param/audio/raw.h>
enum spa_audio_wma_profile {
SPA_AUDIO_WMA_PROFILE_UNKNOWN,
SPA_AUDIO_WMA_PROFILE_WMA7,
SPA_AUDIO_WMA_PROFILE_WMA8,
SPA_AUDIO_WMA_PROFILE_WMA9,
SPA_AUDIO_WMA_PROFILE_WMA10,
SPA_AUDIO_WMA_PROFILE_WMA9_PRO,
SPA_AUDIO_WMA_PROFILE_WMA9_LOSSLESS,
SPA_AUDIO_WMA_PROFILE_WMA10_LOSSLESS,
SPA_AUDIO_WMA_PROFILE_CUSTOM = 0x10000,
};
struct spa_audio_info_wma {
uint32_t rate; /*< sample rate */
uint32_t channels; /*< number of channels */
uint32_t bitrate; /*< stream bitrate */
uint32_t block_align; /*< block alignment */
enum spa_audio_wma_profile profile; /*< WMA profile */
};
#define SPA_AUDIO_INFO_WMA_INIT(...) ((struct spa_audio_info_wma) { __VA_ARGS__ })
/**
* \}
*/
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* SPA_AUDIO_WMA_H */

4
spa/include/spa/param/format-types.h
View file

@ -108,6 +108,8 @@ static const struct spa_type_info spa_type_media_subtype[] = {
#define SPA_TYPE_INFO_FORMAT_AUDIO_AAC SPA_TYPE_INFO_FORMAT_AUDIO_BASE "AAC"
#define SPA_TYPE_INFO_FORMAT_AUDIO_AAC_BASE SPA_TYPE_INFO_FORMAT_AUDIO_AAC ":"
#define SPA_TYPE_INFO_FORMAT_AUDIO_WMA SPA_TYPE_INFO_FORMAT_AUDIO_BASE "WMA"
#define SPA_TYPE_INFO_FORMAT_AUDIO_WMA_BASE SPA_TYPE_INFO_FORMAT_AUDIO_WMA ":"
#define SPA_TYPE_INFO_FormatVideo SPA_TYPE_INFO_FORMAT_BASE "Video"
#define SPA_TYPE_INFO_FORMAT_VIDEO_BASE SPA_TYPE_INFO_FormatVideo ":"
@ -143,6 +145,8 @@ static const struct spa_type_info spa_type_format[] = {
{ SPA_FORMAT_AUDIO_AAC_streamFormat, SPA_TYPE_Id, SPA_TYPE_INFO_FORMAT_AUDIO_AAC_BASE "streamFormat",
spa_type_audio_aac_stream_format },
{ SPA_FORMAT_AUDIO_WMA_profile, SPA_TYPE_Id, SPA_TYPE_INFO_FORMAT_AUDIO_WMA_BASE "profile",
spa_type_audio_wma_profile },
{ SPA_FORMAT_VIDEO_format, SPA_TYPE_Id, SPA_TYPE_INFO_FORMAT_VIDEO_BASE "format",
spa_type_video_format, },

2
spa/include/spa/param/format.h
View file

@ -121,6 +121,8 @@ enum spa_format {
SPA_FORMAT_AUDIO_AAC_streamFormat, /**< AAC stream format, (Id enum spa_audio_aac_stream_format) */
SPA_FORMAT_AUDIO_WMA_profile, /**< WMA profile (Id enum spa_audio_wma_profile) */
/* Video Format keys */
SPA_FORMAT_START_Video = 0x20000,