Commit 2d326ce8 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept nested sub-switch SPLIT_REND_ZERO_OUT_YAW_D

parent c0bb696a

lib_com/options.h

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


#define SPLIT_SIN_SCALING_AND_EXTRAPOL_LIMIT



#define SPLIT_REND_ZERO_OUT_YAW_D

//#define SPLIT_REND_REAL_ONLY_ROLL



//#define SPIT_ABS_SCALING_INTERP

lib_rend/ivas_splitRendererPost.c

+0 −41
Original line number Diff line number Diff line
@@ -1415,9 +1415,6 @@ void ivas_SplitRenderer_PostRenderer( 
#else

    BIN_HR_SPLIT_REND_MD rot_md_act[1][MAX_SPLIT_REND_MD_BANDS];

#endif

#endif

#ifndef SPLIT_REND_ZERO_OUT_YAW_D

    float gd_cf, gd_cf_abs;

#endif

    int16_t interp_yaw_pose_idx[2], interp_pitch_pose_idx[2], interp_roll_pose_idx[2];

    float interp_yaw_fact, interp_pitch_fact, interp_roll_fact;
@@ -1589,32 +1586,6 @@ void ivas_SplitRenderer_PostRenderer( 
#endif

                    }



#ifndef SPLIT_REND_ZERO_OUT_YAW_D

#ifdef SPLIT_REND_PLC

                    if ( hBinPostRenderer->cf_flag )

                    {

                        gd_cf = fade * rot_md_act[pos_idx][b].gd +

                                ( 1 - fade ) * hBinPostRenderer->gd_mem[pos_idx][b];

                    }

                    else

                    {

                        gd_cf = rot_md_act[pos_idx][b].gd;

                    }

#else

                    if ( hBinPostRenderer->cf_flag )

                    {

                        gd_cf = fade * hBinPostRenderer->rot_md[pos_idx][sf_idx][b].gd +

                                ( 1 - fade ) * hBinPostRenderer->gd_mem[pos_idx][b];

                    }

                    else

                    {

                        gd_cf = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].gd;

                    }

#endif



                    gd_cf_abs = (float) fabs( gd_cf );

#endif



                    brange[0] = pBand_grouping[b];

                    brange[1] = pBand_grouping[b + 1];

                    for ( b2 = brange[0]; b2 < brange[1]; b2++ )
@@ -1641,19 +1612,7 @@ void ivas_SplitRenderer_PostRenderer( 
                            pred_out_im[ch_idx1] += tmp_im;

                        }



#ifndef SPLIT_REND_ZERO_OUT_YAW_D

                        // Apply decorrelation

                        if ( 1 )

                        {

                            tmp_re = Cldfb_RealBuffer_Ref_Binaural[0][index_slot][b2] + Cldfb_RealBuffer_Ref_Binaural[1][index_slot][b2];

                            tmp_im = Cldfb_ImagBuffer_Ref_Binaural[0][index_slot][b2] + Cldfb_ImagBuffer_Ref_Binaural[1][index_slot][b2];



                            pred_out_re[0] += ( gd_cf_abs * tmp_re );

                            pred_out_im[0] += ( gd_cf_abs * tmp_im );

                            pred_out_re[1] += ( gd_cf * tmp_re );

                            pred_out_im[1] += ( gd_cf * tmp_im );

                        }

#endif

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

                        {

#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

lib_rend/ivas_splitRendererPre.c

+1 −5
Original line number Diff line number Diff line
@@ -635,11 +635,7 @@ static void ComputeCoeffs( 
            }

        }



#ifdef SPLIT_REND_ZERO_OUT_YAW_D

        if ( 1 )

#else

        if ( pose_type != ANY_YAW )

#endif

        if ( 1 ) /* TODO FhG2Dlb : can the else block be removed entirely? */

        {

            gd2 = 0.0f;

            sigma_d = 0.0f;

lib_rend/ivas_splitRenderer_utils.c

+0 −4
Original line number Diff line number Diff line
@@ -622,11 +622,7 @@ void ivas_split_rend_get_quant_params( 
        pred_imag_bands_roll[q] = *num_complex_bands;

    }



#ifdef SPLIT_REND_ZERO_OUT_YAW_D

    d_bands_yaw[0] = 0;

#else

    d_bands_yaw[0] = num_md_bands;

#endif

    bands_pitch[0] = num_md_bands;

    for ( q = 1; q < *num_quant_strats; q++ )

    {