Commit 4e59bf0d authored by multrus's avatar multrus
Browse files

various fixes to instrumentation

parent e043491c

lib_com/ivas_osba_com_fx.c

+7 −5
Original line number Diff line number Diff line
@@ -47,24 +47,26 @@ ISM_MODE ivas_osba_ism_mode_select( 
{

    ISM_MODE ism_mode = ISM_MODE_NONE;



    switch ( nchan_ism )

    SWITCH( nchan_ism )

    {

        case 1:

            if ( ivas_total_brate >= IVAS_96k )

            if ( GE_32( ivas_total_brate, IVAS_96k ) )

            {

                ism_mode = ISM_SBA_MODE_DISC;

                move32();

            }

            break;

            BREAK;





        case 2:

        case 3:

        case 4:

            if ( ivas_total_brate >= IVAS_128k )

            if ( GE_32( ivas_total_brate, IVAS_128k ) )

            {

                ism_mode = ISM_SBA_MODE_DISC;

                move32();

            }

            break;

            BREAK;

    }



    return ism_mode;

lib_dec/ivas_corecoder_dec_reconfig_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -450,7 +450,8 @@ ivas_error ivas_corecoder_dec_reconfig_fx( 
    test();

#ifdef NONBE_FIX_ISM_XOVER_BR

    test();

    if ( EQ_16( st_ivas->ivas_format, SBA_FORMAT ) || EQ_16( st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

    test();

    IF( EQ_16( st_ivas->ivas_format, SBA_FORMAT ) || EQ_16( st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

#else

    if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT )

#endif

lib_dec/ivas_init_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1834,7 +1834,7 @@ ivas_error ivas_init_decoder_fx( 
            move16();

#ifdef NONBE_FIX_ISM_XOVER_BR

            {

                int16_t n_all;

                Word16 n_all;



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

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

lib_dec/ivas_sba_dec_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -514,6 +514,7 @@ ivas_error ivas_sba_dec_reconfigure_fx( 


#ifdef NONBE_FIX_ISM_XOVER_BR

    nchan_transport = st_ivas->nchan_transport;

    move16();

#endif

    IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

    {
@@ -618,6 +619,7 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
            }

#ifdef NONBE_FIX_ISM_XOVER_BR

            nchan_transport = st_ivas->nchan_transport;

            move16();

#endif

            nchan_transport_old = add( nchan_transport_old, st_ivas->nchan_ism ); /*Q0*/

            st_ivas->ism_mode = ISM_MODE_NONE;