Commit a7365b5b authored by vaclav's avatar vaclav
Browse files

merge FIX_1228_HRTF_STATISTICS into FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

parent 4c0c556b

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -3885,7 +3885,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( 
        }

    }



#ifdef FIX_1228_HRTF_STATISTICS

#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

    if ( hHrtfBinary->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

    if ( hHrtfBinary->hHrtfStatistics == NULL )

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ 
#define FIX_1227_Crend_HRTF_LOADING_OPTIM               /* VA: issue 1227: for Crend binaural renderer in decoder, load only HTRT coefficient set that is needed */

#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

#define FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE    /* VA: issue 1228: Exit the processing when a HRTF binary file with wrong sampling rate is provided */

#define FIX_1228_HRTF_STATISTICS                        /* VA: issue 1228: allocate 'HRTFstatistics' handle only when needed */





/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2867,7 +2867,7 @@ ivas_error IVAS_DEC_HRTF_binary_open( 
            }

        }



#ifdef FIX_1228_HRTF_STATISTICS

#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

        if ( st_ivas->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hHrtfStatistics == NULL )