Commit abfa1f7a authored by vaclav's avatar vaclav
Browse files

address reviewer's comments

parent 93ee9910

apps/decoder.c

+1 −2
Original line number Diff line number Diff line
@@ -4435,7 +4435,6 @@ static ivas_error restartDecoder( 


    arg->decMode = decMode;



#ifndef FIX_FMSW_DEC

    hIvasDec = *phIvasDec;



    uint16_t aeID = arg->aeSequence.count > 0 ? arg->aeSequence.pID[0] : IVAS_DEFAULT_AEID;
@@ -4498,7 +4497,7 @@ static ivas_error restartDecoder( 
            goto cleanup;

        }

    }

#endif



    return IVAS_ERR_OK;



cleanup:

lib_dec/lib_dec.c

+15 −16
Original line number Diff line number Diff line
@@ -206,17 +206,15 @@ ivas_error IVAS_DEC_Open( 
    IVAS_DEC_HANDLE hIvasDec;

    Decoder_Struct *st_ivas;



#ifdef FIX_FMSW_DEC

    if ( *phIvasDec != NULL )

    {

        return IVAS_ERR_WRONG_PARAMS;

    }

#else



    if ( phIvasDec == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }

#endif



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

     * Allocate and initialize IVAS application decoder handle
@@ -344,30 +342,31 @@ ivas_error IVAS_DEC_Restart( 
    const IVAS_DEC_MODE mode  /* i  : compatibility mode (EVS or IVAS)  */

)

{

    Decoder_Struct *st_ivas;



    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    st_ivas = hIvasDec->st_ivas;

    if ( !hIvasDec->st_ivas->restartNeeded )

    {

        if ( hIvasDec->mode == mode )

        {

            return IVAS_ERR_OK;

        }



        return IVAS_ERR_WRONG_PARAMS;

    }



    hIvasDec->mode = mode;



    /* destroy Split binaural renderer (ISAR) handle */

    ivas_destroy_handle_isar( &st_ivas->hSplitBinRend );

    ivas_destroy_handle_isar( &hIvasDec->st_ivas->hSplitBinRend );



    /* destroy IVAS decoder handles */

    ivas_destroy_dec( &st_ivas );

    ivas_destroy_dec( &hIvasDec->st_ivas );



    /* Set IVAS decoder handles to NULL + set high-level parameters */

    if ( !st_ivas->restartNeeded )

    {

        return IVAS_ERR_WRONG_PARAMS;

    }

    else

    {

        return ivas_dec_handle_init( st_ivas, mode, &( hIvasDec->hasDecodedFirstGoodFrame ) );

    }

    return ivas_dec_handle_init( hIvasDec->st_ivas, mode, &( hIvasDec->hasDecodedFirstGoodFrame ) );

}



#endif