Commit 19db8702 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] strip SPLIT_REND_REAL_ONLY_ROLL

parent 759393fb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ 






//#define SPLIT_REND_REAL_ONLY_ROLL



//#define SPIT_ABS_SCALING_INTERP

lib_rend/ivas_splitRendererPost.c

+0 −49
Original line number Diff line number Diff line
@@ -1232,13 +1232,11 @@ static void interpolate_rend_md( 
    float interp_roll_fact )

{

    int16_t ch_idx1, idx1, idx2;

#ifndef SPLIT_REND_REAL_ONLY_ROLL

    float mix_mat_re1[BINAURAL_CHANNELS][BINAURAL_CHANNELS];

    float mix_mat_im1[BINAURAL_CHANNELS][BINAURAL_CHANNELS];

    float mix_mat_re3[BINAURAL_CHANNELS][BINAURAL_CHANNELS];

    float mix_mat_im3[BINAURAL_CHANNELS][BINAURAL_CHANNELS];

    int16_t ch_idx2;

#endif

    float gd1, gd2, gd3, gd4, diff, pitch_gain_r, pitch_gain_l;



    gd1 = 0.0f;
@@ -1329,52 +1327,6 @@ static void interpolate_rend_md( 


    idx1 = interp_roll_pose_idx[0];

    idx2 = interp_roll_pose_idx[1];

#ifdef SPLIT_REND_REAL_ONLY_ROLL

    if ( ( idx1 != 0 ) || ( idx2 != 0 ) )

    {

        gd1 = 1.0f;

        gd2 = 1.0f;



        gd3 = 1.0f;

        gd4 = 1.0f;



        if ( idx1 != 0 )

        {

            gd1 = rot_md[idx1 - 1][sf_idx][band_idx].gd;

            gd3 = rot_md[idx1 - 1][sf_idx][band_idx].gd2;

        }

        if ( idx2 != 0 )

        {

            gd2 = rot_md[idx2 - 1][sf_idx][band_idx].gd;

            gd4 = rot_md[idx2 - 1][sf_idx][band_idx].gd2;

        }

#if 0

        diff = gd1 / gd2;

        pitch_gain_l = gd2 * powf( diff, 1.0f - interp_roll_fact );

        pitch_gain_l = max( 0.0f, pitch_gain_l );



        diff = gd3 / gd4;

        pitch_gain_r = gd4 * powf( diff, 1.0f - interp_roll_fact );

        pitch_gain_r = max( 0.0f, pitch_gain_r );

#else

        diff = gd1 - gd2;

        pitch_gain_l = gd1 - ( diff * interp_roll_fact );

        pitch_gain_l = max( 0.0f, pitch_gain_l );



        diff = gd3 - gd4;

        pitch_gain_r = gd3 - ( diff * interp_roll_fact );

        pitch_gain_r = max( 0.0f, pitch_gain_r );

#endif



        for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ )

        {

            mix_mat_re[ch_idx1][0] *= pitch_gain_l;

            mix_mat_re[ch_idx1][1] *= pitch_gain_r;

            mix_mat_im[ch_idx1][0] *= pitch_gain_l;

            mix_mat_im[ch_idx1][1] *= pitch_gain_r;

        }

    }

#else

    if ( ( idx1 != 0 ) || ( idx2 != 0 ) )

    {
@@ -1392,7 +1344,6 @@ static void interpolate_rend_md( 
            }

        }

    }

#endif



    return;

}

lib_rend/ivas_splitRenderer_utils.c

+0 −4
Original line number Diff line number Diff line
@@ -217,11 +217,7 @@ void set_pose_types( IVAS_SPLIT_REND_POSE_TYPE pose_type[MAX_HEAD_ROT_POSES - 1] 
        }

        else if ( fabs( pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] ) > EPSILON )

        {

#ifdef SPLIT_REND_REAL_ONLY_ROLL

            pose_type[pos_idx] = PITCH_ONLY;

#else

            pose_type[pos_idx] = ANY_ROLL;

#endif

        }

        else

        {