Commit 30cc90a4 authored by emerit's avatar emerit
Browse files

fix after merge with main

parent ddac1772
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -737,8 +737,8 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs_fx(
            FOR( j = 0; j < HRTF_SH_CHANNELS; j++ )
            {
#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM
                Copy( hrtfShCoeffsRe[i][j], hrtfParambin->hrtfShCoeffsRe_fx[i][j], HRTF_NUM_BINS );
                Copy( hrtfShCoeffsIm[i][j], hrtfParambin->hrtfShCoeffsIm_fx[i][j], HRTF_NUM_BINS );
                Copy( hrtfShCoeffsRe_fx[i][j], hrtfParambin->hrtfShCoeffsRe_fx[i][j], HRTF_NUM_BINS );
                Copy( hrtfShCoeffsIm_fx[i][j], hrtfParambin->hrtfShCoeffsIm_fx[i][j], HRTF_NUM_BINS );
#else
                Copy( hrtfShCoeffsRe_fx[i][j], hrtfParambin->hrtfShCoeffsRe_fx[i][j], HRTF_NUM_BINS );
                Copy( hrtfShCoeffsIm_fx[i][j], hrtfParambin->hrtfShCoeffsIm_fx[i][j], HRTF_NUM_BINS );
@@ -6940,12 +6940,6 @@ static void hrtfShGetHrtf_fx(
)
{
    Word16 k;
#ifdef FIX_POINT_HRTF_FILE_FORMAT
    Word16( *hrtfShCoeffsReInt )[16][60];
    Word16( *hrtfShCoeffsImInt )[16][60];
    hrtfShCoeffsReInt = hHrtfParambin->hrtfShCoeffsRe_fx;
    hrtfShCoeffsImInt = hHrtfParambin->hrtfShCoeffsIm_fx;
#endif
    *lRealp = 0;
    *lImagp = 0;
    *rRealp = 0;
+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@
 *------------------------------------------------------------------------*/
/* TD renderer default HRIR model */
#ifdef DEBUGGING
/* Generated on 05-Sep-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */
/* Generated on 11-Sep-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */
#endif
#ifdef IVAS_FLOAT_FIXED
+4 −216

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

+5 −5

File changed.

Contains only whitespace changes.

Loading