Commit 327a2086 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into 984-omasa-ext-output-for-non-disc-modes 

# Conflicts:
#	lib_dec/ivas_jbm_dec.c
#	lib_dec/ivas_omasa_dec.c
parents c56ee4c9 616854b7

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ test-long-self-test: 


    ### switch to main

    - git checkout main

    - git pull origin main

    - echo "Building reference codec at commit $(git rev-parse HEAD)"



    ### build main (ref) binaries

LICENSE.md

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

apps/decoder.c

+34 −75
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -196,13 +196,11 @@ int main( 
    RenderConfigReader *renderConfigReader = NULL;

    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

#endif

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;
@@ -459,9 +457,14 @@ int main( 
     *------------------------------------------------------------------------------------------*/



#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef SPLIT_REND_LCLD_5MS

    asked_frame_size = arg.renderFramesize;

#endif

    if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

#ifndef SPLIT_REND_LCLD_5MS

        asked_frame_size = arg.renderFramesize;

#endif

        if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -474,11 +477,12 @@ int main( 
            goto cleanup;

        }



#ifndef SPLIT_REND_LCLD_5MS

        if ( arg.renderFramesize != asked_frame_size )

        {

            fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for split rendering!\n" );

        }



#endif

        arg.enableHeadRotation = true;

    }

#endif
@@ -632,6 +636,7 @@ int main( 
        }



#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifndef SPLIT_REND_LCLD_5MS

        if ( arg.renderFramesize == IVAS_RENDER_FRAMESIZE_5MS && ( renderConfig.split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE ||

                                                                   renderConfig.split_rend_config.dof == 0 ) )

        {
@@ -649,7 +654,7 @@ int main( 
        }



#endif



#endif

        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
@@ -662,6 +667,30 @@ int main( 
            goto cleanup;

        }



#ifdef SPLIT_REND_LCLD_5MS

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS && ( renderConfig.split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE ||

                                                                 renderConfig.split_rend_config.dof == 0 ) )

        {

            arg.renderFramesize = asked_frame_size;

        }

        else

        {

            arg.renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;

        }



        if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        if ( arg.renderFramesize != asked_frame_size )

        {

            fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );

        }

#endif

#endif



        if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
@@ -715,16 +744,12 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -737,17 +762,8 @@ int main( 
                destroy_td_hrtf( hHrtfTD );

            }

        }

#else

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

        {

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

            goto cleanup;

        }

#endif



#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -756,26 +772,14 @@ int main( 
                goto cleanup;

            }

        }

#else

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

        {

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

            goto cleanup;

        }

#endif

#endif

#endif



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -788,20 +792,14 @@ int main( 
                destroy_SetOfHRTF( hSetOfHRTF );

            }

        }

#endif



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

#else

        IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfFastConvHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -814,26 +812,14 @@ int main( 
                destroy_fastconv_hrtf( hHrtfFastConv );

            }

        }

#else

        if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )

        {

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

            goto cleanup;

        }

#endif



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

#else

        IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfParamBinHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -846,17 +832,8 @@ int main( 
                destroy_parambin_hrtf( hHrtfParambin );

            }

        }

#else

        if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )

        {

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

            goto cleanup;

        }

#endif



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -874,14 +851,6 @@ int main( 
                destroy_hrtf_statistics( hHrtfStatistics );

            }

        }

#else

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

        {

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

            goto cleanup;

        }

#endif

#endif

#endif

    }
