Commit c4e255b2 authored by JÜRGEN Gerstacker's avatar JÜRGEN Gerstacker
Browse files

changed q-value to 16-exp

parent ce5838be

lib_enc/cod_tcx_fx.c

+12 −1
Original line number Diff line number Diff line
@@ -3833,7 +3833,7 @@ void coder_tcx_fx( 
        pWinMDST = win;

        move16();

    }



#ifdef FIX_2387_ANALYZEPOWERSPECTRUM

    AnalyzePowerSpectrum_ivas_fx( st,

                                  round_fx( L_shl( Mpy_32_16_1( L_mult0( L_frame, st->L_frame ) /*Q0*/,

                                                                getInvFrameLen( hTcxEnc->L_frameTCX ) /*Q21*/ ) /*Q6*/,
@@ -3844,6 +3844,17 @@ void coder_tcx_fx( 
                                  pWinMDST,

                                  0,

                                  powerSpec, &powerSpec_e );

#else

    AnalyzePowerSpectrum_fx( st,

                             round_fx( L_shl( Mpy_32_16_1( L_mult0( L_frame, st->L_frame ) /*Q0*/,

                                                           getInvFrameLen( hTcxEnc->L_frameTCX ) /*Q21*/ ) /*Q6*/,

                                              16 - 6 ) ),

                             L_frame,

                             left_overlap, right_overlap,

                             spectrum, *spectrum_e,

                             pWinMDST,

                             powerSpec, &powerSpec_e );

#endif

    IF( hTcxCfg->fIsTNSAllowed != 0 )

    {

lib_enc/ext_sig_ana_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -395,9 +395,15 @@ void core_signal_analysis_high_bitrate_fx( 
                    }



                    /* Compute noise-measure flags for spectrum filling and quantization */

#ifdef FIX_2387_ANALYZEPOWERSPECTRUM

                    AnalyzePowerSpectrum_ivas_fx( st, div_l( L_mult( L_subframe, st->L_frame ), hTcxEnc->L_frameTCX ),

                                                  L_subframe, left_overlap, right_overlap, spectrum[frameno], spectrum_e[frameno],

                                                  pMdstWin, 0, powerSpec, &powerSpec_e );

                                                  pMdstWin, 16-spectrum_e[frameno], powerSpec, &powerSpec_e );

#else

                    AnalyzePowerSpectrum_fx( st, div_l( L_mult( L_subframe, st->L_frame ), hTcxEnc->L_frameTCX ),

                                                  L_subframe, left_overlap, right_overlap, spectrum[frameno], spectrum_e[frameno],

                                                  pMdstWin, powerSpec, &powerSpec_e );

#endif

                }

            }

        }