mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-10 13:30:05 -05:00
spa: add APE format
This commit is contained in:
Wim Taymans
Wim Taymans
parent
e535d4c6c4
commit
b66b9f70c4
6 changed files with 137 additions and 0 deletions
79
spa/include/spa/param/audio/ape-utils.h
Normal file
79
spa/include/spa/param/audio/ape-utils.h
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
/* 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_APE_UTILS_H
|
||||
#define SPA_AUDIO_APE_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_ape_parse(const struct spa_pod *format, struct spa_audio_info_ape *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));
|
||||
return res;
|
||||
}
|
||||
|
||||
static inline struct spa_pod *
|
||||
spa_format_audio_ape_build(struct spa_pod_builder *builder, uint32_t id, struct spa_audio_info_ape *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_ape),
|
||||
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);
|
||||
return (struct spa_pod*)spa_pod_builder_pop(builder, &f);
|
||||
}
|
||||
|
||||
/**
|
||||
* \}
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* SPA_AUDIO_APE_UTILS_H */
|
||||
49
spa/include/spa/param/audio/ape.h
Normal file
49
spa/include/spa/param/audio/ape.h
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
/* 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_APE_H
|
||||
#define SPA_AUDIO_APE_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <spa/param/audio/raw.h>
|
||||
|
||||
struct spa_audio_info_ape {
|
||||
uint32_t rate; /*< sample rate */
|
||||
uint32_t channels; /*< number of channels */
|
||||
};
|
||||
|
||||
#define SPA_AUDIO_INFO_APE_INIT(...) ((struct spa_audio_info_ape) { __VA_ARGS__ })
|
||||
|
||||
/**
|
||||
* \}
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* SPA_AUDIO_APE_H */
|
||||
|
|
@ -46,6 +46,7 @@ extern "C" {
|
|||
#include <spa/param/audio/amr-utils.h>
|
||||
#include <spa/param/audio/alac-utils.h>
|
||||
#include <spa/param/audio/flac-utils.h>
|
||||
#include <spa/param/audio/ape-utils.h>
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -89,6 +90,8 @@ spa_format_audio_parse(const struct spa_pod *format, struct spa_audio_info *info
|
|||
return spa_format_audio_alac_parse(format, &info->info.alac);
|
||||
case SPA_MEDIA_SUBTYPE_flac:
|
||||
return spa_format_audio_flac_parse(format, &info->info.flac);
|
||||
case SPA_MEDIA_SUBTYPE_ape:
|
||||
return spa_format_audio_ape_parse(format, &info->info.ape);
|
||||
}
|
||||
return -ENOTSUP;
|
||||
}
|
||||
|
|
@ -121,6 +124,8 @@ spa_format_audio_build(struct spa_pod_builder *builder, uint32_t id, struct spa_
|
|||
return spa_format_audio_alac_build(builder, id, &info->info.alac);
|
||||
case SPA_MEDIA_SUBTYPE_flac:
|
||||
return spa_format_audio_flac_build(builder, id, &info->info.flac);
|
||||
case SPA_MEDIA_SUBTYPE_ape:
|
||||
return spa_format_audio_ape_build(builder, id, &info->info.ape);
|
||||
}
|
||||
errno = ENOTSUP;
|
||||
return NULL;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ extern "C" {
|
|||
#include <spa/param/audio/amr.h>
|
||||
#include <spa/param/audio/alac.h>
|
||||
#include <spa/param/audio/flac.h>
|
||||
#include <spa/param/audio/ape.h>
|
||||
|
||||
struct spa_audio_info {
|
||||
uint32_t media_type;
|
||||
|
|
@ -64,6 +65,7 @@ struct spa_audio_info {
|
|||
struct spa_audio_info_amr amr;
|
||||
struct spa_audio_info_alac alac;
|
||||
struct spa_audio_info_flac flac;
|
||||
struct spa_audio_info_ape ape;
|
||||
} info;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ static const struct spa_type_info spa_type_media_subtype[] = {
|
|||
{ SPA_MEDIA_SUBTYPE_gsm, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "gsm", NULL },
|
||||
{ SPA_MEDIA_SUBTYPE_alac, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "alac", NULL },
|
||||
{ SPA_MEDIA_SUBTYPE_flac, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "flac", NULL },
|
||||
{ SPA_MEDIA_SUBTYPE_ape, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "ape", NULL },
|
||||
/* video subtypes */
|
||||
{ SPA_MEDIA_SUBTYPE_h264, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "h264", NULL },
|
||||
{ SPA_MEDIA_SUBTYPE_mjpg, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mjpg", NULL },
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ enum spa_media_subtype {
|
|||
SPA_MEDIA_SUBTYPE_gsm,
|
||||
SPA_MEDIA_SUBTYPE_alac, /** since 0.3.65 */
|
||||
SPA_MEDIA_SUBTYPE_flac, /** since 0.3.65 */
|
||||
SPA_MEDIA_SUBTYPE_ape, /** since 0.3.65 */
|
||||
|
||||
SPA_MEDIA_SUBTYPE_START_Video = 0x20000,
|
||||
SPA_MEDIA_SUBTYPE_h264,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue