Commit 57e03bab authored by vaclav's avatar vaclav
Browse files

add error code to return of ivas_masa_ism_data_open()

parent af4fb067

lib_com/ivas_omasa_com.c

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ 
/*---------------------------------------------------------------

 * ivas_omasa_ism_mode_select()

 *

 * selects the ISM mode base on bit-rate and number of objects in the combined ISM MASA format mode

 * selects the ISM mode base on IVAS total bit-rate and 

 * the number of objects in the combined ISM MASA format mode

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



/*! r : ISM format mode */

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -5209,7 +5209,7 @@ void ivas_merge_masa_transports( 
    const int16_t num_transport_channels                        /* i  : Number of transport audio signals       */

);



void ivas_masa_ism_data_open(

ivas_error ivas_masa_ism_data_open(

    Decoder_Struct* st_ivas                                     /* i/o: IVAS decoder handle                     */

);

lib_dec/ivas_init_dec.c

+10 −3
Original line number Diff line number Diff line
@@ -1009,14 +1009,21 @@ ivas_error ivas_init_decoder( 
                reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] );

            }



            if ( ( error = create_ism_metadata_dec( st_ivas, st_ivas->nSCE, temp_brate ) ) != IVAS_ERR_OK )

            if ( ( error = create_ism_metadata_dec( st_ivas, st_ivas->nchan_ism, temp_brate ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }



        ivas_masa_dec_open( st_ivas );

        ivas_masa_ism_data_open( st_ivas );

        if ( ( error = ivas_masa_dec_open( st_ivas ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        if ( ( error = ivas_masa_ism_data_open( st_ivas ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MONO_DOWNMIX )

        {

lib_dec/ivas_masa_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -558,18 +558,16 @@ ivas_error ivas_masa_dec_open( 
 *

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



void ivas_masa_ism_data_open(

ivas_error ivas_masa_ism_data_open(

    Decoder_Struct *st_ivas /* i/o: IVAS decoder handle  */

)

{

    MASA_ISM_DATA_HANDLE hMasaIsmData;

    int16_t bin;

    int16_t ch;

    int16_t ch, bin;



    if ( ( hMasaIsmData = (MASA_ISM_DATA_HANDLE) malloc( sizeof( MASA_ISM_DATA ) ) ) == NULL )

    {

        fprintf( stderr, "Can not allocate memory for MASA_ISM data\n" );

        exit( -1 );

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA ISM data\n" ) );

    }



    for ( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )
@@ -588,9 +586,11 @@ void ivas_masa_ism_data_open( 
    hMasaIsmData->delayBuffer = NULL;

    st_ivas->hMasaIsmData = hMasaIsmData;



    return;

    return IVAS_ERR_OK;

}

#endif





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

 * ivas_masa_dec_close()

 *