Commit 63b9ee1d authored by norvell's avatar norvell
Browse files

Merge branch 'main' into Ericsson/memory_analysis 

Merge with main
parents 545d796d 295ade89

Workspace_msvc/lib_dec.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -314,10 +314,10 @@ 
    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_stereo_td_low_rate_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_svd_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_td_decorr.c" />

    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_vbap.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4sb.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4_circularbuffer.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −9
Original line number Diff line number Diff line
@@ -466,9 +466,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_stereo_td_low_rate_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>
@@ -476,15 +473,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_agc_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_spar_foa_md_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_td_decorr.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_spar_foa_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_pca_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>
@@ -506,6 +497,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

Workspace_msvc/lib_enc.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -330,8 +330,8 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc.c" />

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

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

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

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -550,9 +550,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

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

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

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

      <Filter>enc_ivas_c</Filter>

    </ClCompile>
@@ -584,6 +581,9 @@ 
    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

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

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\ivas_stat_enc.h">

apps/renderer.c

+3 −4
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static int16_t getTotalNumInChannels( 
    }



#ifdef NOKIA_MASA_EXTERNAL_RENDERER

    for ( int32_t i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )

    for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )

    {

        if ( masaIds[i] == 0 )

        {
@@ -983,13 +983,12 @@ int main( 
#ifdef NOKIA_MASA_EXTERNAL_RENDERER

        for ( i = 0; i < args.inConfig.numMasaBuses; ++i )

        {

            int16_t numChannels;

            if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, masaIds[i], &numChannels ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

                exit( -1 );

            }

            IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, args.inConfig.masaBuses[i].inputChannelIndex, numChannels );

            IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.masaBuses[i].inputChannelIndex, numChannels );



            if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, masaIds[i], tmpBuffer ) ) != IVAS_ERR_OK )

            {
@@ -1390,7 +1389,7 @@ static IVAS_REND_AudioConfig parseAudioConfig( 
            case '1':

                fprintf( stderr, "1TC MASA support is not functional and is pending on DirAC renderer refactoring.\n" );

                exit( EXIT_FAILURE );

                return IVAS_REND_AUDIO_CONFIG_MASA1;

                /*return IVAS_REND_AUDIO_CONFIG_MASA1;*/ // ToDo: temporarily disabled to avoid compilation warnings

            case '2':

                return IVAS_REND_AUDIO_CONFIG_MASA2;

            default: