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

Fix up audio formats as well

Browse source
This commit is contained in:
Wim Taymans 2016-08-26 19:22:50 +02:00
parent b67c216a04
commit a973007a49
12 changed files with 82 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/include/spa/audio/format.h
View file

@ -27,7 +27,7 @@ extern "C" {
#include <spa/format.h>
#include <spa/audio/raw.h>
typedef struct _SpaAudioRawFormat SpaAudioRawFormat;
typedef struct _SpaFormatAudio SpaFormatAudio;
typedef enum {
SPA_PROP_ID_AUDIO_FORMAT = SPA_PROP_ID_MEDIA_CUSTOM_START,
@ -43,14 +43,18 @@ SpaResult spa_prop_info_fill_audio (SpaPropInfo *info,
SpaPropIdAudio id,
size_t offset);
struct _SpaAudioRawFormat {
struct _SpaFormatAudio {
SpaFormat format;
SpaAudioRawInfo info;
union {
SpaAudioInfoRaw raw;
} info;
};
SpaResult spa_audio_raw_format_init (SpaAudioRawFormat *format);
SpaResult spa_audio_raw_format_parse (const SpaFormat *format,
SpaAudioRawFormat *rawformat);
SpaResult spa_format_audio_init (SpaMediaType type,
SpaMediaSubType subtype,
SpaFormatAudio *format);
SpaResult spa_format_audio_parse (const SpaFormat *format,
SpaFormatAudio *aformat);
#ifdef __cplusplus
} /* extern "C" */

6
spa/include/spa/audio/raw.h
View file

@ -24,7 +24,7 @@
extern "C" {
#endif
typedef struct _SpaAudioRawInfo SpaAudioRawInfo;
typedef struct _SpaAudioInfoRaw SpaAudioInfoRaw;
#include <endian.h>
@ -121,7 +121,7 @@ typedef enum {
} SpaAudioLayout;
/**
* SpaAudioRawInfo:
* SpaAudioInfoRaw:
* @format: the format
* @flags: extra flags
* @layout: the sample layout
@ -129,7 +129,7 @@ typedef enum {
* @channels: the number of channels
* @channel_mask: the channel mask
*/
struct _SpaAudioRawInfo {
struct _SpaAudioInfoRaw {
SpaAudioFormat format;
SpaAudioFlags flags;
SpaAudioLayout layout;

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

@ -54,6 +54,8 @@ typedef enum {
SPA_MEDIA_SUBTYPE_VP9 = 13,
SPA_MEDIA_SUBTYPE_JPEG = 14,
SPA_MEDIA_SUBTYPE_BAYER = 15,
SPA_MEDIA_SUBTYPE_MP3 = 16,
SPA_MEDIA_SUBTYPE_AAC = 17,
} SpaMediaSubType;
/**