Unverified Commit e4db0578 authored by norvell's avatar norvell
Browse files

Merge with main

parents 7164af84 52587aa7

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
@@ -487,6 +487,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/ifft_rel.c

+6 −1
Original line number Diff line number Diff line
@@ -130,7 +130,12 @@ void ifft_rel( 
            id = 4 * id;

        }

        step = N_MAX_FFT / n2;



#ifdef FIX_2268_OOB_INDEXING_IN_IFFT

        if ( n8 < 2 )

        {

            continue;

        }

#endif

        s = sincos_t_ext + step;

        c = s + N_MAX_FFT / 4;

        s3 = sincos_t_ext + 3 * step;