Commit 6bcac895 authored by vaclav's avatar vaclav
Browse files

formatting

parent 2d1d917e

lib_dec/ivas_jbm_dec.c

+0 −3
Original line number Diff line number Diff line
@@ -1296,16 +1296,13 @@ ivas_error ivas_jbm_dec_render( 
                else

                {

#endif



#if ( defined NONBE_UNIFIED_DECODING_PATHS && defined SPLIT_REND_WITH_HEAD_ROT )

                    if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,

                                                                   &st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output : p_tc, p_output, *nSamplesRendered, output_Fs, 0 ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,

                                                               &st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output : p_tc, p_output, *nSamplesRendered, output_Fs ) ) != IVAS_ERR_OK )



#endif



                    {

                        return error;

                    }

lib_dec/ivas_mc_paramupmix_dec.c

+24 −26
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ void ivas_mc_paramupmix_dec_render( 


    hMCParamUpmix = st_ivas->hMCParamUpmix;

    assert( hMCParamUpmix );



    push_wmops( "ivas_mc_paramupmix_dec_render" );



    for ( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )
@@ -537,7 +536,6 @@ void ivas_mc_paramupmix_dec_render( 
#ifdef DEBUGGING

    assert( slots_to_render == 0 );

#endif

    {



    for ( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS; ch++ )

    {
@@ -559,6 +557,7 @@ void ivas_mc_paramupmix_dec_render( 
#else

        ivas_mc_paramupmix_dec_sf( st_ivas, output_f_local );

#endif



        for ( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )

        {

            output_f_local[ch] += n_samples_sf;
@@ -575,7 +574,6 @@ void ivas_mc_paramupmix_dec_render( 
        mvr2r( hMCParamUpmix->alphas[ch], hMCParamUpmix->alpha_prev[ch], IVAS_MAX_NUM_BANDS );

        mvr2r( hMCParamUpmix->betas[ch], hMCParamUpmix->beta_prev[ch], IVAS_MAX_NUM_BANDS );

    }

    }



    *nSamplesAvailable = ( st_ivas->hTcBuffer->num_slots - st_ivas->hTcBuffer->slots_rendered ) * slot_size;