Commit 60f3de3c authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

replace shr( add( n, 1 ), 1 ) by shr_r(n ,1)

parent 3bcd795b

lib_dec/ivas_init_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ ivas_error ivas_dec_setup( 
                    Word16 n;



                    n = add( st_ivas->nchan_transport, st_ivas->nchan_ism );

                    st_ivas->nCPE = shr( add( n, 1 ), 1 );

                    st_ivas->nCPE = shr_r( n, 1 );

                }

#else

                {

lib_dec/ivas_sba_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
            }

#ifdef NONBE_FIX_ISM_XOVER_BR

            nchan_transport = add( nchan_transport, st_ivas->nchan_ism );

            st_ivas->nCPE = shr( add( nchan_transport, 1 ), 1 );

            st_ivas->nCPE = shr_r( nchan_transport, 1 );

#else

            st_ivas->nCPE = add( st_ivas->nCPE, shr( add( st_ivas->nchan_ism, 1 ), 1 ) ); /*Q0*/

#endif
@@ -624,7 +624,7 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
        {

#ifdef NONBE_FIX_ISM_XOVER_BR

            nchan_transport = add( st_ivas->nchan_transport, st_ivas->nchan_ism );

            st_ivas->nCPE = shr( add( nchan_transport, 1 ), 1 );

            st_ivas->nCPE = shr_r( nchan_transport, 1 );

            nchan_transport_old = add( nchan_transport_old, st_ivas->nchan_ism );

#else

            st_ivas->nCPE = add( st_ivas->nCPE, shr( add( st_ivas->nchan_ism, 1 ), 1 ) ); /*Q0*/

lib_enc/ivas_init_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ ivas_error ivas_init_encoder_fx( 
                int16_t n_all;



                n_all = add( st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_ism );

                st_ivas->nCPE = shr( add( n_all, 1 ), 1 );

                st_ivas->nCPE = shr_r( n_all, 1 );

            }

#else

            st_ivas->nCPE = add( st_ivas->nCPE, shr( add( st_ivas->hEncoderConfig->nchan_ism, 1 ), 1 ) ); /* Q0 */

lib_enc/ivas_osba_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ ivas_error ivas_osba_enc_reconfig( 
#ifdef NONBE_FIX_ISM_XOVER_BR

            {

                nchan_transport = add( st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_ism );

                st_ivas->nCPE = shr( add( nchan_transport, 1 ), 1 );

                st_ivas->nCPE = shr_r( nchan_transport, 1 );

            }

#else

            st_ivas->nCPE = add( st_ivas->nCPE, shr( add( st_ivas->hEncoderConfig->nchan_ism, 1 ), 1 ) );
@@ -399,7 +399,7 @@ ivas_error ivas_osba_enc_reconfig( 
#ifdef NONBE_FIX_ISM_XOVER_BR

            nchan_transport_old = add( nchan_transport_old, st_ivas->hEncoderConfig->nchan_ism );

            nchan_transport = add( st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_ism );

            st_ivas->nCPE = shr( add( nchan_transport, 1 ), 1 );

            st_ivas->nCPE = shr_r( nchan_transport, 1 );

#else

            st_ivas->nCPE = add( st_ivas->nCPE, shr( add( st_ivas->hEncoderConfig->nchan_ism, 1 ), 1 ) );

            move16();