Commit 220c4e7e authored by emerit's avatar emerit
Browse files

Merge branch 'hrtf_file_updates_for_delivery' into 'main' 

Include both genaration of hrtf binary file in floating point and fix point. Only floating is activated by switch

See merge request !1568
parents c4047795 4293a78f

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ 
#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

#endif



//#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT          /* Orange issue 1031 : new fix point hrtf binary file format */

//#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

lib_rend/ivas_crend.c

+31 −0
Original line number Diff line number Diff line
@@ -1642,7 +1642,11 @@ static ivas_error ivas_rend_crendConvolver( 
    const float *pIn;

    float *pFreq_buf_re, *pFreq_buf_im;

    float *pFreq_buf2_re, *pFreq_buf2_im;

#ifdef FIX_CREND_SIMPLIFY_CODE

    float *pFreq_filt_re, *pFreq_filt_im;

#else

    const float *pFreq_filt_re, *pFreq_filt_im;

#endif

    float pOut[L_FRAME48k * 2];

    float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k];

    CREND_HANDLE hCrend;
@@ -1694,6 +1698,23 @@ static ivas_error ivas_rend_crendConvolver( 
    }



    i = 0;

#ifdef FIX_CREND_SIMPLIFY_CODE

    if ( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 )

    {

        if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )

        {

            pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

            pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

        }

        else

        {

            pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

            pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

            pFreq_buf2_re = &hCrend->freq_buffer_re_diffuse[1][offset_diffuse];

            pFreq_buf2_im = &hCrend->freq_buffer_im_diffuse[1][offset_diffuse];

        }

    }

#endif

    for ( idx_in = 0; idx_in < nchan_in; idx_in++ )

    {

        pIn = &pcm_in[idx_in][i_ts * subframe_length];
@@ -1703,8 +1724,10 @@ static ivas_error ivas_rend_crendConvolver( 
            {

                if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )

                {

#ifndef FIX_CREND_SIMPLIFY_CODE

                    pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

                    pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

#endif

                    pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

                    pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];
@@ -1716,10 +1739,12 @@ static ivas_error ivas_rend_crendConvolver( 
                }

                else

                {

#ifndef FIX_CREND_SIMPLIFY_CODE

                    pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

                    pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

                    pFreq_buf2_re = &hCrend->freq_buffer_re_diffuse[1][offset_diffuse];

                    pFreq_buf2_im = &hCrend->freq_buffer_im_diffuse[1][offset_diffuse];

#endif

                    pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

                    pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];
@@ -1732,11 +1757,17 @@ static ivas_error ivas_rend_crendConvolver( 
                    }

                }

            }

#ifdef FIX_CREND_SIMPLIFY_CODE

            pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

            pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];



            ivas_mdft( pIn, pFreq_filt_re, pFreq_filt_im, subframe_length, subframe_length );

#else

            pFreq_buf_re = &hCrend->freq_buffer_re[i][offset];

            pFreq_buf_im = &hCrend->freq_buffer_im[i][offset];



            ivas_mdft( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length );

#endif

            i++;

        }

    }

lib_util/hrtf_file_reader.c

+1115 −118

File changed.

Preview size limit exceeded, changes collapsed.

lib_util/hrtf_file_reader.h

+2 −0
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ typedef enum 
    HRTF_READER_RENDERER_BINAURAL_FASTCONV,

    HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC,

#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM,

#endif

    HRTF_READER_RENDERER_BINAURAL_OBJECTS_TD,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM,

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+372 −21

File changed.

Preview size limit exceeded, changes collapsed.