Attachment 66655 Details for Bug 49055 – fix channel allocation order

[patch] fix channel allocation order

0001-ALSA-hdmi-fix-channel_allocation-array-wrong-order.patch (text/plain), 1.41 KB, created by Wang Xingchao on 2012-09-05 06:49:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wang Xingchao

Created: 2012-09-05 06:49:37 UTC

Size: 1.41 KB

patch

obsolete

>From 0c0ae79ce5da456f640ef3a0cac246b8db8bfac6 Mon Sep 17 00:00:00 2001
>From: Wang Xingchao <xingchao.wang@intel.com>
>Date: Wed, 5 Sep 2012 07:18:43 +0800
>Subject: [PATCH RFC 1/3] ALSA: HDMI - fix channel_allocation array wrong order
>
>The array channel_allocations[] is an ordered list, add function to get
>correct order by ca_index.
>
>Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
>---
> sound/pci/hda/patch_hdmi.c |   15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
>diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
>index d9439c5..6ac21d4 100644
>--- a/sound/pci/hda/patch_hdmi.c
>+++ b/sound/pci/hda/patch_hdmi.c
>@@ -469,6 +469,17 @@ static void init_channel_allocations(void)
> 	}
> }
> 
>+static int get_channel_allocation_order(int ca)
>+{
>+	int i;
>+
>+	for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
>+		if (channel_allocations[i].ca_index == ca)
>+			break;
>+	}
>+	return i;
>+}
>+
> /*
>  * The transformation takes two steps:
>  *
>@@ -541,9 +552,11 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec,
> {
> 	int i;
> 	int err;
>+	int order;
> 
>+	order = get_channel_allocation_order(ca);
> 	if (hdmi_channel_mapping[ca][1] == 0) {
>-		for (i = 0; i < channel_allocations[ca].channels; i++)
>+		for (i = 0; i < channel_allocations[order].channels; i++)
> 			hdmi_channel_mapping[ca][i] = i | (i << 4);
> 		for (; i < 8; i++)
> 			hdmi_channel_mapping[ca][i] = 0xf | (i << 4);
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 49055: 60452 | 60453 | 60454 | 60455 | 66654 | 66655 | 66656 | 66657 | 66658

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.