Commit ffca0a07 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix encapsulation of all changes

parent 583beb81

lib_dec/ivas_sba_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -563,10 +563,13 @@ ivas_error ivas_sba_dec_reconfigure( 
#endif

        }

    }



#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 / n_all,

                                                ( st_ivas->hDecoderConfig->ivas_total_brate / n_all ) * 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_mct_core_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -582,7 +582,11 @@ void ivas_mct_core_enc( 


#ifdef DEBUGGING

    format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + SBA_ORDER_BITS + SBA_PLANAR_BITS );

#ifdef NONBE_FIX_ISM_XOVER_BR

    format_bits += ( ivas_format == SBA_ISM_FORMAT && ( ivas_osba_ism_mode_select( ivas_total_brate, nchan_ism ) || ivas_total_brate < IVAS_24k4 ) );

#else

    format_bits += ( ivas_format == SBA_ISM_FORMAT && nChannels > FOA_CHANNELS );

#endif

    mct_bits += hMCT->nBitsMCT + hMCT->nchan_out_woLFE;

    assert( ( total_brate + ( NBITS_BWIDTH + format_bits + mct_bits + sba_meta + lfe_bits ) * FRAMES_PER_SEC ) == ivas_total_brate );

#endif

lib_enc/ivas_osba_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -388,7 +388,11 @@ 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, n_all_old, ivas_total_brate / n_all, ( ivas_total_brate / n_all ) * 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;

        }