Commit e9467735 authored by fotopoulou's avatar fotopoulou
Browse files

merge define FIX_MCT_BS_CRASH to MC_BITRATE_SWITCHING

parent 7321d00c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 


#define CORECODER_BITRATE_SWITCHING                     /* Issue 133: support bitrate switching in core-coder */

#define MC_BITRATE_SWITCHING                            /* Issue 116: support bitrate switching in MC format  */

#define FIX_MCT_BS_CRASH





/* ################## End DEVELOPMENT switches ######################### */

lib_debug/mem_count.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ typedef INT64 int64_t; 


/* This is the maximum number of allocations for which to keep information.

   It can be increased if required. */

#ifdef FIX_MCT_BS_CRASH

#ifdef MC_BITRATE_SWITCHING

#define MAX_INFO_RECORDS 5000

#else

#define MAX_INFO_RECORDS 3000

lib_dec/ivas_mct_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ ivas_error mct_dec_reconfigure( 
     * run into a number of problems */

    for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )

    {

#ifdef FIX_MCT_BS_CRASH

#ifdef MC_BITRATE_SWITCHING

        st_ivas->hCPE[cpe_id]->element_brate = cp_bitrate;

#endif

        for ( n = 0; n < CPE_CHANNELS; n++ )

lib_dec/ivas_mdct_core_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ void ivas_mdct_dec_side_bits_frame_channel( 
                param_lpc[0][0] = get_next_indice( st0, 1 ) << 1;



                /* read low br mode flag (if it is possible to be non-zero) */

#ifdef FIX_MCT_BS_CRASH

#ifdef MC_BITRATE_SWITCHING

                if ( sts[0]->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) )

#else

                if ( sts[0]->element_brate == IVAS_48k && !( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) )

lib_enc/ivas_mct_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ ivas_error mct_enc_reconfigure( 
    /* indicate LFE for appropriate core-coder channel */

    for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )

    {

#ifdef FIX_MCT_BS_CRASH

#ifdef MC_BITRATE_SWITCHING

        st_ivas->hCPE[cpe_id]->element_brate = cp_bitrate;

#endif

        for ( n = 0; n < CPE_CHANNELS; n++ )