Commit 35eb186c authored by fotopoulou's avatar fotopoulou
Browse files

revert change from define to fix clang errors

parent 79060297

lib_dec/ivas_sba_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -575,13 +575,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        }

    }



#ifdef NONBE_FIX_ISM_XOVER_BR

    if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old,

                                                sba_dirac_stereo_flag_old, st_ivas->hDecoderConfig->ivas_total_brate / nchan_transport,

                                                ( st_ivas->hDecoderConfig->ivas_total_brate / nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK )

#else

    if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, sba_dirac_stereo_flag_old, st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK )

#endif

    {

        return error;

    }

lib_enc/ivas_osba_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -379,11 +379,7 @@ ivas_error ivas_osba_enc_reconfig( 
#endif

        }



#ifdef NONBE_FIX_ISM_XOVER_BR

        if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, ivas_total_brate / nchan_transport, ( ivas_total_brate / nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, ivas_total_brate / st_ivas->nchan_transport, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }