Commit 9902c5ce authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into...

Merge branch 'main' into 2191-basop-port-mr-2293-from-float-fix-for-crash-in-debug-mode-in-macos-when-reading
parents f561b72f ea08a7fa
Loading
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -3046,7 +3046,11 @@ ivas_error isar_renderMultiTDBinToSplitBinaural(
        move32();
        FOR( i = 0; i < num_poses * BINAURAL_CHANNELS; i++ )
        {
#ifdef FIX_1119_SPLIT_RENDERING_VOIP
            FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
#else
            FOR( Word16 j = 0; j < CLDFB_NO_COL_MAX; j++ )
#endif
            {
                scale_factor = s_min( scale_factor, s_min( getScaleFactor32( Cldfb_In_BinReal_fx[i][j], CLDFB_NO_CHANNELS_MAX ), getScaleFactor32( Cldfb_In_BinImag_fx[i][j], CLDFB_NO_CHANNELS_MAX ) ) );
            }
@@ -3054,7 +3058,11 @@ ivas_error isar_renderMultiTDBinToSplitBinaural(
        scale_factor = sub( scale_factor, 2 );
        FOR( i = 0; i < num_poses * BINAURAL_CHANNELS; i++ )
        {
#ifdef FIX_1119_SPLIT_RENDERING_VOIP
            FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
#else
            FOR( Word16 j = 0; j < CLDFB_NO_COL_MAX; j++ )
#endif
            {
                Scale_sig32( Cldfb_In_BinReal_fx[i][j], CLDFB_NO_CHANNELS_MAX, scale_factor );
                Scale_sig32( Cldfb_In_BinImag_fx[i][j], CLDFB_NO_CHANNELS_MAX, scale_factor );