Deleted Added
full compact
matrix_map.h (193640) matrix_map.h (243138)
1/*-
2 * Copyright (c) 2009 Ariff Abdullah <ariff@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2009 Ariff Abdullah <ariff@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/sound/pcm/matrix_map.h 193640 2009-06-07 19:12:08Z ariff $
26 * $FreeBSD: head/sys/dev/sound/pcm/matrix_map.h 243138 2012-11-16 07:05:57Z mav $
27 */
28
29#ifndef _SND_MATRIX_MAP_H_
30#define _SND_MATRIX_MAP_H_
31
32/*
33 * Standard matrix maps:
34 *

--- 155 unchanged lines hidden (view full) ---

190 } \
191 }, \
192 .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \
193 SND_CHN_T_MASK_BC, \
194 .offset = { 0, 1, -1, -1, -1, -1, -1, -1, 2, \
195 -1, -1, -1, -1, -1, -1, -1, -1, -1 } \
196}
197
27 */
28
29#ifndef _SND_MATRIX_MAP_H_
30#define _SND_MATRIX_MAP_H_
31
32/*
33 * Standard matrix maps:
34 *

--- 155 unchanged lines hidden (view full) ---

190 } \
191 }, \
192 .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \
193 SND_CHN_T_MASK_BC, \
194 .offset = { 0, 1, -1, -1, -1, -1, -1, -1, 2, \
195 -1, -1, -1, -1, -1, -1, -1, -1, -1 } \
196}
197
198#define SND_CHN_MATRIX_MAP_3_1 { \
199 .id = SND_CHN_MATRIX_3_1, \
200 .channels = 4, \
201 .ext = 1, \
202 .map = { \
203 /* Left */ \
204 [0] = { \
205 .type = SND_CHN_T_FL, \
206 .members = \
207 SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \
208 SND_CHN_T_MASK_SL \
209 }, \
210 /* Right */ \
211 [1] = { \
212 .type = SND_CHN_T_FR, \
213 .members = \
214 SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \
215 SND_CHN_T_MASK_SR \
216 }, \
217 /* LFE */ \
218 [2] = { \
219 .type = SND_CHN_T_LF, \
220 .members = SND_CHN_T_MASK_LF \
221 }, \
222 /* Rear Center */ \
223 [3] = { \
224 .type = SND_CHN_T_BC, \
225 .members = \
226 SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \
227 SND_CHN_T_MASK_BC | \
228 SND_CHN_T_MASK_SL | SND_CHN_T_MASK_SR \
229 }, \
230 [4] = { \
231 .type = SND_CHN_T_MAX, \
232 .members = 0 \
233 } \
234 }, \
235 .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \
236 SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BC, \
237 .offset = { 0, 1, -1, 2, -1, -1, -1, -1, 3, \
238 -1, -1, -1, -1, -1, -1, -1, -1, -1 } \
239}
240
198#define SND_CHN_MATRIX_MAP_4_0 { \
199 .id = SND_CHN_MATRIX_4_0, \
200 .channels = 4, \
201 .ext = 0, \
202 .map = { \
203 /* Left */ \
204 [0] = { \
205 .type = SND_CHN_T_FL, \

--- 293 unchanged lines hidden (view full) ---

499 .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \
500 SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \
501 SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF | \
502 SND_CHN_T_MASK_BC, \
503 .offset = { 0, 1, 4, 5, 2, 3, -1, -1, 6, \
504 -1, -1, -1, -1, -1, -1, -1, -1, -1 } \
505}
506
241#define SND_CHN_MATRIX_MAP_4_0 { \
242 .id = SND_CHN_MATRIX_4_0, \
243 .channels = 4, \
244 .ext = 0, \
245 .map = { \
246 /* Left */ \
247 [0] = { \
248 .type = SND_CHN_T_FL, \

--- 293 unchanged lines hidden (view full) ---

542 .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \
543 SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \
544 SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF | \
545 SND_CHN_T_MASK_BC, \
546 .offset = { 0, 1, 4, 5, 2, 3, -1, -1, 6, \
547 -1, -1, -1, -1, -1, -1, -1, -1, -1 } \
548}
549
550#define SND_CHN_MATRIX_MAP_7_0 { \
551 .id = SND_CHN_MATRIX_7_0, \
552 .channels = 7, \
553 .ext = 0, \
554 .map = { \
555 /* Left */ \
556 [0] = { \
557 .type = SND_CHN_T_FL, \
558 .members = \
559 SND_CHN_T_MASK_FL | SND_CHN_T_MASK_LF \
560 }, \
561 /* Right */ \
562 [1] = { \
563 .type = SND_CHN_T_FR, \
564 .members = \
565 SND_CHN_T_MASK_FR | SND_CHN_T_MASK_LF \
566 }, \
567 /* Rear Left */ \
568 [2] = { \
569 .type = SND_CHN_T_BL, \
570 .members = \
571 SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BC | \
572 SND_CHN_T_MASK_LF \
573 }, \
574 /* Rear Right */ \
575 [3] = { \
576 .type = SND_CHN_T_BR, \
577 .members = \
578 SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC | \
579 SND_CHN_T_MASK_LF \
580 }, \
581 /* Center */ \
582 [4] = { \
583 .type = SND_CHN_T_FC, \
584 .members = \
585 SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF \
586 }, \
587 /* Side Left */ \
588 [5] = { \
589 .type = SND_CHN_T_SL, \
590 .members = \
591 SND_CHN_T_MASK_SL | SND_CHN_T_MASK_LF \
592 }, \
593 /* Side Right */ \
594 [6] = { \
595 .type = SND_CHN_T_SR, \
596 .members = \
597 SND_CHN_T_MASK_SR | SND_CHN_T_MASK_LF \
598 }, \
599 [7] = { \
600 .type = SND_CHN_T_MAX, \
601 .members = 0 \
602 } \
603 }, \
604 .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \
605 SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \
606 SND_CHN_T_MASK_FC | \
607 SND_CHN_T_MASK_SL | SND_CHN_T_MASK_SR, \
608 .offset = { 0, 1, 4, -1, 2, 3, -1, -1, -1, \
609 5, 6, -1, -1, -1, -1, -1, -1, -1 } \
610}
611
507#define SND_CHN_MATRIX_MAP_7_1 { \
508 .id = SND_CHN_MATRIX_7_1, \
509 .channels = 8, \
510 .ext = 1, \
511 .map = { \
512 /* Left */ \
513 [0] = { \
514 .type = SND_CHN_T_FL, \

--- 53 unchanged lines hidden ---
612#define SND_CHN_MATRIX_MAP_7_1 { \
613 .id = SND_CHN_MATRIX_7_1, \
614 .channels = 8, \
615 .ext = 1, \
616 .map = { \
617 /* Left */ \
618 [0] = { \
619 .type = SND_CHN_T_FL, \

--- 53 unchanged lines hidden ---