Commit afc49373 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge conflict resolution

parent a240a14a

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static 
#define IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV ( 4 )



#ifdef CONTROL_METADATA_REVERB

#define ACOUSTIC_ENVIRONMENT_ID    0

#define ACOUSTIC_ENVIRONMENT_ID ( 0 )

#endif



#ifdef VARIABLE_SPEED_DECODING

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
#ifdef CONTROL_METADATA_REVERB

#define CONTROL_METADATA_EARLY_REFLECTIONS              /* Philips/Qualcomm: early reflections extension to reverb configuration */

#endif

#define COMMAND_LINE_OPTION_LATE_REVERB                 /* Philips: late reverb command line option */

#define USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000  /* Dolby (Orange, FhG) : Contribution 36 - SBA HRIR update */

#define UPDATE_SBA_FILTER                               /* Dolby (Orange, FhG) : Contribution 36 - SBA HRIR update */

lib_rend/ivas_crend.c

+0 −3
Original line number Diff line number Diff line
@@ -206,9 +206,6 @@ static ivas_error ivas_rend_initCrend( 
#ifndef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

    /* set BRIR flag */

    use_brir = false;

#ifdef COMMAND_LINE_OPTION_LATE_REVERB

    /* note: use_brir = false for IVAS_REND_AUDIO_CONFIG_BINAURAL_REVERB */

#endif

    if ( ( ( hRendCfg != NULL ) && hRendCfg->roomAcoustics.use_brir ) || ( ( hRendCfg == NULL ) && ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) )

    {

        use_brir = true;