Commit 0bb4df8f authored by vaclav's avatar vaclav
Browse files

Merge branch 'maintenance' into 20230320_maintenance

parents 83c367f3 0bd10c43

Workspace_msvc/lib_com.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -244,9 +244,9 @@ 
    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c" />

    <ClCompile Include="..\lib_com\ivas_fb_mixer.c" />

    <ClCompile Include="..\lib_com\ivas_filters.c" />

    <ClCompile Include="..\lib_com\ivas_ism_com.c" />

    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c" />

    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />

    <ClCompile Include="..\lib_com\ivas_ism_config.c" />

    <ClCompile Include="..\lib_com\ivas_masa_com.c" />

    <ClCompile Include="..\lib_com\ivas_mct_com.c" />

    <ClCompile Include="..\lib_com\ivas_mc_com.c" />

Workspace_msvc/lib_com.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -379,9 +379,6 @@ 
    <ClCompile Include="..\lib_com\swb_bwe_com_lr.c">

      <Filter>common_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_config.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>
@@ -466,6 +463,9 @@ 
    <ClCompile Include="..\lib_com\ivas_td_decorr.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">

lib_com/ivas_ism_config.c→lib_com/ivas_ism_com.c

+31 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "rom_com.h"

#include "prot.h"

#include "ivas_prot.h"

#include "ivas_stat_com.h"

#include "ivas_rom_com.h"

#ifdef DEBUGGING

#include "debug.h"
@@ -502,3 +503,33 @@ ISM_MODE ivas_ism_mode_select( 


    return ism_mode;

}





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

 * ivas_ism_metadata_close()

 *

 * Deallocate ISM metadata handles

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



void ivas_ism_metadata_close(

    ISM_METADATA_HANDLE hIsmMetaData[] /* i/o  : object metadata handles */

)

{

    int16_t n;



    if ( hIsmMetaData == NULL || hIsmMetaData == NULL )

    {

        return;

    }



    for ( n = 0; n < MAX_NUM_OBJECTS; n++ )

    {

        if ( hIsmMetaData[n] != NULL )

        {

            free( hIsmMetaData[n] );

            hIsmMetaData[n] = NULL;

        }

    }



    return;

}

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -863,6 +863,10 @@ void ivas_param_ism_enc_close( 
    const int32_t input_Fs                                      /* i  : input sampling_rate                         */

);



void ivas_ism_metadata_close(

    ISM_METADATA_HANDLE hIsmMetaData[]                          /* i/o  : object metadata handles                   */

);



void ivas_param_ism_stereo_dmx(

    Encoder_Struct *st_ivas,                                    /* i  : IVAS encoder structure                      */

    float data[MAX_NUM_OBJECTS][L_FRAME48k],                    /* i/o: input signal/stereo dmx                     */

lib_dec/ivas_init_dec.c

+2 −9
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ void ivas_destroy_dec( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder handle      */

)

{

    int16_t i, n;

    int16_t i;



    /* CLDFB handles */

    for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )
@@ -1701,14 +1701,7 @@ void ivas_destroy_dec( 
    }



    /* ISM metadata handles */

    for ( n = 0; n < MAX_NUM_OBJECTS; n++ )

    {

        if ( st_ivas->hIsmMetaData[n] != NULL )

        {

            free( st_ivas->hIsmMetaData[n] );

            st_ivas->hIsmMetaData[n] = NULL;

        }

    }

    ivas_ism_metadata_close( st_ivas->hIsmMetaData );



    /* ISM renderer handle */

    if ( st_ivas->hIsmRendererData != NULL )