Commit b11563c0 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch 'basop-2312-condition-missing-for-ivas-gsc-gain-de-quantization-when-compared-to-floating-point' into 'main'

basop-2312-condition-missing-for-ivas-gsc-gain-de-quantization-when-compared-to-floating-point

See merge request !2698
parents ef47b1ef 4562e7d0

lib_com/gs_gains_fx.c

+41 −31
Original line number Diff line number Diff line
@@ -1193,7 +1193,10 @@ Word16 gsc_gaindec_ivas_fx( /* o : average frequenc 
             *--------------------------------------------------------------------------------------*/

            idx_g_fx = (Word16) get_next_indice_fx( st_fx, 5 );

            VDQ_vec_fx( y_gainQ_fx, YGain_mean_LR_fx, YGain_dic1_LR_fx, idx_g_fx, 3 );



#ifdef FIX_2312_CONDITION_MISSING_GSC_DEC_LR

            IF( !( coder_type == INACTIVE && st_fx->tdm_LRTD_flag == 0 && EQ_16( st_fx->idchan, 1 ) ) || GT_32( st_fx->core_brate, GSC_LRES_GAINQ_LIMIT ) )

            {

#endif

                idx_g_fx = (Word16) get_next_indice_fx( st_fx, 5 );

                VDQ_vec_fx( y_gainQ_fx + 3, YGain_mean_LR_fx + 3, YGain_dic2_LR_fx, idx_g_fx, 4 );
@@ -1232,6 +1235,13 @@ Word16 gsc_gaindec_ivas_fx( /* o : average frequenc 
                move16();

                y_gainQ_fx[14] = y_gain_tmp3_fx[3]; /*Q12*/

                move16();

#ifdef FIX_2312_CONDITION_MISSING_GSC_DEC_LR

            }

            ELSE

            {

                set16_fx( y_gainQ_fx + 3, 0, MBANDS_GN16k - 3 );

            }

#endif

        }

        ELSE

        {

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ 
#define FIX_2257_INCR_GUARD_BITS                        /* FhG: take correct rendering frame-size into account for guard-bits calculation */

#define FIX_2297_SBA_SCALING_32KHZ                      /* VA: basop issue 2297: Fix scaling factor before the SBA decoder for output_Fs = 32 or 16 */

#define FIX_2315_AGC_MEMORY_RESET                       /* VA: basop issue 2315: fix reset of the AGC memory */

#define FIX_2312_CONDITION_MISSING_GSC_DEC_LR           /* VA: basop issue 2297: addition of condition missing in the GSC gain decoder at low-rate */



/* ##################### End NON-BE switches ########################### */