mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-15 07:00:05 -05:00
spa: add mp3 type
This commit is contained in:
Wim Taymans
Wim Taymans
parent
9e0a7c26f7
commit
844a3d8534
6 changed files with 198 additions and 0 deletions
|
|
@ -38,6 +38,7 @@ extern "C" {
|
||||||
#include <spa/param/audio/dsp-utils.h>
|
#include <spa/param/audio/dsp-utils.h>
|
||||||
#include <spa/param/audio/iec958-utils.h>
|
#include <spa/param/audio/iec958-utils.h>
|
||||||
#include <spa/param/audio/dsd-utils.h>
|
#include <spa/param/audio/dsd-utils.h>
|
||||||
|
#include <spa/param/audio/mp3-utils.h>
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -65,6 +66,8 @@ spa_format_audio_parse(const struct spa_pod *format, struct spa_audio_info *info
|
||||||
return spa_format_audio_iec958_parse(format, &info->info.iec958);
|
return spa_format_audio_iec958_parse(format, &info->info.iec958);
|
||||||
case SPA_MEDIA_SUBTYPE_dsd:
|
case SPA_MEDIA_SUBTYPE_dsd:
|
||||||
return spa_format_audio_dsd_parse(format, &info->info.dsd);
|
return spa_format_audio_dsd_parse(format, &info->info.dsd);
|
||||||
|
case SPA_MEDIA_SUBTYPE_mp3:
|
||||||
|
return spa_format_audio_mp3_parse(format, &info->info.mp3);
|
||||||
}
|
}
|
||||||
return -ENOTSUP;
|
return -ENOTSUP;
|
||||||
}
|
}
|
||||||
|
|
@ -81,6 +84,8 @@ spa_format_audio_build(struct spa_pod_builder *builder, uint32_t id, struct spa_
|
||||||
return spa_format_audio_iec958_build(builder, id, &info->info.iec958);
|
return spa_format_audio_iec958_build(builder, id, &info->info.iec958);
|
||||||
case SPA_MEDIA_SUBTYPE_dsd:
|
case SPA_MEDIA_SUBTYPE_dsd:
|
||||||
return spa_format_audio_dsd_build(builder, id, &info->info.dsd);
|
return spa_format_audio_dsd_build(builder, id, &info->info.dsd);
|
||||||
|
case SPA_MEDIA_SUBTYPE_mp3:
|
||||||
|
return spa_format_audio_mp3_build(builder, id, &info->info.mp3);
|
||||||
}
|
}
|
||||||
errno = ENOTSUP;
|
errno = ENOTSUP;
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ extern "C" {
|
||||||
#include <spa/param/audio/dsp.h>
|
#include <spa/param/audio/dsp.h>
|
||||||
#include <spa/param/audio/iec958.h>
|
#include <spa/param/audio/iec958.h>
|
||||||
#include <spa/param/audio/dsd.h>
|
#include <spa/param/audio/dsd.h>
|
||||||
|
#include <spa/param/audio/mp3.h>
|
||||||
|
|
||||||
struct spa_audio_info {
|
struct spa_audio_info {
|
||||||
uint32_t media_type;
|
uint32_t media_type;
|
||||||
|
|
@ -48,6 +49,7 @@ struct spa_audio_info {
|
||||||
struct spa_audio_info_dsp dsp;
|
struct spa_audio_info_dsp dsp;
|
||||||
struct spa_audio_info_iec958 iec958;
|
struct spa_audio_info_iec958 iec958;
|
||||||
struct spa_audio_info_dsd dsd;
|
struct spa_audio_info_dsd dsd;
|
||||||
|
struct spa_audio_info_mp3 mp3;
|
||||||
} info;
|
} info;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
54
spa/include/spa/param/audio/mp3-types.h
Normal file
54
spa/include/spa/param/audio/mp3-types.h
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
/* 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_MP3_TYPES_H
|
||||||
|
#define SPA_AUDIO_MP3_TYPES_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <spa/utils/type.h>
|
||||||
|
#include <spa/param/audio/mp3.h>
|
||||||
|
|
||||||
|
#define SPA_TYPE_INFO_AudioMP3ChannelMode SPA_TYPE_INFO_ENUM_BASE "AudioMP3ChannelMode"
|
||||||
|
#define SPA_TYPE_INFO_AUDIO_MP3_CHANNEL_MODE_BASE SPA_TYPE_INFO_AudioMP3ChannelMode ":"
|
||||||
|
|
||||||
|
static const struct spa_type_info spa_type_audio_mp3_channel_mode[] = {
|
||||||
|
{ SPA_AUDIO_MP3_CHANNEL_MODE_UNKNOWN, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_MP3_CHANNEL_MODE_BASE "UNKNOWN", NULL },
|
||||||
|
{ SPA_AUDIO_MP3_CHANNEL_MODE_MONO, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_MP3_CHANNEL_MODE_BASE "Mono", NULL },
|
||||||
|
{ SPA_AUDIO_MP3_CHANNEL_MODE_STEREO, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_MP3_CHANNEL_MODE_BASE "Stereo", NULL },
|
||||||
|
{ SPA_AUDIO_MP3_CHANNEL_MODE_JOINTSTEREO, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_MP3_CHANNEL_MODE_BASE "Joint-stereo", NULL },
|
||||||
|
{ SPA_AUDIO_MP3_CHANNEL_MODE_DUAL, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_MP3_CHANNEL_MODE_BASE "Dual", NULL },
|
||||||
|
{ 0, 0, NULL, NULL },
|
||||||
|
};
|
||||||
|
/**
|
||||||
|
* \}
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* SPA_AUDIO_MP3_TYPES_H */
|
||||||
79
spa/include/spa/param/audio/mp3-utils.h
Normal file
79
spa/include/spa/param/audio/mp3-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_MP3_UTILS_H
|
||||||
|
#define SPA_AUDIO_MP3_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_mp3_parse(const struct spa_pod *format, struct spa_audio_info_mp3 *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_mp3_build(struct spa_pod_builder *builder, uint32_t id, struct spa_audio_info_mp3 *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_mp3),
|
||||||
|
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_MP3_UTILS_H */
|
||||||
57
spa/include/spa/param/audio/mp3.h
Normal file
57
spa/include/spa/param/audio/mp3.h
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
/* 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_MP3_H
|
||||||
|
#define SPA_AUDIO_MP3_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <spa/param/audio/raw.h>
|
||||||
|
|
||||||
|
enum spa_audio_mp3_channel_mode {
|
||||||
|
SPA_AUDIO_MP3_CHANNEL_MODE_UNKNOWN,
|
||||||
|
SPA_AUDIO_MP3_CHANNEL_MODE_MONO,
|
||||||
|
SPA_AUDIO_MP3_CHANNEL_MODE_STEREO,
|
||||||
|
SPA_AUDIO_MP3_CHANNEL_MODE_JOINTSTEREO,
|
||||||
|
SPA_AUDIO_MP3_CHANNEL_MODE_DUAL,
|
||||||
|
};
|
||||||
|
|
||||||
|
struct spa_audio_info_mp3 {
|
||||||
|
uint32_t rate; /*< sample rate */
|
||||||
|
uint32_t channels; /*< number of channels */
|
||||||
|
};
|
||||||
|
|
||||||
|
#define SPA_AUDIO_INFO_MP3_INIT(...) ((struct spa_audio_info_mp3) { __VA_ARGS__ })
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \}
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* SPA_AUDIO_MP3_H */
|
||||||
|
|
@ -27,5 +27,6 @@
|
||||||
|
|
||||||
#include <spa/param/audio/raw-types.h>
|
#include <spa/param/audio/raw-types.h>
|
||||||
#include <spa/param/audio/iec958-types.h>
|
#include <spa/param/audio/iec958-types.h>
|
||||||
|
#include <spa/param/audio/mp3-types.h>
|
||||||
|
|
||||||
#endif /* SPA_AUDIO_TYPES_H */
|
#endif /* SPA_AUDIO_TYPES_H */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue