Commit d7d7ab8a authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_587_DEFAULT_REVERB

parent 0c6a51a0

apps/decoder.c

+0 −3
Original line number Diff line number Diff line
@@ -698,9 +698,6 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

                goto cleanup;

            }

#ifndef FIX_587_DEFAULT_REVERB

            renderConfig.roomAcoustics.override = true;

#endif

        }



        /* ISAR frame size is set from command line, not renderer config file.

apps/renderer.c

+0 −3
Original line number Diff line number Diff line
@@ -1052,9 +1052,6 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

                exit( -1 );

            }

#ifndef FIX_587_DEFAULT_REVERB

            renderConfig.roomAcoustics.override = 1;

#endif

        }



        /* ISAR frame size is set from command line, not renderer config file.

lib_com/common_api_types.h

+0 −3
Original line number Diff line number Diff line
@@ -327,9 +327,6 @@ typedef enum 


typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

{

#ifndef FIX_587_DEFAULT_REVERB

    int16_t override;

#endif

    int16_t nBands;                                   /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */

    float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX];      /* Center frequencies for which following values are provided:                                        */

    float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX]; /*  - The room's T60 per center frequency                                                             */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 


#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */



#define FIX_587_DEFAULT_REVERB                          /* Philips: issue 587: inconsistent default reverb parameters across renderers */



#define FIX_HRTF_LOAD                                   /* VA: issue 1187: fix memory issue when HRTFs are loaded from a binary file */

#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */

lib_dec/ivas_binRenderer_internal.c

+0 −18
Original line number Diff line number Diff line
@@ -1075,9 +1075,7 @@ ivas_error ivas_binRenderer_open( 
    BINAURAL_RENDERER_HANDLE hBinRenderer;

    int16_t convBand, k;

    ivas_error error;

#ifdef FIX_587_DEFAULT_REVERB

    const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;

#endif



    error = IVAS_ERR_OK;
@@ -1224,7 +1222,6 @@ ivas_error ivas_binRenderer_open( 
    /* Allocate memories needed for reverb module */

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {

#ifdef FIX_587_DEFAULT_REVERB

        pRoomAcoustics = ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ? &( st_ivas->hRenderConfig->roomAcoustics ) : NULL;

        if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ),

                                                  st_ivas->hHrtfStatistics,
@@ -1239,21 +1236,6 @@ ivas_error ivas_binRenderer_open( 
                                                  hBinRenderer->earlyPartEneCorrection

#endif

                                                  ) ) != IVAS_ERR_OK )

#else

        if ( ( 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,

                                                  st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections

#ifdef FIX_1139_REV_COLORATION_SHORT_T60

                                                  ,

                                                  hBinRenderer->earlyPartEneCorrection

#endif

                                                  ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }