mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-29 05:40:27 -04:00
spa: fix indentation in audioconvert/meson.build
Was partially using spaces, partially 2-space tabs. Use 2 spaces only and fix the few lines where the indentation was completely out of whack.
This commit is contained in:
Peter Hutterer
parent
b2206e2530
commit
e38cc427bf
1 changed files with 146 additions and 148 deletions
|
|
@ -1,196 +1,194 @@
|
||||||
audioconvert_sources = ['audioadapter.c',
|
audioconvert_sources = ['audioadapter.c',
|
||||||
'audioconvert.c',
|
'audioconvert.c',
|
||||||
'fmtconvert.c',
|
'fmtconvert.c',
|
||||||
'channelmix.c',
|
'channelmix.c',
|
||||||
'merger.c',
|
'merger.c',
|
||||||
'plugin.c',
|
'plugin.c',
|
||||||
'resample.c',
|
'resample.c',
|
||||||
'splitter.c']
|
'splitter.c']
|
||||||
|
|
||||||
simd_cargs = []
|
simd_cargs = []
|
||||||
simd_dependencies = []
|
simd_dependencies = []
|
||||||
|
|
||||||
if have_sse
|
if have_sse
|
||||||
audioconvert_sse = static_library('audioconvert_sse',
|
audioconvert_sse = static_library('audioconvert_sse',
|
||||||
['resample-native-sse.c',
|
['resample-native-sse.c',
|
||||||
'resample-peaks-sse.c',
|
'resample-peaks-sse.c',
|
||||||
'volume-ops-sse.c',
|
'volume-ops-sse.c',
|
||||||
'channelmix-ops-sse.c' ],
|
'channelmix-ops-sse.c' ],
|
||||||
c_args : [sse_args, '-O3', '-DHAVE_SSE'],
|
c_args : [sse_args, '-O3', '-DHAVE_SSE'],
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
simd_cargs += ['-DHAVE_SSE']
|
simd_cargs += ['-DHAVE_SSE']
|
||||||
simd_dependencies += audioconvert_sse
|
simd_dependencies += audioconvert_sse
|
||||||
endif
|
endif
|
||||||
if have_sse2
|
if have_sse2
|
||||||
audioconvert_sse2 = static_library('audioconvert_sse2',
|
audioconvert_sse2 = static_library('audioconvert_sse2',
|
||||||
['fmt-ops-sse2.c' ],
|
['fmt-ops-sse2.c' ],
|
||||||
c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
|
c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
simd_cargs += ['-DHAVE_SSE2']
|
simd_cargs += ['-DHAVE_SSE2']
|
||||||
simd_dependencies += audioconvert_sse2
|
simd_dependencies += audioconvert_sse2
|
||||||
endif
|
endif
|
||||||
if have_ssse3
|
if have_ssse3
|
||||||
audioconvert_ssse3 = static_library('audioconvert_ssse3',
|
audioconvert_ssse3 = static_library('audioconvert_ssse3',
|
||||||
['fmt-ops-ssse3.c',
|
['fmt-ops-ssse3.c',
|
||||||
'resample-native-ssse3.c' ],
|
'resample-native-ssse3.c' ],
|
||||||
c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'],
|
c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'],
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
simd_cargs += ['-DHAVE_SSSE3']
|
simd_cargs += ['-DHAVE_SSSE3']
|
||||||
simd_dependencies += audioconvert_ssse3
|
simd_dependencies += audioconvert_ssse3
|
||||||
endif
|
endif
|
||||||
if have_sse41
|
if have_sse41
|
||||||
audioconvert_sse41 = static_library('audioconvert_sse41',
|
audioconvert_sse41 = static_library('audioconvert_sse41',
|
||||||
['fmt-ops-sse41.c'],
|
['fmt-ops-sse41.c'],
|
||||||
c_args : [sse41_args, '-O3', '-DHAVE_SSE41'],
|
c_args : [sse41_args, '-O3', '-DHAVE_SSE41'],
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
simd_cargs += ['-DHAVE_SSE41']
|
simd_cargs += ['-DHAVE_SSE41']
|
||||||
simd_dependencies += audioconvert_sse41
|
simd_dependencies += audioconvert_sse41
|
||||||
endif
|
endif
|
||||||
if have_avx and have_fma
|
if have_avx and have_fma
|
||||||
audioconvert_avx = static_library('audioconvert_avx',
|
audioconvert_avx = static_library('audioconvert_avx',
|
||||||
['resample-native-avx.c'],
|
['resample-native-avx.c'],
|
||||||
c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
|
c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
|
simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
|
||||||
simd_dependencies += audioconvert_avx
|
simd_dependencies += audioconvert_avx
|
||||||
endif
|
endif
|
||||||
if have_avx2
|
if have_avx2
|
||||||
audioconvert_avx2 = static_library('audioconvert_avx2',
|
audioconvert_avx2 = static_library('audioconvert_avx2',
|
||||||
['fmt-ops-avx2.c'],
|
['fmt-ops-avx2.c'],
|
||||||
c_args : [avx2_args, '-O3', '-DHAVE_AVX2'],
|
c_args : [avx2_args, '-O3', '-DHAVE_AVX2'],
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
simd_cargs += ['-DHAVE_AVX2']
|
simd_cargs += ['-DHAVE_AVX2']
|
||||||
simd_dependencies += audioconvert_avx2
|
simd_dependencies += audioconvert_avx2
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if have_neon
|
if have_neon
|
||||||
audioconvert_neon = static_library('audioconvert_neon',
|
audioconvert_neon = static_library('audioconvert_neon',
|
||||||
['resample-native-neon.c',
|
['resample-native-neon.c',
|
||||||
'fmt-ops-neon.c' ],
|
'fmt-ops-neon.c' ],
|
||||||
c_args : [neon_args, '-O3', '-DHAVE_NEON'],
|
c_args : [neon_args, '-O3', '-DHAVE_NEON'],
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
simd_cargs += ['-DHAVE_NEON']
|
simd_cargs += ['-DHAVE_NEON']
|
||||||
simd_dependencies += audioconvert_neon
|
simd_dependencies += audioconvert_neon
|
||||||
endif
|
endif
|
||||||
|
|
||||||
audioconvert = static_library('audioconvert',
|
audioconvert = static_library('audioconvert',
|
||||||
['fmt-ops.c',
|
['fmt-ops.c',
|
||||||
'biquad.c',
|
'biquad.c',
|
||||||
'crossover.c',
|
'crossover.c',
|
||||||
'channelmix-ops.c',
|
'channelmix-ops.c',
|
||||||
'channelmix-ops-c.c',
|
'channelmix-ops-c.c',
|
||||||
'resample-native.c',
|
'resample-native.c',
|
||||||
'resample-peaks.c',
|
'resample-peaks.c',
|
||||||
'fmt-ops-c.c',
|
'fmt-ops-c.c',
|
||||||
'volume-ops.c',
|
'volume-ops.c',
|
||||||
'volume-ops-c.c' ],
|
'volume-ops-c.c' ],
|
||||||
c_args : [ simd_cargs, '-O3'],
|
c_args : [ simd_cargs, '-O3'],
|
||||||
link_with : simd_dependencies,
|
link_with : simd_dependencies,
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
|
|
||||||
audioconvertlib = shared_library('spa-audioconvert',
|
audioconvertlib = shared_library('spa-audioconvert',
|
||||||
audioconvert_sources,
|
audioconvert_sources,
|
||||||
c_args : simd_cargs,
|
c_args : simd_cargs,
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
dependencies : [ mathlib ],
|
dependencies : [ mathlib ],
|
||||||
link_with : audioconvert,
|
link_with : audioconvert,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : spa_plugindir / 'audioconvert')
|
install_dir : spa_plugindir / 'audioconvert')
|
||||||
|
|
||||||
test_lib = static_library('test_lib',
|
test_lib = static_library('test_lib',
|
||||||
['test-source.c' ],
|
['test-source.c' ],
|
||||||
c_args : ['-O3'],
|
c_args : ['-O3'],
|
||||||
include_directories : [spa_inc],
|
include_directories : [spa_inc],
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
|
|
||||||
test_apps = [
|
test_apps = [
|
||||||
'test-audioadapter',
|
'test-audioadapter',
|
||||||
'test-audioconvert',
|
'test-audioconvert',
|
||||||
'test-channelmix',
|
'test-channelmix',
|
||||||
'test-fmt-ops',
|
'test-fmt-ops',
|
||||||
'test-resample',
|
'test-resample',
|
||||||
]
|
]
|
||||||
|
|
||||||
foreach a : test_apps
|
foreach a : test_apps
|
||||||
test(a,
|
test(a,
|
||||||
executable(a, a + '.c',
|
executable(a, a + '.c',
|
||||||
dependencies : [dl_lib, pthread_lib, mathlib ],
|
dependencies : [dl_lib, pthread_lib, mathlib ],
|
||||||
include_directories : [ configinc, spa_inc ],
|
include_directories : [ configinc, spa_inc ],
|
||||||
link_with : [ audioconvert, test_lib, audioconvertlib ],
|
link_with : [ audioconvert, test_lib, audioconvertlib ],
|
||||||
install_rpath : spa_plugindir / 'audioconvert',
|
install_rpath : spa_plugindir / 'audioconvert',
|
||||||
c_args : [ simd_cargs ],
|
c_args : [ simd_cargs ],
|
||||||
install : installed_tests_enabled,
|
install : installed_tests_enabled,
|
||||||
install_dir : installed_tests_execdir / 'audioconvert'),
|
install_dir : installed_tests_execdir / 'audioconvert'),
|
||||||
env : [
|
env : [
|
||||||
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
|
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
|
||||||
])
|
])
|
||||||
|
|
||||||
if installed_tests_enabled
|
if installed_tests_enabled
|
||||||
test_conf = configuration_data()
|
test_conf = configuration_data()
|
||||||
test_conf.set('exec',
|
test_conf.set('exec', installed_tests_execdir / 'audioconvert' / a)
|
||||||
installed_tests_execdir / 'audioconvert' / a)
|
configure_file(
|
||||||
configure_file(
|
input: installed_tests_template,
|
||||||
input: installed_tests_template,
|
output: a + '.test',
|
||||||
output: a + '.test',
|
install_dir: installed_tests_metadir / 'audioconvert',
|
||||||
install_dir: installed_tests_metadir / 'audioconvert',
|
configuration: test_conf
|
||||||
configuration: test_conf
|
)
|
||||||
)
|
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
benchmark_apps = [
|
benchmark_apps = [
|
||||||
'benchmark-fmt-ops',
|
'benchmark-fmt-ops',
|
||||||
'benchmark-resample',
|
'benchmark-resample',
|
||||||
]
|
]
|
||||||
|
|
||||||
foreach a : benchmark_apps
|
foreach a : benchmark_apps
|
||||||
benchmark(a,
|
benchmark(a,
|
||||||
executable(a, a + '.c',
|
executable(a, a + '.c',
|
||||||
dependencies : [dl_lib, pthread_lib, mathlib, ],
|
dependencies : [dl_lib, pthread_lib, mathlib, ],
|
||||||
include_directories : [ configinc, spa_inc ],
|
include_directories : [ configinc, spa_inc ],
|
||||||
c_args : [ simd_cargs ],
|
c_args : [ simd_cargs ],
|
||||||
link_with : [ audioconvert, audioconvertlib ],
|
link_with : [ audioconvert, audioconvertlib ],
|
||||||
install_rpath : spa_plugindir / 'audioconvert',
|
install_rpath : spa_plugindir / 'audioconvert',
|
||||||
install : installed_tests_enabled,
|
install : installed_tests_enabled,
|
||||||
install_dir : installed_tests_execdir / 'audioconvert'),
|
install_dir : installed_tests_execdir / 'audioconvert'),
|
||||||
env : [
|
env : [
|
||||||
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
|
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
|
||||||
])
|
])
|
||||||
|
|
||||||
if installed_tests_enabled
|
if installed_tests_enabled
|
||||||
test_conf = configuration_data()
|
test_conf = configuration_data()
|
||||||
test_conf.set('exec',
|
test_conf.set('exec', installed_tests_execdir / 'audioconvert' / a)
|
||||||
installed_tests_execdir / 'audioconvert' / a)
|
configure_file(
|
||||||
configure_file(
|
input: installed_tests_template,
|
||||||
input: installed_tests_template,
|
output: a + '.test',
|
||||||
output: a + '.test',
|
install_dir: installed_tests_metadir / 'audioconvert',
|
||||||
install_dir: installed_tests_metadir / 'audioconvert',
|
configuration: test_conf
|
||||||
configuration: test_conf
|
)
|
||||||
)
|
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
if sndfile_dep.found()
|
if sndfile_dep.found()
|
||||||
sparesample_sources = [
|
sparesample_sources = [
|
||||||
'spa-resample.c',
|
'spa-resample.c',
|
||||||
]
|
]
|
||||||
executable('spa-resample',
|
executable('spa-resample',
|
||||||
sparesample_sources,
|
sparesample_sources,
|
||||||
c_args : [ simd_cargs ],
|
c_args : [ simd_cargs ],
|
||||||
|
|
@ -198,5 +196,5 @@ if sndfile_dep.found()
|
||||||
link_with : [ audioconvert, test_lib ],
|
link_with : [ audioconvert, test_lib ],
|
||||||
dependencies : [sndfile_dep, mathlib],
|
dependencies : [sndfile_dep, mathlib],
|
||||||
install : true,
|
install : true,
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue