Commit a7664605 authored by emerit's avatar emerit
Browse files

on going merge

parent d5426b60

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
//#define FIX_POINT_HRTF_FILE_FORMAT_REVERB          /* ORANGE : add crend changes and fix point binaural rom and hrtf binary file format */

// #define FIX_POINT_CREND_HRTF_FILE_FORMAT

//#define FIX_TDREND_HRTF_FILE_FORMAT

#define FIX_POINT_HRTF_FILE_OPTIM

//#define FIX_POINT_HRTF_FILE_OPTIM

#ifdef FIX_POINT_HRTF_FILE_OPTIM

#define FIX_POINT_HRTF_FILE_FORMAT

#endif

lib_dec/ivas_binRenderer_internal.c

+11 −1
Original line number Diff line number Diff line
@@ -519,8 +519,13 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
            IF( EQ_16( renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

            {

                /* set the memories to zero */

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

                set16_fx( hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

                set16_fx( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

#else

                set32_fx( hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

                set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

#endif

                set16_fx( hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx], 31, hBinRenConvModule->numTapsArray[bandIdx] );

                IF( isLoudspeaker )

                {
@@ -533,8 +538,13 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
            ELSE

            {

                /* set the memories to zero */

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

                set16_fx( hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

                set16_fx( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

#else

                set32_fx( hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTaps );

                set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTaps );

#endif

                set16_fx( hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx], 31, hBinRenConvModule->numTaps );

                IF( isLoudspeaker )

                {
@@ -1084,7 +1094,7 @@ static ivas_error ivas_binaural_hrtf_open_fx( 
            {

                FOR( j = 0; j < HRTF_LS_CHANNELS; j++ )

                {

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

#ifdef FIX_POINT_HRTF_FILE_OPTIM

                    HrtfFastConv->leftReal_fx[i][j] = leftHRIRReal_fx[i][j];

                    HrtfFastConv->leftImag_fx[i][j] = leftHRIRImag_fx[i][j];

                    HrtfFastConv->rightReal_fx[i][j] = rightHRIRReal_fx[i][j];

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2458,7 +2458,7 @@ ivas_error ivas_init_decoder_fx( 
        }

#else

        IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,

                                                  st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0 ) ),

                                                  st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ),

                   IVAS_ERR_OK ) )

        {

            return error;

lib_dec/ivas_ism_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
#ifdef FIX_POINT_HRTF_FILE_OPTIM

            IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

#else

            IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0 ) ), IVAS_ERR_OK ) )

            IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

#endif

#else

#ifdef FIX_POINT_HRTF_FILE_OPTIM

lib_dec/ivas_mct_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
#ifdef FIX_POINT_HRTF_FILE_OPTIM

                IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

#else

                IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0 ) ), IVAS_ERR_OK ) )

                IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

#endif

#else

#ifdef FIX_POINT_HRTF_FILE_OPTIM