Commit 25a7924e authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'high_mld_fixes_code_cleanup' into 'main' 

High mld fixes for masa format, acelp Q-corrections and code cleanup

See merge request !983
parents 33cc0215 361eb75a

Workspace_msvc/lib_enc.vcxproj

+0 −10
Original line number Diff line number Diff line
@@ -408,25 +408,15 @@ 
    <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+0 −39
Original line number Diff line number Diff line
@@ -160,15 +160,6 @@ 
    <ClCompile Include="..\lib_enc\enc_gen_voic.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -307,36 +298,6 @@ 
    <ClCompile Include="..\lib_enc\swb_tbe_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

lib_enc/acelp_core_enc_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -1398,6 +1398,12 @@ ivas_error acelp_core_enc_ivas_fx( 
            v_multc_fixed_16_16( res_fx, att_fx, res_fx, st->L_frame );

        }



        // Scaling Aq and Aw to Q12

        FOR( Word16 k = 0; k < NB_SUBFR16k; k++ )

        {

            Scale_sig( &Aq[( M + 1 ) * k], M + 1, sub( norm_s( Aq[( M + 1 ) * k] ), 2 ) );

            Scale_sig( &Aw[( M + 1 ) * k], M + 1, sub( norm_s( Aw[( M + 1 ) * k] ), 2 ) );

        }

        /*-----------------------------------------------------------------*

         * Determine TC subframe classification

         *-----------------------------------------------------------------*/

lib_enc/ivas_stereo_dmx_evs.c

+1 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ void stereo_dmx_evs_enc_fx( 
        move16();

    }



    create_M_signal_fx( data_fx[0], data_fx[1], dmx_poc_data, dmx_weight, input_frame, hStereoDmxEVS->s_wnd_fx,

    create_M_signal_fx( data_fx[0], data_fx[1], dmx_poc_data, L_deposit_h( dmx_weight ), input_frame, hStereoDmxEVS->s_wnd_fx,

                        hStereoDmxEVS->dmx_weight_fx, hStereoDmxEVS->pre_dmx_energy_fx, hStereoDmxEVS->pre_dmx_energy_fx_e, hStereoDmxEVS->aux_dmx_energy_fx, hStereoDmxEVS->aux_dmx_energy_fx_e );



    // Downscaling signals to avoid accumulation overflows

lib_enc/ivas_stereo_td_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ void tdm_configure_enc_fx( 
        }

    }

    ELSE IF( ( LT_16( sts[1]->coder_type, AUDIO ) && NE_16( sts[1]->coder_type, UNVOICED ) ) || /* TC and VC are not supported in secondary channel */

             ( ( EQ_16( sts[1]->coder_type, AUDIO ) && LE_32( hCPE->element_brate, IVAS_24k4 ) ) || ( EQ_16( sts[0]->sp_aud_decision1, 1 ) && GE_32( hCPE->element_brate, IVAS_16k4 ) ) || ( EQ_16( sts[1]->sp_aud_decision0, 1 ) && GE_32( hCPE->element_brate, IVAS_13k2 ) ) ) )

             ( ( EQ_16( sts[1]->coder_type, AUDIO ) && LE_32( hCPE->element_brate, IVAS_24k4 ) ) || ( EQ_16( sts[0]->sp_aud_decision1, 1 ) && GE_32( hCPE->element_brate, IVAS_16k4 ) ) || ( EQ_16( sts[1]->sp_aud_decision0, 1 ) && GT_32( hCPE->element_brate, IVAS_13k2 ) ) ) )

    {

        sts[1]->coder_type = GENERIC;

        move16();
@@ -485,7 +485,7 @@ void tdm_configure_enc_fx( 
    }



    test();

    IF( GE_32( hCPE->element_brate, IVAS_24k4 ) && EQ_16( hCPE->hStereoClassif->lrtd_mode, 1 ) )

    IF( GT_32( hCPE->element_brate, IVAS_24k4 ) && EQ_16( hCPE->hStereoClassif->lrtd_mode, 1 ) )

    {

        if ( EQ_16( sts[1]->coder_type, UNVOICED ) )

        {