Deleted Added
full compact
channel.c (230845) channel.c (243138)
1/*-
2 * Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
3 * Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
4 * Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
5 * Portions Copyright (c) Luigi Rizzo <luigi@FreeBSD.org> - 1997-99
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

33#include "opt_snd.h"
34#endif
35
36#include <dev/sound/pcm/sound.h>
37#include <dev/sound/pcm/vchan.h>
38
39#include "feeder_if.h"
40
1/*-
2 * Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
3 * Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
4 * Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
5 * Portions Copyright (c) Luigi Rizzo <luigi@FreeBSD.org> - 1997-99
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

33#include "opt_snd.h"
34#endif
35
36#include <dev/sound/pcm/sound.h>
37#include <dev/sound/pcm/vchan.h>
38
39#include "feeder_if.h"
40
41SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/channel.c 230845 2012-01-31 21:46:28Z mav $");
41SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/channel.c 243138 2012-11-16 07:05:57Z mav $");
42
43int report_soft_formats = 1;
44SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW,
45 &report_soft_formats, 1, "report software-emulated formats");
46
47int report_soft_matrix = 1;
48SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_matrix, CTLFLAG_RW,
49 &report_soft_matrix, 1, "report software-emulated channel matrixing");

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

1032static const struct {
1033 char *name, *alias1, *alias2;
1034 int matrix_id;
1035} matrix_id_tab[] = {
1036 { "1.0", "1", "mono", SND_CHN_MATRIX_1_0 },
1037 { "2.0", "2", "stereo", SND_CHN_MATRIX_2_0 },
1038 { "2.1", NULL, NULL, SND_CHN_MATRIX_2_1 },
1039 { "3.0", "3", NULL, SND_CHN_MATRIX_3_0 },
42
43int report_soft_formats = 1;
44SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW,
45 &report_soft_formats, 1, "report software-emulated formats");
46
47int report_soft_matrix = 1;
48SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_matrix, CTLFLAG_RW,
49 &report_soft_matrix, 1, "report software-emulated channel matrixing");

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

1032static const struct {
1033 char *name, *alias1, *alias2;
1034 int matrix_id;
1035} matrix_id_tab[] = {
1036 { "1.0", "1", "mono", SND_CHN_MATRIX_1_0 },
1037 { "2.0", "2", "stereo", SND_CHN_MATRIX_2_0 },
1038 { "2.1", NULL, NULL, SND_CHN_MATRIX_2_1 },
1039 { "3.0", "3", NULL, SND_CHN_MATRIX_3_0 },
1040 { "3.1", NULL, NULL, SND_CHN_MATRIX_3_1 },
1040 { "4.0", "4", "quad", SND_CHN_MATRIX_4_0 },
1041 { "4.1", NULL, NULL, SND_CHN_MATRIX_4_1 },
1042 { "5.0", "5", NULL, SND_CHN_MATRIX_5_0 },
1043 { "5.1", "6", NULL, SND_CHN_MATRIX_5_1 },
1044 { "6.0", NULL, NULL, SND_CHN_MATRIX_6_0 },
1045 { "6.1", "7", NULL, SND_CHN_MATRIX_6_1 },
1041 { "4.0", "4", "quad", SND_CHN_MATRIX_4_0 },
1042 { "4.1", NULL, NULL, SND_CHN_MATRIX_4_1 },
1043 { "5.0", "5", NULL, SND_CHN_MATRIX_5_0 },
1044 { "5.1", "6", NULL, SND_CHN_MATRIX_5_1 },
1045 { "6.0", NULL, NULL, SND_CHN_MATRIX_6_0 },
1046 { "6.1", "7", NULL, SND_CHN_MATRIX_6_1 },
1047 { "7.0", NULL, NULL, SND_CHN_MATRIX_7_0 },
1046 { "7.1", "8", NULL, SND_CHN_MATRIX_7_1 },
1047 { NULL, NULL, NULL, SND_CHN_MATRIX_UNKNOWN }
1048};
1049
1050uint32_t
1051snd_str2afmt(const char *req)
1052{
1053 uint32_t i, afmt;

--- 1492 unchanged lines hidden ---
1048 { "7.1", "8", NULL, SND_CHN_MATRIX_7_1 },
1049 { NULL, NULL, NULL, SND_CHN_MATRIX_UNKNOWN }
1050};
1051
1052uint32_t
1053snd_str2afmt(const char *req)
1054{
1055 uint32_t i, afmt;

--- 1492 unchanged lines hidden ---