From e74c41bdf62eed4ebf9302f30e912b3c44ffe921 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Apr 2018 09:29:10 +0200
Subject: [PATCH] splitter: fix bpf

Number of channels does not influence bytes-per-frame for
non-interleaved audio.
Add layout to get_format
---
 spa/plugins/audioconvert/splitter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/audioconvert/splitter.c b/spa/plugins/audioconvert/splitter.c
index f8b65826e..007ff9f72 100644
--- a/spa/plugins/audioconvert/splitter.c
+++ b/spa/plugins/audioconvert/splitter.c
@@ -420,6 +420,7 @@ static int port_get_format(struct spa_node *node,
 		"I", t->media_type.audio,
 		"I", t->media_subtype.raw,
 		":", t->format_audio.format,   "I", this->format.info.raw.format,
+		":", t->format_audio.layout,   "i", this->format.info.raw.layout,
 		":", t->format_audio.rate,     "i", this->format.info.raw.rate,
 		":", t->format_audio.channels, "i", this->format.info.raw.channels);
 
@@ -598,7 +599,6 @@ static int port_set_format(struct spa_node *node,
 		if (direction == SPA_DIRECTION_INPUT) {
 			if (info.info.raw.channels != this->port_count)
 				return -EINVAL;
-			this->bpf *= this->port_count;
 		} else {
 			if (info.info.raw.channels != 1)
 				return -EINVAL;