Commit b5bce31a authored by emerit's avatar emerit
Browse files

add missing ifdef

parent b11453f1

lib_util/hrtf_file_reader.c

+22 −2
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ ivas_error dealloc_HRTF_binary( 
            free( hHrtf->lr_energy_and_iac_dyn[i] );

        }

    }



    return error;

}
@@ -1056,17 +1057,29 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 


    hrtf_data_rptr = hrtf_data;

    

 #ifndef FIX_BINARY_BINAURAL_READING

    /* BINAURAL_CONVBANDS */

    if ( BINAURAL_CONVBANDS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

    {

        return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_CONVBANDS)" );

    }

    hrtf_data_rptr += sizeof( uint16_t );

#endif

   



    /* HRIR */

    if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )

    {

        ( *hHRTF )->FASTCONV_HRIR_latency_s = *( (float *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( float );



 #ifdef FIX_BINARY_BINAURAL_READING

         if ( BINAURAL_CONVBANDS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_CONVBANDS)" );

        }

        hrtf_data_rptr += sizeof( uint16_t );

#endif        



        if ( HRTF_LS_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {
@@ -1119,12 +1132,13 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        ( *hHRTF )->FASTCONV_HOA3_latency_s = *( (float *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( float );





#ifdef FIX_BINARY_BINAURAL_READING

        if ( BINAURAL_CONVBANDS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_CONVBANDS)" );

        }

        hrtf_data_rptr += sizeof( uint16_t );

#endif        



        if ( HOA3_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {
@@ -1176,11 +1190,13 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        ( *hHRTF )->FASTCONV_HOA2_latency_s = *( (float *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( float );



#ifdef FIX_BINARY_BINAURAL_READING

        if ( BINAURAL_CONVBANDS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_CONVBANDS)" );

        }

        hrtf_data_rptr += sizeof( uint16_t );

#endif        



        if ( HOA2_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {
@@ -1233,11 +1249,13 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        ( *hHRTF )->FASTCONV_FOA_latency_s = *( (float *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( float );



#ifdef FIX_BINARY_BINAURAL_READING

        if ( BINAURAL_CONVBANDS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_CONVBANDS)" );

        }

        hrtf_data_rptr += sizeof( uint16_t );

#endif



        if ( FOA_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {
@@ -1290,11 +1308,13 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        ( *hHRTF )->FASTCONV_BRIR_latency_s = *( (float *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( float );



#ifdef FIX_BINARY_BINAURAL_READING

        if ( BINAURAL_CONVBANDS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_CONVBANDS)" );

        }

        hrtf_data_rptr += sizeof( uint16_t );

#endif        



        if ( HRTF_LS_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {