From 5bccb1aeea6ec2d33fc3fa39b3dd42c94ef092df Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 21 Mar 2017 17:09:08 +0100 Subject: [PATCH] format: various audio format fixes --- pinos/gst/gstpinosformat.c | 2 +- spa/lib/props.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pinos/gst/gstpinosformat.c b/pinos/gst/gstpinosformat.c index 8ff1ab68d..a38501081 100644 --- a/pinos/gst/gstpinosformat.c +++ b/pinos/gst/gstpinosformat.c @@ -423,7 +423,7 @@ handle_audio_fields (ConvertData *d) prop_audio.format, 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) SPA_POD_BUILDER_DEREF (&d->b, f.ref, SpaPODProp)->body.flags |= SPA_POD_PROP_FLAG_UNSET; diff --git a/spa/lib/props.c b/spa/lib/props.c index f6ffc676b..a61bc50f9 100644 --- a/spa/lib/props.c +++ b/spa/lib/props.c @@ -32,7 +32,7 @@ compare_value (SpaPODType type, const void *r1, const void *r2) return 0; case SPA_POD_TYPE_BOOL: 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: return *(int32_t*)r1 - *(int32_t*)r2; case SPA_POD_TYPE_LONG: @@ -167,9 +167,9 @@ spa_props_filter (SpaPODBuilder *b, rt2 = p2->body.flags & SPA_POD_PROP_RANGE_MASK; /* 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), - SpaPODProp); + spa_pod_builder_push_prop (b, &f, p1->body.key, SPA_POD_PROP_FLAG_READWRITE), + np = SPA_POD_BUILDER_DEREF (b, f.ref, SpaPODProp); + /* default value */ spa_pod_builder_raw (b, &p1->body.value, sizeof (p1->body.value) + p1->body.value.size);