Commit d56119b2 authored by multrus's avatar multrus
Browse files

[cleanup] accept OPT_HEAD_ROT_REND_V1_BE

parent 66f192b5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

#define OPT_MCT_ENC_V3_BE

#define OPT_BIN_REND_V2_NBE

#define OPT_HEAD_ROT_REND_V1_BE

#define OPT_SBA_DEC_V2_BE

#define OPT_SBA_ENC_V2_BE

#define OPT_SBA_ENC_V2_NBE

lib_rend/ivas_rotation_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -1010,9 +1010,6 @@ void rotateFrame_shd_cldfb( 
    Word16 l = 0, m1 = 0, m2 = 0;

    Word32 realRot[2 * HEADROT_ORDER + 1], imagRot[2 * HEADROT_ORDER + 1];

    Word16 SHrotmat[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM];

#ifndef OPT_HEAD_ROT_REND_V1_BE

    Word32 temp1, temp2;

#endif /* OPT_HEAD_ROT_REND_V1_BE */

    move16();

    move16();

    move16();
@@ -1061,19 +1058,10 @@ void rotateFrame_shd_cldfb( 
                    move32();

                    FOR( m = m1; m < m2; m++ )

                    {

#ifdef OPT_HEAD_ROT_REND_V1_BE

                        realRot[n - m1] = Madd_32_16_r( realRot[n - m1], Cldfb_RealBuffer[m][i][iBand], SHrotmat[n][m] ); // Q(x + 14 - 15)

                        move32();

                        imagRot[n - m1] = Madd_32_16_r( imagRot[n - m1], Cldfb_ImagBuffer[m][i][iBand], SHrotmat[n][m] ); // Q(x + 14 - 15)

                        move32();

#else  /* OPT_HEAD_ROT_REND_V1_BE */

                        temp1 = Mpy_32_16_r( Cldfb_RealBuffer[m][i][iBand], SHrotmat[n][m] ); // Q(x + 14 - 15)

                        temp2 = Mpy_32_16_r( Cldfb_ImagBuffer[m][i][iBand], SHrotmat[n][m] ); // Q(x + 14 - 15)

                        realRot[n - m1] = L_add( temp1, realRot[n - m1] );                    // Q(x + 14 - 15)

                        move32();

                        imagRot[n - m1] = L_add( temp2, imagRot[n - m1] ); // Q(x + 14 - 15)

                        move32();

#endif /* OPT_HEAD_ROT_REND_V1_BE */

                    }

                }

                /* write back the result */