Commit a07908f1 authored by vaclav's avatar vaclav
Browse files

formatting + improve comments

parent 0a97683b

lib_com/stat_com.h

+2 −2
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ typedef int16_t ( *TDecodeValue )( struct Decoder_State *st, int16_t index, int1 
 */

typedef float ( *TLinearPredictionFilter )( const int16_t order, const float parCoeff[], float *state, float x );



/** Structure that defines mapping between a parameter and a bistream. */

/** Structure that defines mapping between a parameter and a bitstream. */

typedef struct ParamBitMap

{

    /** Number of bits in a bitstream required for the parameter.
@@ -516,7 +516,7 @@ typedef struct ParamBitMap 
    struct ParamsBitMap const *pSubParamBitMap;

} ParamBitMap;



/** Structure that defines mapping between parameters and a bistream. */

/** Structure that defines mapping between parameters and a bitstream. */

typedef struct ParamsBitMap

{

    /** Number of parameters in params. */

lib_dec/ivas_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ ivas_error ivas_dec( 
        }

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            // VE: call ivas_ism_metadata_dec() with 'st_ivas' - TBD

#ifdef DISCRETE_ISM_DTX_CNG

#ifdef NCHAN_ISM_PARAMETER

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm ) ) != IVAS_ERR_OK )

lib_dec/ivas_ism_dec.c

+9 −13
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ 




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

 * ivas_ism_bitrate_switching()

 *

 * ivas_ism_bitrate_switching_dec()

 *

 * Reconfiguration of ISM decoder in case of bitrate switching

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



static ivas_error ivas_ism_bitrate_switching(

static ivas_error ivas_ism_bitrate_switching_dec(

    Decoder_Struct *st_ivas,           /* i/o: IVAS decoder structure               */

    const int16_t nchan_transport_old, /* i  : last number of transport channels    */

    const ISM_MODE last_ism_mode       /* i  : last ISM mode                        */
@@ -154,12 +154,8 @@ static ivas_error ivas_ism_bitrate_switching( 
            ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );



            /* Open Crend Binaural renderer */

            if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),

                                                st_ivas->intern_config,

                                                st_ivas->hOutSetup.output_config,

                                                st_ivas->hRenderConfig,

                                                st_ivas->hSetOfHRTF,

                                                st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config,

                                                st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

            {

                return error;

            }
@@ -315,9 +311,9 @@ ivas_error ivas_ism_dec_config( 
                if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hDecoderConfig->ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) )

                {

#ifdef NCHAN_ISM_PARAMETER

                    if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK )

                    if ( ( error = ivas_ism_bitrate_switching_dec( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK )

#else

                    if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj ) ) != IVAS_ERR_OK )

                    if ( ( error = ivas_ism_bitrate_switching_dec( st_ivas, nchan_transport_old, last_ism_mode, num_obj ) ) != IVAS_ERR_OK )

#endif

                    {

                        return error;
@@ -351,9 +347,9 @@ ivas_error ivas_ism_dec_config( 
        if ( st_ivas->ism_mode != last_ism_mode )

        {

#ifdef NCHAN_ISM_PARAMETER

            if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_ism_bitrate_switching_dec( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_ism_bitrate_switching_dec( st_ivas, nchan_transport_old, last_ism_mode, num_obj ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

lib_dec/ivas_ism_metadata_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ ivas_error ivas_ism_metadata_dec( 
    }



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

     * Set bitsream pointers

     * Set bitstream pointers

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



    /* set the bitstream pointer to its original position */

lib_enc/ivas_ism_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ ivas_error ivas_ism_enc( 
    }

    else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

    {

        // VE: call ivas_ism_metadata_enc() with 'st_ivas' - TBD

        ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate,

#ifdef NCHAN_ISM_PARAMETER

                               nchan_ism,
@@ -302,7 +301,6 @@ ivas_error ivas_ism_enc( 
#endif

    {

        ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr );



#ifndef DISCRETE_ISM_DTX_CNG

        if ( st_ivas->ism_mode != ISM_MODE_PARAM )

        {