mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-17 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

format: various audio format fixes

Browse source
This commit is contained in:
Wim Taymans 2017-03-21 17:09:08 +01:00
parent 03292fd80f
commit 5bccb1aeea
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pinos/gst/gstpinosformat.c
View file

@ -423,7 +423,7 @@ handle_audio_fields (ConvertData *d)
prop_audio.format, prop_audio.format,
get_range_type (value) | SPA_POD_PROP_FLAG_READWRITE); get_range_type (value) | SPA_POD_PROP_FLAG_READWRITE);
spa_pod_builder_uri (&d->b, *audio_format_map[gst_video_format_from_string (v)]); spa_pod_builder_uri (&d->b, *audio_format_map[gst_audio_format_from_string (v)]);
} }
if (i > 1) if (i > 1)
SPA_POD_BUILDER_DEREF (&d->b, f.ref, SpaPODProp)->body.flags |= SPA_POD_PROP_FLAG_UNSET; SPA_POD_BUILDER_DEREF (&d->b, f.ref, SpaPODProp)->body.flags |= SPA_POD_PROP_FLAG_UNSET;

8
spa/lib/props.c
View file

@ -32,7 +32,7 @@ compare_value (SpaPODType type, const void *r1, const void *r2)
return 0; return 0;
case SPA_POD_TYPE_BOOL: case SPA_POD_TYPE_BOOL:
case SPA_POD_TYPE_URI: case SPA_POD_TYPE_URI:
return *(int32_t*)r1 == *(uint32_t*)r2; return *(int32_t*)r1 == *(uint32_t*)r2 ? 0 : 1;
case SPA_POD_TYPE_INT: case SPA_POD_TYPE_INT:
return *(int32_t*)r1 - *(int32_t*)r2; return *(int32_t*)r1 - *(int32_t*)r2;
case SPA_POD_TYPE_LONG: case SPA_POD_TYPE_LONG:
@ -167,9 +167,9 @@ spa_props_filter (SpaPODBuilder *b,
rt2 = p2->body.flags & SPA_POD_PROP_RANGE_MASK; rt2 = p2->body.flags & SPA_POD_PROP_RANGE_MASK;
/* else we filter. start with copying the property */ /* else we filter. start with copying the property */
np = SPA_POD_BUILDER_DEREF (b, spa_pod_builder_push_prop (b, &f, p1->body.key, SPA_POD_PROP_FLAG_READWRITE),
spa_pod_builder_push_prop (b, &f, p1->body.key, SPA_POD_PROP_FLAG_READWRITE), np = SPA_POD_BUILDER_DEREF (b, f.ref, SpaPODProp);
SpaPODProp);
/* default value */ /* default value */
spa_pod_builder_raw (b, &p1->body.value, sizeof (p1->body.value) + p1->body.value.size); spa_pod_builder_raw (b, &p1->body.value, sizeof (p1->body.value) + p1->body.value.size);