Commit bcd46139 authored by vaclav's avatar vaclav
Browse files

introduce function ivas_ism_metadata_close( )

parent 4970f2be

lib_com/ivas_ism_config.c

+32 −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"
@@ -348,6 +349,7 @@ void ivas_ism_reset_metadata( 
 *

 * Reset ISm metadata parameters

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



void ivas_ism_reset_metadata_API(

    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle     */

)
@@ -500,3 +502,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
@@ -864,6 +864,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
@@ -1636,7 +1636,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++ )
@@ -1703,14 +1703,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 )

lib_enc/ivas_init_enc.c

+1 −8
Original line number Diff line number Diff line
@@ -916,14 +916,7 @@ void ivas_destroy_enc( 
    }



    /* 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 DTX Handle */

    if ( st_ivas->hISMDTX != NULL )