Commit 8f74c3b0 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'q_doc_bug_fixes' into 'main' 

Q documentation, BASOP/instrumentation updates and bug fix in swb_bwe_enc_ivas_fx

See merge request !1080
parents 1533c6e8 e4bcf47d

Workspace_msvc/lib_enc.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -379,8 +379,6 @@ 
    <ClCompile Include="..\lib_enc\multi_harm.c" />

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

    <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\pitch_ol.c" />

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+0 −4
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ 
    <ClCompile Include="..\lib_enc\multi_harm.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

lib_com/prot.h

+1 −1
Original line number Diff line number Diff line
@@ -8161,7 +8161,7 @@ void IGFEncApplyStereo( 
);





void IGFEncResetTCX10BitCounter(

void IGFEncResetTCX10BitCounter_ivas_fx(

    const IGF_ENC_INSTANCE_HANDLE hIGFEnc /* i  : instance handle of IGF Encoder */

);

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -10887,7 +10887,7 @@ Word16 IGFEncWriteBitstream_ivas_fx( 
    const Word16 isIndepFlag               /* i  : if 1 frame is independent, 0 = frame is coded with data from previous frame */

);

/*igf_scf_enc.c*/

Word16 IGFSCFEncoderEncode(

Word16 IGFSCFEncoderEncode_ivas_fx(

    IGFSCFENC_INSTANCE_HANDLE hPublicData, /* i/o: handle to public data or NULL in case there was no instance created                           */

    BSTR_ENC_HANDLE hBstr,                 /* i/o: encoder bitstream handle                                                                      */

    const Word16 bitCount,                 /* i  : offset to the first bit in bitbuffer which should be readed by iisArithDecoderDecode function */

lib_enc/core_switching_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -431,7 +431,9 @@ void core_switching_pre_enc_ivas_fx( 
            move16();

        }

        hBWE_FD->EnergyLF_fx = 0;

        hBWE_FD->EnergyLF_exp = 0;

        move32();

        move16();

        hBWE_FD->prev_L_swb_norm1 = 8;

        move16(); /*8.0 in Q0 */

        st_fx->EnergyLT_fx_exp = 30;