Commit e4b1213a authored by TYAGIRIS's avatar TYAGIRIS
Browse files

double left shift on cldfb buffers

parent 1da9bd79

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+11 −28
Original line number Diff line number Diff line
@@ -2868,7 +2868,13 @@ static void ivas_dirac_dec_binaural_process_output_fx( 
            move16();

        }



#ifdef OPT_BIN_RENDERER_V1

        eff_q = sub( add( q_inp_mix, q_mat ), 15 );



        FOR( Word16 i = 0; i < ch_len; i++ )

#else  /* OPT_BIN_RENDERER_V1 */

        FOR( Word16 i = 0; i < 6; i++ )

#endif /* OPT_BIN_RENDERER_V1 */

        {

            FOR( Word16 j = 0; j < nSlots; j++ )

            {
@@ -2878,8 +2884,13 @@ static void ivas_dirac_dec_binaural_process_output_fx( 
                test();

                IF( ( processReverb && EQ_16( recompute, 1 ) ) && LT_16( i, 2 ) )

                {

#ifdef OPT_BIN_RENDERER_V1

                    scale_sig32( reverbRe_fx[i][j], CLDFB_NO_CHANNELS_MAX, eff_q ); /*q_inp_mix+q_mat-15*/

                    scale_sig32( reverbIm_fx[i][j], CLDFB_NO_CHANNELS_MAX, eff_q ); /*q_inp_mix+q_mat-15*/

#else                                                                               /* OPT_BIN_RENDERER_V1 */

                    scale_sig32( reverbRe_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( add( q_inp_mix, q_mat ), 15 ) ); /*q_inp_mix+q_mat-15*/

                    scale_sig32( reverbIm_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( add( q_inp_mix, q_mat ), 15 ) ); /*q_inp_mix+q_mat-15*/

#endif

                }

            }

        }
@@ -2899,34 +2910,6 @@ static void ivas_dirac_dec_binaural_process_output_fx( 
        q_inp_mix = *Q_inp_mix;

    }





#ifdef OPT_BIN_RENDERER_V1

    eff_q = sub( add( q_inp_mix, q_mat ), 15 );



    FOR( Word16 i = 0; i < ch_len; i++ )

#else  /* OPT_BIN_RENDERER_V1 */

    FOR( Word16 i = 0; i < 6; i++ )

#endif /* OPT_BIN_RENDERER_V1 */

    {

        FOR( Word16 j = 0; j < nSlots; j++ )

        {



            scale_sig32( inRe_fx[i][j], nBins, q_inp_mix ); /*q_input + q_inp_mix*/

            scale_sig32( inIm_fx[i][j], nBins, q_inp_mix ); /*q_input + q_inp_mix*/

            test();

            IF( processReverb && LT_16( i, 2 ) )

            {

#ifdef OPT_BIN_RENDERER_V1

                scale_sig32( reverbRe_fx[i][j], CLDFB_NO_CHANNELS_MAX, eff_q ); /*q_inp_mix+q_mat-15*/

                scale_sig32( reverbIm_fx[i][j], CLDFB_NO_CHANNELS_MAX, eff_q ); /*q_inp_mix+q_mat-15*/

#else                                                                           /* OPT_BIN_RENDERER_V1 */

                scale_sig32( reverbRe_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( add( q_inp_mix, q_mat ), 15 ) ); /*q_inp_mix+q_mat-15*/

                scale_sig32( reverbIm_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( add( q_inp_mix, q_mat ), 15 ) ); /*q_inp_mix+q_mat-15*/

#endif                                                                          /* OPT_BIN_RENDERER_V1 */

            }

        }

    }



    q_inp_mix = add( q_inp_mix, q_input );



    interpVal_fx = 0;