Commit 508a9ee0 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '744_step3_code_changes' into... 

Merge branch '744_step3_code_changes' into 922-use-precomputed-HRTF-average-LR-energies-and-IAC-in-all-renderers
parents 30c67d12 629171ba

.gitlab-ci.yml

+12 −7
Original line number Diff line number Diff line
@@ -93,16 +93,19 @@ stages: 
  # needed when depth is lower than the number of commits in the branch

  - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME



.mr-get-target-commit:

  &mr-get-target-commit # compare to last target branch commit before pipeline was created

.mr-get-target-commit: &mr-get-target-commit # compare to last target branch commit before pipeline was created

  - target_commit=$(git log $CI_MERGE_REQUEST_TARGET_BRANCH_NAME -1 --oneline --before=${CI_PIPELINE_CREATED_AT} --format=%H)



.check-for-testvectors:

  &check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present

.check-for-testvectors: &check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present

  - python3 -m pytest ci/test_vectors_available.py



.merge-request-comparison-setup-codec:

  &merge-request-comparison-setup-codec ### build test binaries, initial clean for paranoia reasons

.disable-debugging-macro: &disable-debugging-macro

# automatically disable #DEBUGGING macro in options.h using /**/-comment

  - sed -i.bak -e "s/^[[:space:]]*\(#define[[:space:]]*DEBUGGING\)/\/\*\1\*\//g" lib_com/options.h



.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec 

  ### build test binaries, initial clean for paranoia reasons

  - *disable-debugging-macro

  - make clean

  - mkdir build

  - cd build
@@ -113,17 +116,18 @@ stages: 
  - mv IVAS_rend ../IVAS_rend_test

  - cd ..

  - rm -rf build/*

  - git restore .



  ### store the current commit hash

  - source_branch_commit_sha=$(git rev-parse HEAD)



  ### checkout version to compare against

  - *mr-fetch-target-branch



  - *mr-get-target-commit

  - git checkout $target_commit



  ### build reference binaries

  - *disable-debugging-macro

  - cd build

  - cmake ..

  - make -j
@@ -131,6 +135,7 @@ stages: 
  - mv IVAS_dec ../IVAS_dec_ref

  - mv IVAS_rend ../IVAS_rend_ref

  - cd ..

  - git restore .



  # rename test binaries back

  - mv IVAS_cod_test IVAS_cod

apps/decoder.c

+20 −2
Original line number Diff line number Diff line
@@ -765,10 +765,28 @@ int main( 
        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

#ifdef FIX_OLD_BINARY_FORMAT

                hrtfFileReader_close( &hrtfReader );

                strcat( arg.hrtfFileName, "new" );

                if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                    goto cleanup;

                }

                if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

                {

                    if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                    {

                        fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                        goto cleanup;

                    }

                    else

                    {

                        destroy_td_hrtf( hHrtfTD );

                    }

                }

#else

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

#endif

            }

apps/renderer.c

+22 −0
Original line number Diff line number Diff line
@@ -1077,6 +1077,18 @@ int main( 
            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

#ifdef FIX_OLD_BINARY_FORMAT

                    hrtfFileReader_close( &hrtfFileReader );

                    strcat( args.customHrtfFilePath, "new" );

                    if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );

                        goto cleanup;

                    }

                    if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

                    {

                        if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                        {

                            fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );

                            goto cleanup;

                        }
@@ -1085,6 +1097,16 @@ int main( 
                            destroy_td_hrtf( hHrtfTD );

                        }

                    }

#else

                    fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );

                    goto cleanup;

#endif

                }

                else

                {

                    destroy_td_hrtf( hHrtfTD );

                }

            }



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

ci/smoke_test.sh

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat 
ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"

duration_arg="-U 1:2"

verbosity_cmd="-z console"

ep_file="ci/complexity_measurements/ep_10pct_fer.g192"



if [ $BUILD -eq 1 ];then

	# Enable memory macros to find unbalanced memory allocations/deallocations
@@ -88,7 +89,7 @@ echo "\n======================= 2. ism modes no FEC =======================\n\n" 
./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $ism_md_cmd | tee smoke_test_output.txt

# run the decoding again, but with 15% frame loss

echo "\n======================= 3. all modes with FEC =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only | tee smoke_test_output_plc.txt



# run JBM modes - EXT is excluded as not supported yet

# OMASA disabled for now

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+15 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ 
#endif

#define DEFAULT_INPUT_ROM_FILE "ivas_binaural"



#ifdef FIX_OLD_BINARY_FORMAT

#define DEFAULT_BIN_FILE_EXT_OUT ".binnew"

#endif

#define DEFAULT_BIN_FILE_EXT ".bin"



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
@@ -311,13 +314,25 @@ int main( int argc, char *argv[] ) 


    for ( k = 0; k < nb_freq; k++ )

    {

#ifdef FIX_OLD_BINARY_FORMAT

        full_out_path = (char *) malloc( sizeof( char ) * ( strlen( output_path ) + 1 + strlen( output_file_name ) + 6 + strlen( DEFAULT_BIN_FILE_EXT_OUT ) + 1 ) );

#else

        full_out_path = (char *) malloc( sizeof( char ) * ( strlen( output_path ) + 1 + strlen( output_file_name ) + 6 + strlen( DEFAULT_BIN_FILE_EXT ) + 1 ) );

#endif

        if ( full_out_path )

        {

#ifdef FIX_OLD_BINARY_FORMAT

#ifdef _WIN32

            sprintf( full_out_path, "%s\\%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT_OUT );

#else

            sprintf( full_out_path, "%s/%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT_OUT );

#endif

#else

#ifdef _WIN32

            sprintf( full_out_path, "%s\\%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT );

#else

            sprintf( full_out_path, "%s/%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT );

#endif

#endif

        }

        else