mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-29 05:40:27 -04:00
uri -> type
Clean up some more types.
This commit is contained in:
Wim Taymans
parent
5825c62d6d
commit
25b7ede0bc
46 changed files with 276 additions and 256 deletions
|
|
@ -33,13 +33,13 @@ spa_format_audio_parse (const SpaFormat *format,
|
|||
static SpaTypeMediaType media_type = { 0, };
|
||||
static SpaTypeMediaSubtype media_subtype = { 0, };
|
||||
static SpaTypeMediaSubtypeAudio media_subtype_audio = { 0, };
|
||||
static SpaTypePropAudio prop_audio = { 0, };
|
||||
static SpaTypeFormatAudio format_audio = { 0, };
|
||||
SpaTypeMap *map = spa_type_map_get_default();
|
||||
|
||||
spa_type_media_type_map (map, &media_type);
|
||||
spa_type_media_subtype_map (map, &media_subtype);
|
||||
spa_type_media_subtype_audio_map (map, &media_subtype_audio);
|
||||
spa_type_prop_audio_map (map, &prop_audio);
|
||||
spa_type_format_audio_map (map, &format_audio);
|
||||
|
||||
if (format->body.media_type.value != media_type.audio)
|
||||
return SPA_RESULT_INVALID_MEDIA_TYPE;
|
||||
|
|
@ -49,12 +49,12 @@ spa_format_audio_parse (const SpaFormat *format,
|
|||
|
||||
if (info->media_subtype == media_subtype.raw) {
|
||||
spa_format_query (format,
|
||||
prop_audio.format, SPA_POD_TYPE_URI, &info->info.raw.format,
|
||||
prop_audio.flags, SPA_POD_TYPE_INT, &info->info.raw.flags,
|
||||
prop_audio.layout, SPA_POD_TYPE_INT, &info->info.raw.layout,
|
||||
prop_audio.rate, SPA_POD_TYPE_INT, &info->info.raw.rate,
|
||||
prop_audio.channels, SPA_POD_TYPE_INT, &info->info.raw.channels,
|
||||
prop_audio.channel_mask, SPA_POD_TYPE_INT, &info->info.raw.channel_mask,
|
||||
format_audio.format, SPA_POD_TYPE_ID, &info->info.raw.format,
|
||||
format_audio.flags, SPA_POD_TYPE_INT, &info->info.raw.flags,
|
||||
format_audio.layout, SPA_POD_TYPE_INT, &info->info.raw.layout,
|
||||
format_audio.rate, SPA_POD_TYPE_INT, &info->info.raw.rate,
|
||||
format_audio.channels, SPA_POD_TYPE_INT, &info->info.raw.channels,
|
||||
format_audio.channel_mask, SPA_POD_TYPE_INT, &info->info.raw.channel_mask,
|
||||
0);
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ struct pod_type_name {
|
|||
{ "invalid", "*Invalid*" },
|
||||
{ "none", "None" },
|
||||
{ "bool", "Bool" },
|
||||
{ "uri", "URI" },
|
||||
{ "id", "Id" },
|
||||
{ "int", "Int" },
|
||||
{ "long", "Long" },
|
||||
{ "float", "Float" },
|
||||
|
|
@ -213,8 +213,8 @@ print_pod_value (uint32_t size, uint32_t type, void *body, int prefix)
|
|||
case SPA_POD_TYPE_BOOL:
|
||||
printf ("%-*sBool %d\n", prefix, "", *(int32_t *) body);
|
||||
break;
|
||||
case SPA_POD_TYPE_URI:
|
||||
printf ("%-*sURI %d %s\n", prefix, "", *(int32_t *) body,
|
||||
case SPA_POD_TYPE_ID:
|
||||
printf ("%-*sId %d %s\n", prefix, "", *(int32_t *) body,
|
||||
spa_type_map_get_type (spa_type_map_get_default(), *(int32_t*)body));
|
||||
break;
|
||||
case SPA_POD_TYPE_INT:
|
||||
|
|
@ -334,7 +334,7 @@ print_format_value (uint32_t size, uint32_t type, void *body)
|
|||
case SPA_POD_TYPE_BOOL:
|
||||
fprintf (stderr, "%s", *(int32_t *) body ? "true" : "false");
|
||||
break;
|
||||
case SPA_POD_TYPE_URI:
|
||||
case SPA_POD_TYPE_ID:
|
||||
{
|
||||
const char *str = spa_type_map_get_type (spa_type_map_get_default(), *(int32_t*)body);
|
||||
if (str) {
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
|
||||
#include <lib/debug.h>
|
||||
|
||||
#define MAX_URIS 4096
|
||||
#define MAX_TYPES 4096
|
||||
|
||||
typedef struct {
|
||||
SpaTypeMap map;
|
||||
char *types[MAX_URIS];
|
||||
char *types[MAX_TYPES];
|
||||
unsigned int n_types;
|
||||
} TypeMap;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ compare_value (SpaPODType type, const void *r1, const void *r2)
|
|||
case SPA_POD_TYPE_INVALID:
|
||||
return 0;
|
||||
case SPA_POD_TYPE_BOOL:
|
||||
case SPA_POD_TYPE_URI:
|
||||
case SPA_POD_TYPE_ID:
|
||||
return *(int32_t*)r1 == *(uint32_t*)r2 ? 0 : 1;
|
||||
case SPA_POD_TYPE_INT:
|
||||
return *(int32_t*)r1 - *(int32_t*)r2;
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@ spa_format_video_parse (const SpaFormat *format,
|
|||
static SpaTypeMediaType media_type = { 0, };
|
||||
static SpaTypeMediaSubtype media_subtype = { 0, };
|
||||
static SpaTypeMediaSubtypeVideo media_subtype_video = { 0, };
|
||||
static SpaTypePropVideo prop_video = { 0, };
|
||||
static SpaTypeFormatVideo format_video = { 0, };
|
||||
SpaTypeMap *map = spa_type_map_get_default ();
|
||||
|
||||
spa_type_media_type_map (map, &media_type);
|
||||
spa_type_media_subtype_map (map, &media_subtype);
|
||||
spa_type_media_subtype_video_map (map, &media_subtype_video);
|
||||
spa_type_prop_video_map (map, &prop_video);
|
||||
spa_type_format_video_map (map, &format_video);
|
||||
|
||||
if (format->body.media_type.value != media_type.video)
|
||||
return SPA_RESULT_INVALID_MEDIA_TYPE;
|
||||
|
|
@ -50,32 +50,32 @@ spa_format_video_parse (const SpaFormat *format,
|
|||
|
||||
if (info->media_subtype == media_subtype.raw)
|
||||
spa_format_query (format,
|
||||
prop_video.format, SPA_POD_TYPE_URI, &info->info.raw.format,
|
||||
prop_video.size, SPA_POD_TYPE_RECTANGLE, &info->info.raw.size,
|
||||
prop_video.framerate, SPA_POD_TYPE_FRACTION, &info->info.raw.framerate,
|
||||
prop_video.max_framerate, SPA_POD_TYPE_FRACTION, &info->info.raw.max_framerate,
|
||||
prop_video.views, SPA_POD_TYPE_INT, &info->info.raw.views,
|
||||
prop_video.interlace_mode, SPA_POD_TYPE_INT, &info->info.raw.interlace_mode,
|
||||
prop_video.pixel_aspect_ratio, SPA_POD_TYPE_FRACTION, &info->info.raw.pixel_aspect_ratio,
|
||||
prop_video.multiview_mode, SPA_POD_TYPE_INT, &info->info.raw.multiview_mode,
|
||||
prop_video.multiview_flags, SPA_POD_TYPE_INT, &info->info.raw.multiview_flags,
|
||||
prop_video.chroma_site, SPA_POD_TYPE_INT, &info->info.raw.chroma_site,
|
||||
prop_video.color_range, SPA_POD_TYPE_INT, &info->info.raw.color_range,
|
||||
prop_video.color_matrix, SPA_POD_TYPE_INT, &info->info.raw.color_matrix,
|
||||
prop_video.transfer_function, SPA_POD_TYPE_INT, &info->info.raw.transfer_function,
|
||||
prop_video.color_primaries, SPA_POD_TYPE_INT, &info->info.raw.color_primaries,
|
||||
format_video.format, SPA_POD_TYPE_ID, &info->info.raw.format,
|
||||
format_video.size, SPA_POD_TYPE_RECTANGLE, &info->info.raw.size,
|
||||
format_video.framerate, SPA_POD_TYPE_FRACTION, &info->info.raw.framerate,
|
||||
format_video.max_framerate, SPA_POD_TYPE_FRACTION, &info->info.raw.max_framerate,
|
||||
format_video.views, SPA_POD_TYPE_INT, &info->info.raw.views,
|
||||
format_video.interlace_mode, SPA_POD_TYPE_INT, &info->info.raw.interlace_mode,
|
||||
format_video.pixel_aspect_ratio, SPA_POD_TYPE_FRACTION, &info->info.raw.pixel_aspect_ratio,
|
||||
format_video.multiview_mode, SPA_POD_TYPE_INT, &info->info.raw.multiview_mode,
|
||||
format_video.multiview_flags, SPA_POD_TYPE_INT, &info->info.raw.multiview_flags,
|
||||
format_video.chroma_site, SPA_POD_TYPE_INT, &info->info.raw.chroma_site,
|
||||
format_video.color_range, SPA_POD_TYPE_INT, &info->info.raw.color_range,
|
||||
format_video.color_matrix, SPA_POD_TYPE_INT, &info->info.raw.color_matrix,
|
||||
format_video.transfer_function, SPA_POD_TYPE_INT, &info->info.raw.transfer_function,
|
||||
format_video.color_primaries, SPA_POD_TYPE_INT, &info->info.raw.color_primaries,
|
||||
0);
|
||||
else if (info->media_subtype == media_subtype_video.h264)
|
||||
spa_format_query (format,
|
||||
prop_video.size, SPA_POD_TYPE_RECTANGLE, &info->info.h264.size,
|
||||
prop_video.framerate, SPA_POD_TYPE_FRACTION, &info->info.h264.framerate,
|
||||
prop_video.max_framerate, SPA_POD_TYPE_FRACTION, &info->info.h264.max_framerate,
|
||||
format_video.size, SPA_POD_TYPE_RECTANGLE, &info->info.h264.size,
|
||||
format_video.framerate, SPA_POD_TYPE_FRACTION, &info->info.h264.framerate,
|
||||
format_video.max_framerate, SPA_POD_TYPE_FRACTION, &info->info.h264.max_framerate,
|
||||
0);
|
||||
else if (info->media_subtype == media_subtype_video.mjpg)
|
||||
spa_format_query (format,
|
||||
prop_video.size, SPA_POD_TYPE_RECTANGLE, &info->info.mjpg.size,
|
||||
prop_video.framerate, SPA_POD_TYPE_FRACTION, &info->info.mjpg.framerate,
|
||||
prop_video.max_framerate, SPA_POD_TYPE_FRACTION, &info->info.mjpg.max_framerate,
|
||||
format_video.size, SPA_POD_TYPE_RECTANGLE, &info->info.mjpg.size,
|
||||
format_video.framerate, SPA_POD_TYPE_FRACTION, &info->info.mjpg.framerate,
|
||||
format_video.max_framerate, SPA_POD_TYPE_FRACTION, &info->info.mjpg.max_framerate,
|
||||
0);
|
||||
else
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue