Commit 6f66cdad authored by Jan Kiene's avatar Jan Kiene
Browse files

add scaling factor of 2 for param ism

parent 7f18f5d5

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -343,6 +343,10 @@ typedef enum 
#define PARAM_ISM_MAX_DMX                       2

#define PARAM_ISM_MAX_CHAN                      16

#define PARAM_ISM_HYS_BUF_SIZE                  10

#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMISM

#define PARAM_ISM_DMX_SCALE_FAC_ENCODER         0.5f

#define PARAM_ISM_DMX_SCALE_FAC_DECODER         2.0f

#endif



/* ISM DTX */

#define ISM_DTX_COH_SCA_BITS                    4

lib_com/options.h

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




#define NONBE_FIX_1165_STATIC_SCAL_PARAMMC              /* FhG: add static scaling to ParamMC DMX */

#define NONBE_FIX_1165_STATIC_SCAL_PARAMISM             /* FhG: add static scaling to ParamISM DMX */

/*#define NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX*/     /* FhG: apply the limiter before the core encoder for formats with downmixing where the signal could exceed the 16-bit value range */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

lib_dec/ivas_jbm_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -183,6 +183,11 @@ ivas_error ivas_jbm_dec_tc( 
                }

            }



#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMISM

            /* apply inverse scaling factor on dmx channels */

            v_multc( p_output[n], PARAM_ISM_DMX_SCALE_FAC_DECODER, p_output[n], output_frame );

#endif



            /* HP filtering */

            hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }

lib_enc/ivas_ism_param_enc.c

+6 −0
Original line number Diff line number Diff line
@@ -325,8 +325,14 @@ void ivas_param_ism_stereo_dmx( 
    st_ivas->hParamIsm->last_dmx_gain = dmx_gain;



    /* Copy the stereo dmx to data variable */

#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMISM

    /* apply scaling factor */

    v_multc( stereo_dmx[0], PARAM_ISM_DMX_SCALE_FAC_ENCODER, data[0], input_frame );

    v_multc( stereo_dmx[1], PARAM_ISM_DMX_SCALE_FAC_ENCODER, data[1], input_frame );

#else

    mvr2r( stereo_dmx[0], data[0], input_frame );

    mvr2r( stereo_dmx[1], data[1], input_frame );

#endif



    pop_wmops();