Commit 5cafefb9 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_874_OMASA_BRSW_2TD

parent c9d095e4

lib_com/ivas_prot.h

+0 −3
Original line number Diff line number Diff line
@@ -1939,9 +1939,6 @@ void stereo_icBWE_decproc( 
int16_t select_stereo_mode(

    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                           */

    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                                     */

#ifndef NONBE_FIX_874_OMASA_BRSW_2TD

   ,const int32_t ivas_total_brate                              /* i  : IVAS total brate                                */

    #endif

);



void stereo_classifier_init(

lib_com/ivas_stereo_td_bit_alloc.c

+0 −12
Original line number Diff line number Diff line
@@ -307,19 +307,8 @@ void tdm_bit_alloc( 
    else

    {

        *total_brate_sec = min( *total_brate_sec, element_brate_wo_meta - ( 5900 + BWE_brate ) );

#ifndef NONBE_FIX_874_OMASA_BRSW_2TD

        if ( coder_type == INACTIVE )

        {

            *total_brate_sec = max( *total_brate_sec, tdm_bit_allc_tbl[0][0] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

        }

        else

        {

            *total_brate_sec = max( *total_brate_sec, 3500 ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

        }

#endif

    }



#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

    if ( coder_type == INACTIVE )

    {

        *total_brate_sec = max( *total_brate_sec, tdm_bit_allc_tbl[0][0] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */
@@ -328,7 +317,6 @@ void tdm_bit_alloc( 
    {

        *total_brate_sec = max( *total_brate_sec, 3500 ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

    }

#endif



    /* Secondary channel bitrate adjusment                                                      */

    /* First, adjust the bitrate depending of what is transmitted                               */

lib_com/options.h

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


#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

#define NONBE_FIX_874_OMASA_BRSW_2TD                          /* Nokia: issue 874: Fixes the crashes with the long test vectors that prompted switching to TD*/

#define NONBE_FIX_871_ACELP_CRASH_IN_OSBA                     /* FhG: isse 871: crash in ACELP core encoder with OSBA */

#define NONBE_FIX_225_MASA_EXT_REND                           /* Nokia: Resolve #225: Complete MASA external renderer implementation */

#define NONBE_FIX_897_USAN_WITH_MASA_RENDERING                /* Nokia: issue #897: USAN null pointer in MASA external renderer to Ambisonics */

lib_dec/ivas_jbm_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -226,9 +226,7 @@ ivas_error ivas_jbm_dec_tc( 


        if ( st_ivas->nchan_transport == CPE_CHANNELS && st_ivas->nCPE >= 1 )

        {

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

            st_ivas->hCPE[0]->brate_surplus = 0;

#endif

            st_ivas->hCPE[0]->element_brate = ivas_total_brate;

        }

lib_enc/ivas_cpe_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -176,11 +176,7 @@ ivas_error ivas_cpe_enc( 


    if ( sts[0]->ini_frame > 0 && st_ivas->hMCT == NULL )

    {

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

        hCPE->element_mode = select_stereo_mode( hCPE, ivas_format );

#else

        hCPE->element_mode = select_stereo_mode( hCPE, ivas_format, ivas_total_brate );

#endif

    }



    stereo_mode_combined_format_enc( st_ivas, hCPE );