Commit 667fb269 authored by fotopoulou's avatar fotopoulou
Browse files

some cleanup under define LBR_SBA_CORE_CODING_TUNING and comment in options.h

parent e8d677c0

lib_com/ivas_stereo_mdct_stereo_com.c

+2 −5
Original line number Diff line number Diff line
@@ -55,18 +55,15 @@ void splitAvailableBits( 
)

{

    assert( split_ratio >= 1 && split_ratio < SMDCT_BITRATE_RATIO_RANGE );

#ifdef LBR_SBA_CORE_CODING_TUNING



    *bits_ch0 = split_ratio * total_bits / SMDCT_BITRATE_RATIO_RANGE;

#ifdef LBR_SBA_CORE_CODING_TUNING

    /* for SBA mode bias the distribution towards the W channel */

    if ( split_ratio < 7 && sba_mode )

    {

        *bits_ch0 += (int16_t) ( 0.2 * *bits_ch0 );

    }

#else

    *bits_ch0 = split_ratio * total_bits / SMDCT_BITRATE_RATIO_RANGE;

#endif





    *bits_ch1 = total_bits - *bits_ch0;



    return;

lib_com/options.h

+3 −3
Original line number Diff line number Diff line
@@ -60,14 +60,14 @@ 


/*#define MEM_COUNT_DETAILS*/                   /* RAM counting tool: print per sub-structure details */



//#define DEBUG_MODE_INFO                     /* output most important parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_INFO*/                     /* output most important parameters to the subdirectory "res/" */

#ifdef DEBUG_MODE_INFO

/*#define DEBUG_MODE_ACELP*/                    /* output most important ACELP core parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_TCX*/                      /* output most important TCX core parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_DFT*/                      /* output most important DFT stereo parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_TD*/                       /* output most important TD stereo parameters to the subdirectory "res/ */

/*#define DEBUG_MODE_DIRAC*/                    /* output most important DIRAC parameters to the subdirectory "res/" */

#define DEBUG_MODE_MDCT                     /* output most important MDCT parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_MDCT*/                     /* output most important MDCT parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_PARAM_MC */                /* output Parametric MC paramters to the subdirectory "res/" */

/*#define DEBUG_MODE_PARAM_ISM*/                /* output Parametric ISM paramters to the subdirectory "res/" */

#define DEBUG_MODE_INFO_TWEAK                   /* enable command line switch to specify subdirectory for debug info output inside "./res/" */
@@ -157,8 +157,8 @@ 
#define FIX_I25_FBE_FB_BITS                             /* issue 25: properly skip reading of TBE FB bits when decoder output sampling rate is not 48 kHz */

#define ORDER_BITS_ADDITION                             /* issue 14: Transmit SBA order and planar bits at all bitrates */



#define LBR_SBA_CORE_CODING_TUNING                      /* Contribution "3 Core Coder Tuning for low bitrate SBA with 2 TCs" */ 



#define LBR_SBA_CORE_CODING_TUNING

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

/* clang-format on */

#endif

lib_dec/ivas_cpe_dec.c

+1 −5
Original line number Diff line number Diff line
@@ -363,11 +363,7 @@ ivas_error ivas_cpe_dec( 
    if ( hCPE->element_mode != IVAS_CPE_DFT || ( hCPE->nchan_out == 1 && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) )

    {

#ifndef LBR_SBA_CORE_CODING_TUNING

        if ( ( st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )

#ifdef LBR_SBA_CORE_CODING_TUNING

             || ( st_ivas->ivas_format == SBA_FORMAT && hCPE->element_brate == IVAS_48k )

#endif

        )

        if (  st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )

        {

            if ( ( error = ivas_core_dec( st_ivas, NULL, hCPE, st_ivas->hMCT, n_channels, output, outputHB, NULL, 0 ) ) != IVAS_ERR_OK )

            {