Commit 0b3fbb86 authored by vasilache's avatar vasilache
Browse files

Merge branch '751-masa-td-secondary-channel-bitrate-gets-2400' into 'main' 

[non-BE] MASA TD  secondary channel bitrate in inactive mode

See merge request !1038
parents 109556e0 bb04918c

lib_com/ivas_stereo_td_bit_alloc.c

+10 −1
Original line number Diff line number Diff line
@@ -419,18 +419,27 @@ void tdm_bit_alloc( 
            }

            *total_brate_sec += ( fast_FCB_rates_2sfr[idx] - tmp_rate );

        }

#ifndef NONBE_FIX_751_MASA_TD_BITRATE_CHECK

        /* prevent 2.4 kb/s and 2.8 kb/s as they are reserved bitrates for DTX and VBR */

        if ( *total_brate_sec == PPP_NELP_2k80 || *total_brate_sec == SID_2k40 )

        {

            *total_brate_sec += 100;

        }



#endif

        /* To prevent 13.2 kb/s for primary channel as some bitstream issues arrise with it */

        if ( element_brate_wo_meta - *total_brate_sec == ACELP_13k20 )

        {

            *total_brate_sec += 100;

        }

    }

#ifdef NONBE_FIX_751_MASA_TD_BITRATE_CHECK

    /* prevent 2.4 kb/s and 2.8 kb/s as they are reserved bitrates for DTX and VBR */

    if ( *total_brate_sec == PPP_NELP_2k80 || *total_brate_sec == SID_2k40 )

    {

        *total_brate_sec -= 100;

    }



#endif

    *total_brate_pri = element_brate_wo_meta - *total_brate_sec;



    return;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_751_MASA_TD_BITRATE_CHECK                   /* Nokia: issue 751: prevents secondary channel to take reserved bitrate if not DTX mode */

#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */

#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/

#define NONBE_FIX_729_ASAN_2ISM_ACELP                         /* VA: issue 729: fix ASAN ACELP errors with 2 ISM coding using LTV */