Commit eee9c153 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'ci/loudness-measurements-pinknoise' into tmp-loudness-main-cmp-1

parents 2b2b178a 994c68f1
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
variables:
  # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this
  # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information
  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main
  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF tmu/loudness-measurement
  # If you need to set some config variable only in a local branch, then add an overwrite here
  # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR
  # this is more easily done directly here in the child repo
+131 B

File added.

No diff preview for this file type.

+4 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.10)

project(generate_crend_ivas_tables)

# set(CMAKE_OSX_ARCHITECTURES "x86_64")
set(CMAKE_OSX_ARCHITECTURES "x86_64")
set(CMAKE_GENERATOR_PLATFORM x64)
set(CMAKE_BUILD_TYPE "Debug")
set(IVAS_TRUNK_PATH "${PROJECT_SOURCE_DIR}/../..")
set(IVAS_TRUNK_UTIL_PATH ${IVAS_TRUNK_PATH}/lib_util)
@@ -14,6 +15,8 @@ set(IVAS_TRUNK_COM_PATH ${IVAS_TRUNK_PATH}/lib_com)
set(IVAS_TRUNK_ISAR_PATH ${IVAS_TRUNK_PATH}/lib_isar)
set(IVAS_TRUNK_LC3_PATH ${IVAS_TRUNK_PATH}/lib_lc3plus)
set(IVAS_TRUNK_DEBUG_PATH ${IVAS_TRUNK_PATH}/lib_debug)
set(Matlab_ROOT_DIR "/Applications/MATLAB_R2020b.app")
find_package(Matlab REQUIRED COMPONENTS MAT_LIBRARY MX_LIBRARY)

option(USE_MATLAB_ENG "Use matlab engine" OFF) # allows to use sofa file as input to the exe, but on windows requires to register matlab as a com server type in matlab "comserver('register')""
find_package(Matlab REQUIRED)
+131 B

File added.

No diff preview for this file type.

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ for chIdx = 1:size(IR_in,3)
end

prop_time = min(min_idx) - 15;
prop_time = max(prop_time, 1); % avoid negative values
in_struct.propogationTime = prop_time;
in_struct.latency_s = (min(min_idx) - 1 - prop_time)/in_struct.fs + 31/in_struct.fs;

@@ -322,6 +323,7 @@ for chIdx = 1:input_struct.num_channels
        for bandIdx = 1:input_struct.num_bands
            % the computation of reverb parameters starts with some overlap
            s_idx = input_struct.NFft(bandIdx)-5;
            s_idx = max(s_idx, 1);
            
            % Determine the truncation point based on noise floor estimates
            end_idx = get_truncation_point(IR_CLDFB(bandIdx,s_idx:max_index,outChIdx,chIdx));
Loading