Commit 267b2d69 authored by vaclav's avatar vaclav
Browse files

address two VE comments

parent 4c1345c7

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ ivas_error ivas_dec( 
    {

        st_ivas->ini_frame++;

    }

    if ( st_ivas->ini_active_frame < MAX_FRAME_COUNTER && !( st_ivas->bfi && st_ivas->ini_frame == 0 ) && ivas_total_brate > IVAS_SID_4k4 ) // VE: looks starnge: ini_frame -> ini_frame_active ?

    if ( st_ivas->ini_active_frame < MAX_FRAME_COUNTER && !( st_ivas->bfi && st_ivas->ini_frame == 0 ) && ivas_total_brate > IVAS_SID_4k4 ) // VE: looks strange: ini_frame -> ini_frame_active ?

    {

        st_ivas->ini_active_frame++;

    }

lib_dec/ivas_spar_foa_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -666,7 +666,6 @@ static float ivas_spar_get_cldfb_slot_gain( 
    output_Fs = (float) hDecoderConfig->output_Fs;

    encfb_delay = IVAS_FB_ENC_DELAY_NS;

    decfb_delay = IVAS_FB_DEC_DELAY_NS;

    // VE: overcomplicated logic -> rewrite

    xfade_start_ns = pState->hFbMixer->cross_fade_start_offset / output_Fs * 1000000000.f - encfb_delay + decfb_delay * 0.5f;

    xfade_delay_subframes = (int16_t) ( xfade_start_ns / ( FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ) );
@@ -1065,9 +1064,13 @@ void ivas_spar_foa_dec_upmixer( 


        if ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_FOA )

        {

#ifdef SBA_CLEANING

            ivas_dirac_dec( st_ivas, output, nchan_internal, cldfb_in_ts_re, cldfb_in_ts_im, i_sf );

#else

            nchan_transport = ivas_sba_get_nchan_metadata( st_ivas->sba_order ); // VE: == nchan_internal that is already set correctly



            ivas_dirac_dec( st_ivas, output, nchan_transport, cldfb_in_ts_re, cldfb_in_ts_im, i_sf );

#endif

        }



        if ( st_ivas->hDirAC != NULL )

lib_enc/lib_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -762,7 +762,9 @@ static ivas_error configureEncoder( 
                /* IVAS_fmToDo: needs more work in case of bitrate switching */

                hEncoderConfig->sba_order = 1;

            }

#ifndef SBA_CLEANING

            st_ivas->sba_mode = ivas_sba_mode_select( hEncoderConfig->ivas_total_brate ); // VE: is it needed here?

#endif

        }

        else if ( hEncoderConfig->ivas_format == MASA_FORMAT )

        {