Commit 0ce29a7b authored by multrus's avatar multrus
Browse files

formatting

parent 7476506a

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -92,11 +92,8 @@ 
/* #################### Start BASOP porting switches ############################ */



#define FIX_1372_ISAR_POST_REND



#define NONBE_FIX_984_OMASA_EXT_OUTPUT                        /* Nokia: issue #984: complete the OMASA EXT output implementation */



#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */



#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

#define FIX_1741_REVERB_TIMES_Q_FORMAT                  /* Philips: reverberation times in Q26 format instead of Q31 */
@@ -105,6 +102,7 @@ 
#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */



/* #################### End BASOP porting switches ############################ */



#endif

lib_dec/ivas_binRenderer_internal_fx.c

+39 −40
Original line number Diff line number Diff line
@@ -1437,8 +1437,7 @@ ivas_error ivas_binRenderer_open_fx( 
    IF( ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

        {

        IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )

        {

            IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) ){

                return error;

}

lib_dec/ivas_omasa_dec_fx.c

+109 −107
Original line number Diff line number Diff line
@@ -697,8 +697,10 @@ ivas_error ivas_omasa_dec_config_fx( 
            IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )

            {

                /* Allocate TD renderer for the objects in DISC mode */

                IF( st_ivas->hBinRendererTd == NULL ){

                    IF( NE_32( ( error = ivas_td_binaural_open_fx( st_ivas, SrcInd, num_src ) ), IVAS_ERR_OK ) ){

                IF( st_ivas->hBinRendererTd == NULL )

                {

                    IF( NE_32( ( error = ivas_td_binaural_open_fx( st_ivas, SrcInd, num_src ) ), IVAS_ERR_OK ) )

                    {

                        return error;

                    }

                    IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

lib_dec/ivas_ism_dec_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_dec/ivas_ism_metadata_dec_fx.c

+2 −2

File changed.

Contains only whitespace changes.

lib_dec/ivas_stat_dec.h

+1 −1

File changed.

Contains only whitespace changes.