@@ -959,19 +928,9 @@ cleanup: 
#endif

    if ( arg.hrtfReaderEnabled )

    {

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        destroy_td_hrtf( hHrtfTD );

#else

        dealloc_HRTF_binary( hHrtfTD );

#endif



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

        destroy_SetOfHRTF( hSetOfHRTF );

apps/encoder.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

apps/renderer.c

+24 −39
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -743,14 +743,12 @@ int main( 
#endif

    Vector3PairFileReader *referenceVectorReader = NULL;

    hrtfFileReader *hrtfFileReader = NULL;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

#endif

    IsmPositionProvider *positionProvider;

    LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];
@@ -804,10 +802,8 @@ int main( 


#ifdef SPLIT_REND_WITH_HEAD_ROT

    hSplitRendFileReadWrite = NULL;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    CLDFBframeSize_smpls = 0;

    cldfb_in_flag = 0;

#endif

#endif

    for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )

    {
@@ -881,16 +877,6 @@ int main( 
        }

    }



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

    if ( !isEmptyString( args.customHrtfFilePath ) )

    {

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

        {

            fprintf( stderr, "Error opening file: %s\n", args.customHrtfFilePath );

            exit( -1 );

        }

    }

#endif



    if ( !isEmptyString( args.renderConfigFilePath ) )

    {
@@ -1016,17 +1002,12 @@ int main( 
#endif

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



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

#endif

    {

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

        exit( -1 );

    }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    if ( !isEmptyString( args.customHrtfFilePath ) )

    {

        if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
@@ -1057,7 +1038,6 @@ int main( 
            }



#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

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

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -1066,7 +1046,6 @@ int main( 
                    goto cleanup;

                }

            }

#endif

#endif



            if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
@@ -1127,7 +1106,6 @@ int main( 
            }



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStatistics ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );
@@ -1145,13 +1123,11 @@ int main( 
                    destroy_hrtf_statistics( hHrtfStatistics );

                }

            }

#endif

#endif

        }



        hrtfFileReader_close( &hrtfFileReader );

    }

#endif



    /* === Configure === */

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
@@ -1160,12 +1136,6 @@ int main( 
        exit( -1 );

    }



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

#ifdef SPLIT_REND_WITH_HEAD_ROT

    CLDFBframeSize_smpls = 0;

    cldfb_in_flag = 0;

#endif

#endif

    if ( args.renderConfigFilePath[0] != '\0' )

    {

        IVAS_RENDER_CONFIG_DATA renderConfig;
@@ -1933,7 +1903,8 @@ int main( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

        for ( i = 0; i < args.inConfig.numBinBuses; ++i )

        {

            if ( splitBinNeedsNewFrame )

#ifdef SPLIT_REND_LCLD_5MS

            if ( numSamplesRead > 0 )

            {

                if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )

                {
@@ -1947,7 +1918,24 @@ int main( 
                    fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

                    exit( -1 );

                }

            }

#endif

            if ( splitBinNeedsNewFrame )

            {

#ifndef SPLIT_REND_LCLD_5MS

                if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )

                {

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

                    exit( -1 );

                }

                IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.binBuses[i].inputChannelIndex, numChannels );



                if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, splitBinIds[i], tmpBuffer ) ) != IVAS_ERR_OK )

                {

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

                    exit( -1 );

                }

#endif

                if ( ( error = IVAS_REND_FeedSplitBinauralBitstream( hIvasRend, splitBinIds[i], &bitsBuffer ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
@@ -2231,9 +2219,7 @@ int main( 
    free( outInt16Buffer );

    free( outFloatBuffer );



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

cleanup:

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( bitsBufferData != NULL )
@@ -2253,6 +2239,9 @@ cleanup: 
    }



    split_rend_reader_writer_close( &hSplitRendFileReadWrite );

#ifdef SPLIT_REND_LCLD_5MS

    SplitRendBFIFileReader_close( &splitRendBFIReader );

#endif

#endif



    for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
@@ -2265,16 +2254,12 @@ cleanup: 
    RotationFileReader_close( &headRotReader );

    RotationFileReader_close( &externalOrientationFileReader );

    RotationFileReader_close( &referenceRotReader );



    Vector3PairFileReader_close( &referenceVectorReader );

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

    hrtfFileReader_close( &hrtfFileReader );

#endif

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    destroy_td_hrtf( hHrtfTD );

    destroy_SetOfHRTF( hSetOfHRTF );

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    destroy_hrtf_statistics( hHrtfStatistics );

#endif

#endif

    IVAS_REND_Close( &hIvasRend );

    IsmPositionProvider_close( positionProvider );