Skip to content

Commit 612a400

Browse files
committed
audio: crossover: move header file to module folder
This is a clean up, purpose is declutter headers, toml files, Readme.md etc per module basis, since today everything is scattered in current code base. Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
1 parent c12fa81 commit 612a400

File tree

8 files changed

+17
-11
lines changed

8 files changed

+17
-11
lines changed

src/audio/crossover/crossover.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include <sof/audio/format.h>
1212
#include <sof/audio/pipeline.h>
1313
#include <sof/audio/ipc-config.h>
14-
#include <sof/audio/crossover/crossover.h>
15-
#include <sof/audio/crossover/crossover_algorithm.h>
1614
#include <sof/common.h>
1715
#include <rtos/panic.h>
1816
#include <sof/ipc/msg.h>
@@ -30,13 +28,16 @@
3028
#include <ipc/stream.h>
3129
#include <ipc/topology.h>
3230
#include <user/trace.h>
33-
#include <user/crossover.h>
3431
#include <user/eq.h>
3532
#include <errno.h>
3633
#include <stddef.h>
3734
#include <stdint.h>
3835
#include <limits.h>
3936

37+
#include "crossover_algorithm.h"
38+
#include "crossover_user.h"
39+
#include "crossover.h"
40+
4041
LOG_MODULE_REGISTER(crossover, CONFIG_SOF_LOG_LEVEL);
4142

4243
/* 948c9ad1-806a-4131-ad6c-b2bda9e35a9f */

src/include/sof/audio/crossover/crossover.h renamed to src/audio/crossover/crossover.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
#include <sof/audio/module_adapter/module/module_interface.h>
1111
#include <sof/math/iir_df2t.h>
1212
#include <sof/platform.h>
13-
#include <user/crossover.h>
1413
#include <stdint.h>
1514

15+
#include "crossover_user.h"
16+
1617
struct comp_buffer;
1718
struct comp_dev;
1819

src/include/sof/audio/crossover/crossover_algorithm.h renamed to src/audio/crossover/crossover_algorithm.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
#define __SOF_AUDIO_CROSSOVER_CROSSOVER_ALGORITHM_H__
99

1010
#include <stdint.h>
11-
#include <sof/audio/crossover/crossover.h>
1211
#include <sof/platform.h>
1312
#include <sof/math/iir_df2t.h>
14-
#include <user/crossover.h>
13+
14+
#include "crossover_user.h"
15+
#include "crossover.h"
1516

1617
/* crossover reset function */
1718
void crossover_reset_state_ch(struct crossover_state *ch_state);

src/audio/crossover/crossover_generic.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
#include <ipc/stream.h>
88
#include <sof/audio/module_adapter/module/module_interface.h>
99
#include <sof/audio/component.h>
10-
#include <sof/audio/crossover/crossover.h>
1110
#include <sof/audio/format.h>
1211
#include <sof/math/iir_df2t.h>
1312
#include <stdint.h>
1413

14+
#include "crossover.h"
15+
1516
/*
1617
* \brief Splits x into two based on the coefficients set in the lp
1718
* and hp filters. The output of the lp is in y1, the output of

src/audio/multiband_drc/multiband_drc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// Author: Pin-chih Lin <johnylin@google.com>
66

77
#include <sof/audio/module_adapter/module/generic.h>
8-
#include <sof/audio/crossover/crossover_algorithm.h>
98
#include <sof/audio/drc/drc_algorithm.h>
109
#include <sof/audio/buffer.h>
1110
#include <sof/audio/format.h>
@@ -34,6 +33,8 @@
3433
#include <stdint.h>
3534
#include "multiband_drc.h"
3635

36+
#include "../crossover/crossover_algorithm.h"
37+
3738
LOG_MODULE_REGISTER(multiband_drc, CONFIG_SOF_LOG_LEVEL);
3839

3940
/* 0d9f2256-8e4f-47b3-8448-239a334f1191 */

src/audio/multiband_drc/multiband_drc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#define __SOF_AUDIO_MULTIBAND_DRC_MULTIBAND_DRC_H__
99

1010
#include <sof/audio/module_adapter/module/generic.h>
11-
#include <sof/audio/crossover/crossover.h>
1211
#include <sof/audio/drc/drc.h>
1312
#include <sof/math/iir_df2t.h>
1413
#include <sof/audio/component.h>
@@ -17,6 +16,7 @@
1716
#include <stdint.h>
1817

1918
#include "multiband_drc_user.h"
19+
#include "../crossover/crossover.h"
2020

2121
/**
2222
* Stores the state of the sub-components in Multiband DRC

src/audio/multiband_drc/multiband_drc_user.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
#define __USER_MULTIBAND_DRC_H__
1010

1111
#include <stdint.h>
12-
#include <user/crossover.h>
1312
#include <user/drc.h>
1413
#include <user/eq.h>
1514

15+
#include "../crossover/crossover_user.h"
16+
1617
/* Maximum number of frequency band for Multiband DRC */
1718
#define SOF_MULTIBAND_DRC_MAX_BANDS SOF_CROSSOVER_MAX_STREAMS
1819

@@ -54,7 +55,7 @@
5455
* 2 biquad filters.
5556
* struct sof_eq_iir_biquad crossover_coef[6]
5657
* The coefficient data for Crossover LR4 filters. Please refer
57-
* src/include/user/crossover.h for details. Zeros will be filled if
58+
* src/audio/crossover/user/crossover.h for details. Zeros will be filled if
5859
* the entries are useless. For example, when 2-way crossover is used:
5960
* struct sof_drc_params drc_coef[num_bands]
6061
* The parameter data for DRC per band, the number entries of this may

0 commit comments

Comments
 (0)