Commit 9c540b53 authored by emerit's avatar emerit
Browse files

tables fix

parent a61f5f93

lib_dec/ivas_mct_dec.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1190,7 +1190,6 @@ static ivas_error ivas_mc_dec_reconfig( 
#ifdef FIX_CREND_SIMPLIFY_CODE

#ifdef FIX_CREND_SIMPLIFY_CODE

                ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

                ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

#else

#else



                ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );

                ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );

#endif

#endif

            }

            }

lib_rend/ivas_crend.c

+14 −1
Original line number Original line Diff line number Diff line
@@ -91,6 +91,11 @@ ivas_error ivas_hrtf_init( 
            hHrtf->pIndex_frequency_max[i][j] = NULL;

            hHrtf->pIndex_frequency_max[i][j] = NULL;

            hHrtf->pOut_to_bin_re[i][j] = NULL;

            hHrtf->pOut_to_bin_re[i][j] = NULL;

            hHrtf->pOut_to_bin_im[i][j] = NULL;

            hHrtf->pOut_to_bin_im[i][j] = NULL;

#ifdef FIX_CREND_SIMPLIFY_CODE

            hHrtf->pOut_to_bin_re_dyn[i][j] = NULL;

            hHrtf->pOut_to_bin_im_dyn[i][j] = NULL;

            hHrtf->pIndex_frequency_max_dyn[i][j] = NULL;

#endif

        }

        }

    }

    }
@@ -100,6 +105,11 @@ ivas_error ivas_hrtf_init( 
        hHrtf->pIndex_frequency_max_diffuse[j] = NULL;

        hHrtf->pIndex_frequency_max_diffuse[j] = NULL;

        hHrtf->pOut_to_bin_diffuse_re[j] = NULL;

        hHrtf->pOut_to_bin_diffuse_re[j] = NULL;

        hHrtf->pOut_to_bin_diffuse_im[j] = NULL;

        hHrtf->pOut_to_bin_diffuse_im[j] = NULL;

#ifdef FIX_CREND_SIMPLIFY_CODE

        hHrtf->pIndex_frequency_max_diffuse_dyn[j] = NULL;

        hHrtf->pOut_to_bin_diffuse_re_dyn[j] = NULL;

        hHrtf->pOut_to_bin_diffuse_im_dyn[j] = NULL;

#endif

    }

    }





    hHrtf->init_from_rom = 1;

    hHrtf->init_from_rom = 1;
@@ -1544,8 +1554,11 @@ ivas_error ivas_rend_openCrend( 
                hCrend->freq_buffer_re_diffuse[1] = NULL;

                hCrend->freq_buffer_re_diffuse[1] = NULL;

                hCrend->freq_buffer_im_diffuse[1] = NULL;

                hCrend->freq_buffer_im_diffuse[1] = NULL;

            }

            }



#ifdef FIX_CREND_SIMPLIFY_CODE

            max_total_ir_len = (int32_t) ( hHrtf->latency_s * output_Fs + 0.5f ) + subframe_length;

#else

            max_total_ir_len = (int16_t) ( hHrtf->latency_s * output_Fs + 0.5f ) + subframe_length;

            max_total_ir_len = (int16_t) ( hHrtf->latency_s * output_Fs + 0.5f ) + subframe_length;

#endif

            if ( max_total_ir_len > 0 )

            if ( max_total_ir_len > 0 )

            {

            {

                if ( ( hCrend->lfe_delay_line = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )

                if ( ( hCrend->lfe_delay_line = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )

lib_rend/ivas_rom_binauralRenderer.c

+47397 −39351

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binaural_crend_head.h

+49 −0
Original line number Original line Diff line number Diff line
@@ -243,6 +243,8 @@ extern const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS] 




/********************** CRendBin_Combined_BRIR **********************/

/********************** CRendBin_Combined_BRIR **********************/





#ifdef USE_NEW_CREND_ROM_TABLE 



extern const float CRendBin_Combined_BRIR_latency_s;

extern const float CRendBin_Combined_BRIR_latency_s;





/* Sample Rate = 48000 */

/* Sample Rate = 48000 */
@@ -287,6 +289,53 @@ extern const float CRendBin_Combined_BRIR_coeff_im_16kHz[HRTF_LS_CHANNELS][BINAU 
extern const float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2474];

extern const float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2474];

extern const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2474];

extern const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2474];





#else



extern float CRendBin_Combined_BRIR_latency_s;



/* Sample Rate = 48000 */



extern int16_t CRendBin_Combined_BRIR_max_num_iterations_48kHz;

extern uint16_t CRendBin_Combined_BRIR_num_iterations_48kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][22];

extern uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz;

extern float CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[BINAURAL_CHANNELS][15];

extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS][40];

extern float CRendBin_Combined_BRIR_coeff_re_48kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][2955];

extern float CRendBin_Combined_BRIR_coeff_im_48kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][2955];

extern float CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS][2885];

extern float CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS][2885];



/* Sample Rate = 32000 */



extern int16_t CRendBin_Combined_BRIR_max_num_iterations_32kHz;

extern uint16_t CRendBin_Combined_BRIR_num_iterations_32kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][22];

extern uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz;

extern float CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[BINAURAL_CHANNELS][15];

extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS][40];

extern float CRendBin_Combined_BRIR_coeff_re_32kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][2819];

extern float CRendBin_Combined_BRIR_coeff_im_32kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][2819];

extern float CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS][2870];

extern float CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS][2870];



/* Sample Rate = 16000 */



extern int16_t CRendBin_Combined_BRIR_max_num_iterations_16kHz;

extern uint16_t CRendBin_Combined_BRIR_num_iterations_16kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][23];

extern uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz;

extern float CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[BINAURAL_CHANNELS][15];

extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS][40];

extern float CRendBin_Combined_BRIR_coeff_re_16kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][1774];

extern float CRendBin_Combined_BRIR_coeff_im_16kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][1774];

extern float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2522];

extern float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2522];



#endif





/********************** default HRIR reverb rom tables **********************/

/********************** default HRIR reverb rom tables **********************/