Commit 8269b26d authored by vaclav's avatar vaclav
Browse files

formatting

parent 339647c9

lib_dec/ivas_ism_dec.c

+44 −35
Original line number Diff line number Diff line
@@ -73,7 +73,9 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
    RENDERER_TYPE renderer_type_old;

#endif



#ifndef FIX_HRTF_LOAD_JBM

    error = IVAS_ERR_OK;

#endif

    nCPE_old = st_ivas->nCPE;

    nSCE_old = st_ivas->nSCE;
@@ -322,19 +324,17 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
     * floating-point output audio buffers

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



    {

    nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );



    if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )

    {

        return error;

    }

    }



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

     * JBM TC buffers

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

    {



    int16_t tc_nchan_full_new;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;
@@ -370,9 +370,12 @@ static ivas_error ivas_ism_bitrate_switching_dec( 


        mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

    }

    }



#ifdef FIX_HRTF_LOAD_JBM

    return IVAS_ERR_OK;

#else

    return error;

#endif

}
@@ -398,7 +401,9 @@ ivas_error ivas_ism_dec_config( 
    ivas_error error;

    int16_t nchan_transport_old;



#ifndef FIX_HRTF_LOAD_JBM

    error = IVAS_ERR_OK;

#endif

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;



    /* Assumes that num of input objects are constant */
@@ -427,7 +432,7 @@ ivas_error ivas_ism_dec_config( 
        if ( st_ivas->ini_active_frame != 0 )

        {

            /* ISM bit-rate switching */

            if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hDecoderConfig->ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) )

            if ( ( st_ivas->ism_mode != last_ism_mode ) || ( ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) )

            {

#ifdef FIX_HRTF_LOAD_JBM

                if ( ( error = ivas_ism_bitrate_switching_dec( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK )
@@ -485,5 +490,9 @@ ivas_error ivas_ism_dec_config( 
            break;

    }



#ifdef FIX_HRTF_LOAD_JBM

    return IVAS_ERR_OK;

#else

    return error;

#endif

}

lib_dec/ivas_masa_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -1324,8 +1324,9 @@ ivas_error ivas_masa_dec_reconfigure( 
    int16_t pos_idx;

    int32_t ism_total_brate;



#ifndef FIX_HRTF_LOAD_JBM

    error = IVAS_ERR_OK;



#endif

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;

    last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;
@@ -1568,7 +1569,11 @@ ivas_error ivas_masa_dec_reconfigure( 
        }

    }



#ifdef FIX_HRTF_LOAD_JBM

    return IVAS_ERR_OK;

#else

    return error;

#endif

}

lib_dec/ivas_mct_dec.c

+56 −53
Original line number Diff line number Diff line
@@ -758,7 +758,9 @@ static ivas_error ivas_mc_dec_reconfig( 
#endif

    int16_t nchan_out_buff_old, nchan_out_buff;



#ifndef FIX_HRTF_LOAD_JBM

    error = IVAS_ERR_OK;

#endif

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;

    nchan_transport_old = st_ivas->nchan_transport;

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
@@ -1322,7 +1324,6 @@ static ivas_error ivas_mc_dec_reconfig( 
     * JBM TC buffers

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



    {

    int16_t tc_nchan_full_new;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;
@@ -1382,8 +1383,6 @@ static ivas_error ivas_mc_dec_reconfig( 
        st_ivas->hParamMC->slots_rendered = st_ivas->hTcBuffer->slots_rendered;

        mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hParamMC->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

    }

    }





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

     * floating-point output audio buffers
@@ -1396,5 +1395,9 @@ static ivas_error ivas_mc_dec_reconfig( 
        return error;

    }



#ifdef FIX_HRTF_LOAD_JBM

    return IVAS_ERR_OK;

#else

    return error;

#endif

}

lib_dec/ivas_omasa_dec.c

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

    }





    return IVAS_ERR_OK;

}

lib_dec/ivas_sba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -667,7 +667,11 @@ ivas_error ivas_sba_dec_reconfigure( 
        return error;

    }



#ifdef FIX_HRTF_LOAD_JBM

    return IVAS_ERR_OK;

#else

    return error;

#endif

}