Commit 072879f3 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '109-harmonize-head-and-orientation-tracking' into... 

Merge branch '109-harmonize-head-and-orientation-tracking' into 109-harmonize-head-and-orientation-tracking-xcheck
parents 12519611 1d5f21f5

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ workflow: 
    # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines

    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"

      when: never

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Runs for merge requests

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main

    - if: $CI_PIPELINE_SOURCE == 'web' # for testing
@@ -130,7 +130,7 @@ stages: 
.rules-merge-request:

  extends: .rules-basis

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

apps/decoder.c

+41 −3
Original line number Diff line number Diff line
@@ -238,8 +238,21 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

#ifdef FIX_351_HRTF_COMMAND

        /* sanity check */

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

        {

            arg.hrtfReaderEnabled = false;

            fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }

#endif



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

        {

#ifdef FIX_351_HRTF_COMMAND

            arg.hrtfReaderEnabled = false;

#endif

            fprintf( stderr, "\nError: Can't open HRTF binary file %s \n\n", arg.hrtfFileName );

            goto cleanup;

        }
@@ -251,6 +264,15 @@ int main( 


    if ( arg.enableHeadRotation )

    {

#ifdef FIX_351_HRTF_COMMAND

        /* sanity check */

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

        {

            fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }

#endif



        if ( ( error = HeadRotationFileReader_open( arg.headrotTrajFileName, &headRotReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open head-rotation file %s \n\n", arg.headrotTrajFileName );
@@ -291,6 +313,15 @@ int main( 


    if ( arg.renderConfigEnabled )

    {

#ifdef FIX_351_HRTF_COMMAND

        /* sanity check */

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

        {

            fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }

#endif



        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
@@ -303,13 +334,21 @@ int main( 
     *------------------------------------------------------------------------------------------*/



#ifdef REMOVE_FORCE_SUBFRAME_BIN

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK )

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )

#else

#ifdef DEBUGGING

#ifdef FIX_351_HRTF_COMMAND

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef FIX_351_HRTF_COMMAND

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK )

#endif

#endif

#endif

    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -486,9 +525,7 @@ int main( 
        if ( ( error = create_SetOfHRTF_from_binary( hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

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

#ifndef FIX_FOR_TEST

            goto cleanup;

#endif

        }

        IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv;

        IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv );
@@ -569,6 +606,7 @@ cleanup: 
#ifdef DEBUG_SBA_AUDIO_DUMP

    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

#endif



    if ( arg.hrtfReaderEnabled )

    {

        IVAS_DEC_HRTF_HANDLE hHrtfTD;

apps/encoder.c

+63 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ int main( 
        goto cleanup;

    }



#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS

    /*------------------------------------------------------------------------------------------*

     * Open input audio file

     *------------------------------------------------------------------------------------------*/
@@ -228,6 +229,7 @@ int main( 
        fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename );

        goto cleanup;

    }

#endif



    /*------------------------------------------------------------------------------------------*

     * Open output bitstream file
@@ -450,6 +452,67 @@ int main( 
        goto cleanup;

    }



#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

    /*------------------------------------------------------------------------------------------*

     * Open input audio file

     *------------------------------------------------------------------------------------------*/



    if ( AudioFileReader_open( &audioReader, arg.inputWavFilename ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename );

        goto cleanup;

    }



    /* Validate input sampling rate */

    int32_t inFileSampleRate = 0;

    error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate );

    switch ( error )

    {

        case IVAS_ERR_OK:

            if ( inFileSampleRate != arg.inputFs )

            {

                fprintf( stderr, "\nSampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename );

                goto cleanup;

            }

            break;

        case IVAS_ERR_SAMPLING_RATE_UNKNOWN:

            /* IVAS_ERR_SAMPLING_RATE_UNKNOWN will be returned for raw PCM files.

             * Nothing to check here */

            break;

        default:

            fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

    }





    /* Validate number of channels */

    int16_t encInNumChannels = 0;

    if ( ( error = IVAS_ENC_GetNumInChannels( hIvasEnc, &encInNumChannels ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }

    int16_t inFileNumChannels = 0;

    error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels );

    switch ( error )

    {

        case IVAS_ERR_OK:

            if ( inFileNumChannels != encInNumChannels )

            {

                fprintf( stderr, "\nNumber of input audio channels mismatch: %d accepted by encoder, but %d found in file %s\n\n", encInNumChannels, inFileNumChannels, arg.inputWavFilename );

                goto cleanup;

            }

            break;

        case IVAS_ERR_NUM_CHANNELS_UNKNOWN:

            /* IVAS_ERR_NUM_CHANNELS_UNKNOWN will be returned for raw PCM files.

             * Nothing to check here */

            break;

        default:

            fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

    }

#endif



    /*------------------------------------------------------------------------------------------*

     * Open input metadata files

     *------------------------------------------------------------------------------------------*/

apps/renderer.c

+50 −0
Original line number Diff line number Diff line
@@ -615,6 +615,51 @@ int main( 
        setupWithSingleFormatInput( args, audioFilePath, positionProvider, masaReaders );

    }



#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

    if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "Error opening file: %s\n", audioFilePath );

        exit( -1 );

    }



    int32_t inFileSampleRate = 0;

    error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate );

    switch ( error )

    {

        case IVAS_ERR_OK:

            /* If sampling rate not given on command line, use the one from wav file */

            if ( args.sampleRate == 0 )

            {

                args.sampleRate = inFileSampleRate;

            }

            /* else if sampling rate given on command line, compare with wav file */

            else if ( inFileSampleRate != args.sampleRate )

            {

                fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath );

                exit( -1 );

            }

            break;

        case IVAS_ERR_SAMPLING_RATE_UNKNOWN: /* Returned when input is raw PCM */

            if ( args.sampleRate == 0 )

            {

                fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" );

                exit( -1 );

            }

            args.sampleRate = inFileSampleRate;

            break;

        default:

            fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

            exit( -1 );

    }



    int16_t inFileNumChannels = 0;

    error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels );

    if ( error != IVAS_ERR_OK && error != IVAS_ERR_NUM_CHANNELS_UNKNOWN )

    {

        fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

        exit( -1 );

    }

#else

    int32_t inFileSampleRate = 0;

    if ( AudioFileReader_open( &audioReader, audioFilePath, &inFileSampleRate ) != IVAS_ERR_OK )

    {
@@ -635,6 +680,7 @@ int main( 
    {

        args.sampleRate = inFileSampleRate;

    }

#endif

    const int16_t frameSize_smpls = (int16_t) ( 20 * args.sampleRate / 1000 );



    IVAS_REND_InputId mcIds[RENDERER_MAX_MC_INPUTS] = { 0 };
@@ -810,8 +856,12 @@ int main( 


    const int16_t totalNumInChannels = getTotalNumInChannels( hIvasRend, mcIds, ismIds, sbaIds, masaIds );



#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

    if ( inFileNumChannels != 0 /* inFileNumChannels is 0 with raw PCM input */ && totalNumInChannels != inFileNumChannels )

#else

    if ( AudioFileReader_getNumChannels( audioReader ) != 0 /* If input file is raw PCM, audio reader has no info about number of channels */

         && totalNumInChannels != AudioFileReader_getNumChannels( audioReader ) )

#endif

    {

        fprintf( stderr, "Number of channels in input file does not match selected configuration\n" );

        exit( -1 );

ci/smoke_test.sh

+3 −3
Original line number Diff line number Diff line
@@ -89,12 +89,12 @@ bin_out_modes="BINAURAL BINAURAL_ROOM" 


wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_)

hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin"

./scripts/runIvasCodec.py -p $cfg -m $wb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only | tee -a smoke_test_output_hrtf.txt

./scripts/runIvasCodec.py -p $cfg -m $wb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt



swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_)

hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin"

./scripts/runIvasCodec.py -p $cfg -m $swb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only | tee -a smoke_test_output_hrtf.txt

./scripts/runIvasCodec.py -p $cfg -m $swb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt



fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_)

hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin"

./scripts/runIvasCodec.py -p $cfg -m $fb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only | tee -a smoke_test_output_hrtf.txt
 
./scripts/runIvasCodec.py -p $cfg -m $fb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt