mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

format: add application/control media type

Browse source 
Add a new application/control media type that can be used to negotiate
control streams between ports.
This commit is contained in:
Wim Taymans 2019-09-16 21:09:52 +02:00
parent 565f0475f0
commit 49a5e97d69
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pipewire-jack

@ -1 +1 @@
Subproject commit 1d2db89b9c80153f94ace12572f16678694fafc9
Subproject commit cd2c8ceb3117e362b7abfd6dcd75ab128eb72ea0

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

@ -39,6 +39,7 @@ enum spa_media_type {
SPA_MEDIA_TYPE_image,
SPA_MEDIA_TYPE_binary,
SPA_MEDIA_TYPE_stream,
SPA_MEDIA_TYPE_application,
};
/** media subtype for SPA_TYPE_OBJECT_Format */
@ -82,6 +83,10 @@ enum spa_media_subtype {
SPA_MEDIA_SUBTYPE_START_Stream = 0x50000,
SPA_MEDIA_SUBTYPE_midi,
SPA_MEDIA_SUBTYPE_START_Application = 0x60000,
SPA_MEDIA_SUBTYPE_control, /**< control stream, data contains
* spa_pod_sequence with control info. */
};
/** properties for audio SPA_TYPE_OBJECT_Format */
@ -92,7 +97,7 @@ enum spa_format {
SPA_FORMAT_mediaSubtype, /**< media subtype (Id enum spa_media_subtype) */
/* Audio format keys */
SPA_FORMAT_START_Audio,
SPA_FORMAT_START_Audio = 0x10000,
SPA_FORMAT_AUDIO_format, /**< audio format, (Id enum spa_audio_format) */
SPA_FORMAT_AUDIO_flags, /**< optional flags (Int) */
SPA_FORMAT_AUDIO_rate, /**< sample rate (Int) */
@ -100,7 +105,7 @@ enum spa_format {
SPA_FORMAT_AUDIO_position, /**< channel positions (Id enum spa_audio_position) */
/* Video Format keys */
SPA_FORMAT_START_Video = 0x10000,
SPA_FORMAT_START_Video = 0x20000,
SPA_FORMAT_VIDEO_format, /**< video format (Id enum spa_video_format) */
SPA_FORMAT_VIDEO_size, /**< size (Rectangle) */
SPA_FORMAT_VIDEO_framerate, /**< frame rate (Fraction) */
@ -121,11 +126,13 @@ enum spa_format {
SPA_FORMAT_VIDEO_H264_alignment, /**< (Id enum spa_h264_alignment) */
/* Image Format keys */
SPA_FORMAT_START_Image = 0x20000,
SPA_FORMAT_START_Image = 0x30000,
/* Binary Format keys */
SPA_FORMAT_START_Binary = 0x30000,
SPA_FORMAT_START_Binary = 0x40000,
/* Stream Format keys */
SPA_FORMAT_START_Stream = 0x40000,
SPA_FORMAT_START_Stream = 0x50000,
/* Application Format keys */
SPA_FORMAT_START_Application = 0x60000,
};
#define SPA_KEY_FORMAT_DSP "format.dsp" /**< a predefined DSP format,

3
spa/include/spa/param/type-info.h
View file

@ -150,6 +150,7 @@ static const struct spa_type_info spa_type_media_type[] = {
{ SPA_MEDIA_TYPE_image, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_TYPE_BASE "image", NULL },
{ SPA_MEDIA_TYPE_binary, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_TYPE_BASE "binary", NULL },
{ SPA_MEDIA_TYPE_stream, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_TYPE_BASE "stream", NULL },
{ SPA_MEDIA_TYPE_application, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_TYPE_BASE "application", NULL },
{ 0, 0, NULL, NULL },
};
@ -191,6 +192,8 @@ static const struct spa_type_info spa_type_media_subtype[] = {
{ SPA_MEDIA_SUBTYPE_jpeg, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "jpeg", NULL },
/* stream subtypes */
{ SPA_MEDIA_SUBTYPE_midi, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "midi", NULL },
/* application subtypes */
{ SPA_MEDIA_SUBTYPE_control, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "control", NULL },
{ 0, 0, NULL, NULL },
};