Commit f532d49f authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'q_related_fixes_documentation' into 'main' 

Instrumentation updates for lib_enc files, cleanup of files and Q-related fixes

See merge request !1016
parents 07ad5d7b bcafa511

Workspace_msvc/lib_enc.vcxproj

+1 −17
Original line number Diff line number Diff line
@@ -381,18 +381,10 @@ 
    <ClCompile Include="..\lib_enc\nelp_enc_fx.c" />

    <ClCompile Include="..\lib_enc\noise_adjust.c" />

    <ClCompile Include="..\lib_enc\nois_est.c" />

    <ClCompile Include="..\lib_enc\normalizecoefs.c" />

    <ClCompile Include="..\lib_enc\peak_vq_enc.c" />

    <ClCompile Include="..\lib_enc\pitch_ol.c" />

    <ClCompile Include="..\lib_enc\pitch_ol2.c" />

    <ClCompile Include="..\lib_enc\pit_enc.c" />

    <ClCompile Include="..\lib_enc\plc_enc_ext.c" />

    <ClCompile Include="..\lib_enc\ppp_enc.c" />

    <ClCompile Include="..\lib_enc\pre_proc.c" />

    <ClCompile Include="..\lib_enc\pvq_core_enc.c" />

    <ClCompile Include="..\lib_enc\pvq_encode.c" />

    <ClCompile Include="..\lib_enc\qlpc_avq.c" />

    <ClCompile Include="..\lib_enc\q_gain2p.c" />

    <ClCompile Include="..\lib_enc\rom_enc.c" />

    <ClCompile Include="..\lib_enc\setmodeindex.c" />

    <ClCompile Include="..\lib_enc\ivas_sns_enc.c" />
@@ -408,22 +400,14 @@ 
    <ClCompile Include="..\lib_enc\update_decision_fx.c" />

    <ClCompile Include="..\lib_enc\updt_enc_fx.c" />

    <ClCompile Include="..\lib_enc\updt_tar_fx.c" />

    <ClCompile Include="..\lib_enc\vad.c" />

    <ClCompile Include="..\lib_enc\vad_basop_fx.c" />

    <ClCompile Include="..\lib_enc\vad_fx.c" />

    <ClCompile Include="..\lib_enc\vad_param_updt.c" />

    <ClCompile Include="..\lib_enc\vad_param_updt_fx.c" />

    <ClCompile Include="..\lib_enc\vad_proc.c" />

    <ClCompile Include="..\lib_enc\vad_proc_fx.c" />

    <ClCompile Include="..\lib_enc\vbr_average_rate.c" />

    <ClCompile Include="..\lib_enc\vbr_average_rate_fx.c" />

    <ClCompile Include="..\lib_enc\vlpc_1st_cod.c" />

    <ClCompile Include="..\lib_enc\vlpc_1st_cod_fx.c" />

    <ClCompile Include="..\lib_enc\vlpc_2st_cod.c" />

    <ClCompile Include="..\lib_enc\vlpc_2st_cod_fx.c" />

    <ClCompile Include="..\lib_enc\voiced_enc.c" />

    <ClCompile Include="..\lib_enc\voiced_enc_fx.c" />

    <ClCompile Include="..\lib_enc\waveadjust_fec_cod.c" />

    <ClCompile Include="..\lib_enc\waveadjust_fec_cod_fx.c" />

  </ItemGroup>

  <ItemGroup>

Workspace_msvc/lib_enc.vcxproj.filters

+1 −48
Original line number Diff line number Diff line
@@ -67,30 +67,14 @@ 
    <ClCompile Include="..\lib_enc\nelp_enc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ppp_enc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\plc_enc_ext.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pre_proc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vbr_average_rate.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\voiced_enc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\q_gain2p.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ltd_stable.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vad_proc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ari_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -238,12 +222,6 @@ 
    <ClCompile Include="..\lib_enc\noise_adjust.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\normalizecoefs.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\peak_vq_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pit_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -253,37 +231,12 @@ 
    <ClCompile Include="..\lib_enc\pitch_ol2.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pvq_core_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pvq_encode.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\qlpc_avq.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\rom_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\setmodeindex.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\swb_pre_proc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vad.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vad_param_updt.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vlpc_1st_cod.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vlpc_2st_cod.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\waveadjust_fec_cod.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\comvad_decision.c">

lib_com/cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -760,6 +760,8 @@ enum 
#define FORMANT_SHARPENING_NOISE_THRESHOLD  21.0f                  /* lp_noise level above which formant sharpening is deactivated */

#define E_MIN_FX                              1       /* QSCALE (Q7)*/

#define E_MIN_IVAS_FX                         1835       /* (Q19) (E12) */

#define E_MIN_IVAS_FX_Q31                     7516193       /* (Q31) (0.0035f) */



#define STEP_DELTA_FX                         11

#define FORMANT_SHARPENING_NOISE_THRESHOLD_FX   5376     /* 21 (!8)lp_noise level above which formant sharpening is deactivated - at this level most of 20 dB SNR office noisy speech still uses sharpening */

lib_enc/ext_sig_ana_fx.c

+9 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ void core_signal_analysis_high_bitrate_ivas_fx( 
    move16();

    move16();

    (void) vad_hover_flag;



    Word16 Q_win_temp[2];

    Word16 *speech_ltp_fx = NULL;

    Word16 *wspeech_fx = NULL;

    Word16 *speech_fx = NULL;
@@ -959,9 +959,17 @@ void core_signal_analysis_high_bitrate_ivas_fx( 
                Copy_Scale_sig_16_32( tcx20Win, windowed_samples + add( imult1616( frameno, L_FRAME_MAX ), 2 ), add( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) ), 0 );

                *q_win = s_min( *q_win, sub( L_norm_arr( windowed_samples + add( imult1616( frameno, L_FRAME_MAX ), 2 ), add( L_subframe, shr( add( left_overlap, right_overlap ), 1 ) ) ), 1 ) );

                move16();

                Q_win_temp[frameno] = *q_win;

                move16();



#ifdef MSAN_FIX

                Scale_sig32( windowed_samples + frameno * L_FRAME_MAX + 2, win_len, *q_win ); // q_win



#endif

                IF( EQ_16( frameno, 1 ) )

                {

                    Scale_sig32( windowed_samples + 2, win_len, sub( *q_win, Q_win_temp[0] ) ); // q_win

                }

            }

        }

lib_enc/find_uv.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ Word16 find_uv_ivas_fx( /* o : coding typ 
        move16();

    }



    E_min_th = L_shl( E_MIN_IVAS_FX, sub( q_hp_E, Q19 ) );

    E_min_th = L_shl( E_MIN_IVAS_FX_Q31, sub( q_hp_E, Q31 ) );



    test();

    test();