Commit f2d29321 authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent 068cb41f

lib_enc/ivas_sba_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ ivas_error ivas_sba_enc_reconfigure( 
                    return error;

                }



                // VE: TBV - initialize 'hSpar->hFrontVad' with 'hCoreCoder[0]' instead of initializing it?

                // VE: TBV - populate 'hSpar->hFrontVad' with 'hCoreCoder[0]' instead of resetting it to init-state?

            }



            ivas_spar_config( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ),

lib_enc/ivas_spar_encoder.c

+7 −8
Original line number Diff line number Diff line
@@ -724,13 +724,6 @@ static ivas_error ivas_spar_enc_process( 
    if ( hSpar->hMdEnc->table_idx != table_idx )

    {

        hSpar->hMdEnc->table_idx = table_idx;

        ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx,

#ifdef SBA_HOA_HBR_IMPROV

                                      ( hSpar->hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND

#else

                                      SPAR_DIRAC_SPLIT_START_BAND

#endif

        );



#ifdef SBA_BITRATE_SWITCHING

        if ( ivas_total_brate != hEncoderConfig->last_ivas_total_brate )
@@ -743,7 +736,13 @@ static ivas_error ivas_spar_enc_process( 
        else

#endif

        {

            ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx, SPAR_DIRAC_SPLIT_START_BAND );

            ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx,

#ifdef SBA_HOA_HBR_IMPROV

                                          ( hSpar->hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND

#else

                                          SPAR_DIRAC_SPLIT_START_BAND

#endif

            );

        }

    }