Commit bc8f8c5b authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into float-1578-omasa-to-foa-hoa-rendering-has-spikes-in-float
parents 297805c8 7e397bd1

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ 
#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN            /* FhG: float issue 1560: Avoid optimizing the division on the result of maxWithSign() with -funsafe-math-optimizations */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */



/* #################### End BE switches ################################## */

lib_dec/ivas_rom_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -500,6 +500,7 @@ static const int16_t huff_nodes_alpha_1D_DF[64][2] = 
    { -2, -62 }

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

/* Alpha Fine Huffman table dt */

static const int16_t huff_nodes_alpha_1D_DT[64][2] = 

{
@@ -568,6 +569,7 @@ static const int16_t huff_nodes_alpha_1D_DT[64][2] = 
    { -3, -64 },

    { -2, -63 }

};

#endif



/* Beta Fine Huffman table df0 */

static const int16_t huff_nodes_first_band_beta[8][2] =
@@ -581,12 +583,13 @@ static const int16_t huff_nodes_beta_1D_DF[16][2] = 
    { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { 9, 8 }, { -5, -13 }, { 11, 10 }, { -4, -14 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } 

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

/* Beta Fine Huffman table dt */

static const int16_t huff_nodes_beta_1D_DT[16][2] =

{ 

    { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { -13, 8 }, { -5, 9 }, { -14, 10 }, { -4, 11 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } 

};



#endif



const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0 =

{
@@ -600,11 +603,12 @@ const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df = 
    huff_nodes_beta_1D_DF

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt =

{

    huff_nodes_alpha_1D_DT,

    huff_nodes_beta_1D_DT

};



#endif



/* clang-format on */

lib_dec/lib_dec.c

+4 −5
Original line number Diff line number Diff line
@@ -2760,14 +2760,13 @@ ivas_error IVAS_DEC_FeedHeadTrackData( 
    }



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    hHeadTrackData->Pos[subframe_idx].x = max( min( IVAS_LISTENER_POSITION_MAX, Pos.x ), -IVAS_LISTENER_POSITION_MAX );

    hHeadTrackData->Pos[subframe_idx].y = max( min( IVAS_LISTENER_POSITION_MAX, Pos.y ), -IVAS_LISTENER_POSITION_MAX );

    hHeadTrackData->Pos[subframe_idx].z = max( min( IVAS_LISTENER_POSITION_MAX, Pos.z ), -IVAS_LISTENER_POSITION_MAX );

#else

    Pos.x = max( min( IVAS_LISTENER_POSITION_MAX, Pos.x ), -IVAS_LISTENER_POSITION_MAX );

    Pos.y = max( min( IVAS_LISTENER_POSITION_MAX, Pos.y ), -IVAS_LISTENER_POSITION_MAX );

    Pos.z = max( min( IVAS_LISTENER_POSITION_MAX, Pos.z ), -IVAS_LISTENER_POSITION_MAX );

#endif

    hHeadTrackData->Pos[subframe_idx].x = Pos.x;

    hHeadTrackData->Pos[subframe_idx].y = Pos.y;

    hHeadTrackData->Pos[subframe_idx].z = Pos.z;

#endif



    hHeadTrackData->sr_pose_pred_axis = rot_axis;

    hIvasDec->updateOrientation = true;

lib_enc/ivas_stereo_dft_enc_itd.c

+4 −0
Original line number Diff line number Diff line
@@ -152,7 +152,11 @@ static void stereo_dft_quantize_itd( 
{

    int16_t itd;



#ifdef FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD

    itd = in;

#else

    itd = (int16_t) ( sign( in ) * 0.5f + in );

#endif



    /*Limit ITD*/

    if ( ( ABSVAL( itd ) > STEREO_DFT_ITD_MAX ) || ( ABSVAL( itd ) < STEREO_DFT_ITD_MIN ) )

lib_util/rotation_file_reader.c

+3 −3
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ ivas_error HeadRotationFileReading( 
    if ( pPos != NULL )

    {

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

        pPos->x = min( max( -IVAS_LISTENER_POSITION_MAX, posx ), IVAS_LISTENER_POSITION_MAX );

        pPos->y = min( max( -IVAS_LISTENER_POSITION_MAX, posy ), IVAS_LISTENER_POSITION_MAX );

        pPos->z = min( max( -IVAS_LISTENER_POSITION_MAX, posz ), IVAS_LISTENER_POSITION_MAX );

        pPos->x = max( min( IVAS_LISTENER_POSITION_MAX, posx ), -IVAS_LISTENER_POSITION_MAX );

        pPos->y = max( min( IVAS_LISTENER_POSITION_MAX, posy ), -IVAS_LISTENER_POSITION_MAX );

        pPos->z = max( min( IVAS_LISTENER_POSITION_MAX, posz ), -IVAS_LISTENER_POSITION_MAX );

#else

        pPos->x = posx;

        pPos->y = posy;