Commit caaaa00f authored by emerit's avatar emerit
Browse files

Merge branch 'main' into... 

Merge branch 'main' into basop_2249_Memory_leak_in_SBA_to_BINAURAL_ROOM_REVERB_with_memory_instrumentation
parents 0824d601 ea2eb610

Workspace_msvc/lib_isar.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
    <ClCompile Include="..\lib_isar\isar_lc3plus_enc.c" />

    <ClCompile Include="..\lib_isar\isar_lc3plus_payload.c" />

    <ClCompile Include="..\lib_isar\isar_MSPred.c" />

    <ClCompile Include="..\lib_isar\isar_NoiseGen.c" />

    <ClCompile Include="..\lib_isar\isar_PerceptualModel.c" />

    <ClCompile Include="..\lib_isar\isar_PredDecoder.c" />

    <ClCompile Include="..\lib_isar\isar_PredEncoder.c" />

Workspace_msvc/lib_isar.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
    <ClCompile Include="..\lib_isar\isar_MSPred.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_NoiseGen.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_PerceptualModel.c">

      <Filter>isar_c</Filter>

    </ClCompile>

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -489,6 +489,13 @@ int main( 
            fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR

        if ( !arg.renderConfigEnabled && ( arg.renderFramesize != asked_frame_size ) )

        {

            fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );

        }

#endif

    }



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

lib_com/gs_noisefill.c

+12 −0
Original line number Diff line number Diff line
@@ -589,11 +589,19 @@ void highband_exc_dct_in( 


    if ( bfi || core_brate < 6000 || ( core_brate < 8600 && coder_type == UNVOICED ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set_f( noisepb, 0.4f, MBANDS_GN );

#else

        set_f( noisepb, 0.4f, last_bin );

#endif

    }

    else if ( GSC_IVAS_mode == 3 || ( GSC_IVAS_mode > 0 && GSC_noisy_speech == 1 ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set_f( noisepb, 0.4f, MBANDS_GN16k );

#else

        set_f( noisepb, 0.4f, last_bin );

#endif

    }

    else

    {
@@ -607,7 +615,11 @@ void highband_exc_dct_in( 


    if ( GSC_IVAS_mode == 0 && GSC_noisy_speech && !bfi && element_mode <= IVAS_SCE )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set_f( noisepb, 0.1f, MBANDS_GN );

#else

        set_f( noisepb, 0.1f, last_bin );

#endif

    }



    if ( core_brate < 6000 && coder_type <= UNVOICED )

lib_com/hvq_pvq_bitalloc.c

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ int16_t hvq_pvq_bitalloc( 
    int16_t num_sfm;

    int16_t bit_cost;



#ifdef FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR

    *n_sel_bands = 0;

#endif



    if ( bwidth == FB )

    {

        num_sfm = SFM_N_HARM_FB;
@@ -134,7 +138,9 @@ int16_t hvq_pvq_bitalloc( 
        return 0;

    }



#ifndef FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR

    *n_sel_bands = 0;

#endif

    env_mean = 0;

    E_max = 0;

    k_max = k_start;