Commit 5ce0a9f1 authored by vaclav's avatar vaclav
Browse files

- fix SBA switching complexity overhead; under SBA_BR_SWITCHING_COMPLEXITY_FIX

parent a29ddb4f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same number of transport channels*/

#ifdef SBA_BR_SWITCHING

#define SBA_BR_SWITCHING_RECONFIG                       /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/

#define SBA_BR_SWITCHING_COMPLEXITY_FIX                 /* VA: fix complexity overhead */ 

#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

lib_enc/ivas_sba_enc.c

+9 −0
Original line number Diff line number Diff line
@@ -329,6 +329,9 @@ ivas_error ivas_sba_enc_reconfigure( 
    int32_t ivas_total_brate;

    ivas_error error;

    ENCODER_CONFIG_HANDLE hEncoderConfig;

#ifdef SBA_BR_SWITCHING_COMPLEXITY_FIX

    int16_t flag_spar_opened = 0;

#endif



    error = IVAS_ERR_OK;
@@ -361,6 +364,9 @@ ivas_error ivas_sba_enc_reconfigure( 
                    return error;

                }



#ifdef SBA_BR_SWITCHING_COMPLEXITY_FIX

                flag_spar_opened = 1;

#endif

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

            }
@@ -399,6 +405,9 @@ ivas_error ivas_sba_enc_reconfigure( 
                    hDirAC->hFbMixer = NULL;

                }



#ifdef SBA_BR_SWITCHING_COMPLEXITY_FIX

                if ( flag_spar_opened == 0 )

#endif

                {

                    // VE: dirty patch -> reconfiguration of SPAR MD, TD_decorr, FbMixer modules should be used instead !!