Commit 85800755 authored by vaclav's avatar vaclav
Browse files

revert reversion of FIX_392_LATE_REVERB

parent 0f17e523

apps/encoder.c

+15 −7
Original line number Diff line number Diff line
@@ -386,8 +386,16 @@ int main( 
            }

            break;

        case IVAS_ENC_INPUT_SBA:

            if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig,

                                                            arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar,

            if ( ( error =

                       IVAS_ENC_ConfigureForAmbisonics(

                           hIvasEnc,

                           arg.inputFs,

                           totalBitrate,

                           arg.max_bwidth_user,

                           bandwidth,

                           arg.dtxConfig,

                           arg.inputFormatConfig.sba.order,

                           arg.inputFormatConfig.sba.isPlanar,

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

                           arg.agc,

#endif

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -675,7 +675,11 @@ int main( 
    }



    /* === Configure === */

#ifdef FIX_392_LATE_REVERB

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) || ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "Error in Renderer Config Init\n" );

        exit( -1 );

lib_com/common_api_types.h

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#define IVAS_MAX_BITS_PER_FRAME     ( 512000 / 50 )

#define IVAS_MAX_NUM_OBJECTS        4

#define IVAS_MAX_OUTPUT_CHANNELS    16

#define IVAS_CLDFB_NO_CHANNELS_MAX  ( 60 )

#define IVAS_CLDFB_NO_CHANNELS_MAX  60

#define IVAS_MAX_INPUT_LFE_CHANNELS 4



#define RENDERER_HEAD_POSITIONS_PER_FRAME 4
@@ -161,7 +161,6 @@ typedef struct _IVAS_LS_CUSTOM_LAYOUT 


} IVAS_CUSTOM_LS_DATA;



typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;

typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT;

lib_com/options.h

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


#define FIX_389_EXT_REND_PCM_SR                         /* Nokia: Issue 389: Fix assignment of sample rate with PCM input. */

#define FIX_390_EXT_REND_MASA_META_COPY                 /* Nokia: Issue 390: Fixes MASA metadata copying to renderer. */

#define FIX_392_LATE_REVERB                             /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/



#define FIX_ISM_DTX_CLICKS                              /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */

lib_dec/ivas_stereo_switching_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -421,7 +421,8 @@ ivas_error stereo_memory_dec( 
            deallocate_CoreCoder( hCPE->hCoreCoder[1] );



            /* allocate DFT stereo data structure */

            if ( ( error = stereo_dft_dec_create( &( hCPE->hStereoDft ), hCPE->element_brate, output_Fs, 0, nchan_transport ) ) != IVAS_ERR_OK )

            if ( ( error = stereo_dft_dec_create( &( hCPE->hStereoDft ), hCPE->element_brate, output_Fs, 0,

                                                  nchan_transport ) ) != IVAS_ERR_OK )

            {

                return error;

            }