Commit 5b4e1ff3 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into Framework-maintenance-2 

Add comments in options.h
parents abe854e8 3ef8e063

lib_com/bitstream.c

+4 −1
Original line number Diff line number Diff line
@@ -1975,19 +1975,22 @@ ivas_error preview_indices( 
        }

        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

#ifndef ORDER_BITS_ADDITION

            if ( ( st_ivas->sba_mode != SBA_MODE_SPAR ) || ( ( st_ivas->sba_mode == SBA_MODE_SPAR ) && ( total_brate >= IVAS_256k ) ) )

            {

#endif

                /* Read SBA planar flag and SBA order */

                st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 );

                st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );

                st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );

#ifndef ORDER_BITS_ADDITION

            }

            else

            {

                st_ivas->sba_planar = 0;

                st_ivas->sba_order = 1;

            }



#endif

            ivas_sba_config( total_brate, st_ivas->sba_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );

        }

    }

lib_com/ivas_prot.h

+4 −1
Original line number Diff line number Diff line
@@ -2587,8 +2587,11 @@ void ivas_mct_core_enc( 
    const int16_t nChannels,                                    /* i  : number of channels to be coded      */

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

    const int16_t switch_bw,                                    /* i  : flag bandwidth switch occurance     */

    const int16_t lfe_bits,                                     /* i  : bits spent for LFE                  */

    const int16_t lfe_bits                                      /* i  : bits spent for LFE                  */

#ifndef ORDER_BITS_ADDITION

    ,

    const SBA_MODE sba_mode                                     /* i  : SBA mode                            */

#endif

#ifdef FIX_I1_113

    ,

    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order               */

lib_com/ivas_rom_com.c

+6 −1
Original line number Diff line number Diff line
@@ -903,7 +903,12 @@ const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN] = 
{

/* When AGC is ON additional (AGC_BITS_PER_CH+1) bits may be taken from each core-coder channel

   so minimum core-coder bitrate per channel can be min core-coder bitrates as per the table - AGC_BITS_PER_CH */

    { 24400, 0, 1, FB, 24000, 1, WYXZ, 1, 0,{ { 16400, 15200, 24350 } },

    { 24400, 0, 1, FB, 24000, 1, WYXZ, 1, 0,

#ifndef ORDER_BITS_ADDITION

    { { 16400, 15200, 24350 } },

#else

    { { 16400, 14850, 24350 } },

#endif

    { { 15, 1, 5, 1 },{ 15, 1, 3, 1 },{ 7, 1, 3, 1 } }, 0, 0, 0 },



    { 32000, 0, 1, FB, 24000, 1, WYXZ, 1, 0,{{ 24000, 20450, 31950 }},{ { 21, 1, 5, 1 },{ 15, 1, 5, 1 },{ 15, 1, 3, 1 } }, 0, 0, 0 },

lib_com/ivas_spar_com.c

+8 −6
Original line number Diff line number Diff line
@@ -2150,13 +2150,14 @@ void ivas_spar_set_bitrate_config( 
        total_bits += ( int16_t )( ivas_spar_br_table_consts[table_idx].evs_brs[i][0] / FRAMES_PER_SEC );

        max_bits += ( int16_t )( ivas_spar_br_table_consts[table_idx].evs_brs[i][1] / FRAMES_PER_SEC );

    }

#ifndef ORDER_BITS_ADDITION

    if ( ivas_total_brate >= IVAS_256k )

    {

#endif

        pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits;



        pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits;



        // TODO : do this for lower bitrates as well once order/planar bits are added

        md_coding_bits_header = SPAR_NUM_CODING_STRAT_BITS + pSpar_md_cfg->quant_strat_bits;

        pSpar_md_cfg->tgt_bits_per_blk -= md_coding_bits_header;

        pSpar_md_cfg->max_bits_per_blk -= md_coding_bits_header;
@@ -2166,6 +2167,7 @@ void ivas_spar_set_bitrate_config( 


        pSpar_md_cfg->tgt_bits_per_blk += md_coding_bits_header;

        pSpar_md_cfg->max_bits_per_blk += md_coding_bits_header;

#ifndef ORDER_BITS_ADDITION

    }

    else

    {
@@ -2176,7 +2178,7 @@ void ivas_spar_set_bitrate_config( 
        pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ceilf( ( 1.0f * pSpar_md_cfg->tgt_bits_per_blk * num_bands ) / IVAS_MAX_NUM_BANDS );

        pSpar_md_cfg->max_bits_per_blk = (int16_t) ceilf( ( 1.0f * pSpar_md_cfg->max_bits_per_blk * num_bands ) / IVAS_MAX_NUM_BANDS );

    }



#endif

    return;

}

lib_com/options.h

+3 −2
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ 
#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */





/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/            /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/
@@ -151,11 +150,13 @@ 
#define SIMPLIFY_SBA_RENDERING_LOGIC                    /* SBA rendering maintenance related to ticket #45 */

#define SBA_CLEANING                                    /* SBA maintenance related to ticket #45 */ 



#define DIRAC_DRCT_GAIN_TUNING

#define DIRAC_DRCT_GAIN_TUNING                          /* issue 64: tuning of DirAC energy-compensation gains */

#define FIX_34                                          /* Nokia: Fix bug in MASA format EXT output spherical indexing */

#define FIX_I68_MC_REVERB_FOR_514                       /* Fix HRTF processing for Jot reverb in case of 5.1.4 input format */

#define FIX_I54_LS_CONVERSION                           /* FhG: fix incorrect downmix matrix for 5_1_4 to 5_1_2 and upmix matrix for 7_1 to 7_1_4 */

#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 */





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

/* clang-format on */