From e35586cd15dbfb9bc5e2196e03373e5fec1c41c2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 27 Jul 2020 17:41:52 +0200 Subject: [PATCH] media-session: link MONO/UNKNOWN channels only once Try to only link the MONO and UNKNOWN input ports once --- src/examples/media-session/media-session.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index eaccc3aa5..73cdac5c5 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -1517,16 +1517,15 @@ static int score_ports(struct sm_port *out, struct sm_port *in) else if ((out->channel == SPA_AUDIO_CHANNEL_FC && in->channel == SPA_AUDIO_CHANNEL_MONO) || (out->channel == SPA_AUDIO_CHANNEL_MONO && in->channel == SPA_AUDIO_CHANNEL_FC)) score += 50; - else if (in->channel == SPA_AUDIO_CHANNEL_UNKNOWN) - score += 40; - else if (in->channel == SPA_AUDIO_CHANNEL_MONO) - score += 30; - else if (out->channel == SPA_AUDIO_CHANNEL_UNKNOWN) - score += 20; - else if (out->channel == SPA_AUDIO_CHANNEL_MONO) + else if (in->channel == SPA_AUDIO_CHANNEL_UNKNOWN || + in->channel == SPA_AUDIO_CHANNEL_MONO || + out->channel == SPA_AUDIO_CHANNEL_UNKNOWN || + out->channel == SPA_AUDIO_CHANNEL_MONO) score += 10; if (score > 0 && !in->visited) score += 5; + if (score <= 10) + score = 0; return score; }