Commit ddd77286 authored by premathasara's avatar premathasara
Browse files

Merge branch '114-bitrate-switching-in-sba-2' into 114-bitrate-switching-in-sba-2-part2

parents 849eb266 a2a2dd95

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ static ivas_error printConfigInfo_dec( 
            else if ( st_ivas->ivas_format == SBA_FORMAT )

            {

#ifdef PRINT_SBA_ORDER

                fprintf( stdout, "Input configuration:    Scene Based Analysis, Ambisonic order %i%s, %d transport channel(s)\n", st_ivas->sba_order, st_ivas->sba_planar ? " (Planar)" : "", st_ivas->nchan_transport );

                fprintf( stdout, "Input configuration:    Scene Based Audio, Ambisonic order %i%s, %d transport channel(s)\n", st_ivas->sba_order, st_ivas->sba_planar ? " (Planar)" : "", st_ivas->nchan_transport );

#else

                fprintf( stdout, "Input configuration:    SBA - %d transport channel(s) %s\n", st_ivas->nchan_transport, st_ivas->sba_planar ? "(Planar)" : "" );

#endif

lib_enc/init_enc.c

+6 −1
Original line number Diff line number Diff line
@@ -785,8 +785,13 @@ ivas_error init_encoder( 
        }



        initFdCngEnc( st->hFdCngEnc, st->input_Fs, st->cldfbAnaEnc->scale );



        /* initialization for IVAS modes happens in first frame pre-processing */

        if ( st->element_mode == EVS_MONO )

        {

            configureFdCngEnc( st->hFdCngEnc, st->bwidth, st->rf_mode && st->total_brate == ACELP_13k20 ? ACELP_9k60 : st->total_brate );

        }

    }

    else

    {

        st->hFdCngEnc = NULL;

lib_enc/ivas_core_pre_proc_front.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ ivas_error pre_proc_front_ivas( 
     * Adjust FD-CNG Noise Estimator

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



    if ( st->hFdCngEnc != NULL && ( last_element_brate != element_brate || st->last_bwidth != st->bwidth ) )

    if ( st->hFdCngEnc != NULL && ( st->ini_frame == 0 || last_element_brate != element_brate || st->last_bwidth != st->bwidth ) )

    {

        configureFdCngEnc( st->hFdCngEnc, max( st->input_bwidth, WB ), st->bits_frame_nominal * FRAMES_PER_SEC );

        if ( hCPE != NULL )

lib_enc/lib_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -1509,7 +1509,7 @@ static ivas_error printConfigInfo_enc( 
    else if ( hEncoderConfig->ivas_format == SBA_FORMAT )

    {

#ifdef PRINT_SBA_ORDER

        fprintf( stdout, "IVAS format:            Scene Based Analysis, Ambisonic order %i %s ", hEncoderConfig->sba_order, hEncoderConfig->sba_planar ? "(Planar)" : "" );

        fprintf( stdout, "IVAS format:            Scene Based Audio, Ambisonic order %i %s ", hEncoderConfig->sba_order, hEncoderConfig->sba_planar ? "(Planar)" : "" );

#else

        fprintf( stdout, "IVAS format:            Scene Based Analysis %s ", hEncoderConfig->sba_planar ? "(Planar)" : "" );

#endif