Commit e85bfd02 authored by multrus's avatar multrus
Browse files

[cleanup] accept SBA_BR_SWITCHING, SBA_BR_SWITCHING_RECONFIG

parent 5c280909

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -942,10 +942,8 @@ typedef enum 
{

    DIRAC_OPEN,                                 /* initialize to default value              */

    DIRAC_RECONFIGURE                           /* HOA3                                     */

#ifdef SBA_BR_SWITCHING

    ,

    DIRAC_RECONFIGURE_MODE

#endif

} DIRAC_CONFIG_FLAG;

lib_com/ivas_prot.h

+0 −27
Original line number Diff line number Diff line
@@ -105,30 +105,12 @@ ivas_error mct_enc_reconfigure( 
    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */

    const uint16_t b_nchan_change                               /* i  : flag indicating different channel count */

);

#ifndef SBA_BR_SWITCHING_RECONFIG

#ifdef SBA_BR_SWITCHING

ivas_error ivas_sba_enc_reinit(

    Encoder_Struct *st_ivas /* i/o: IVAS encoder structure      */

);

#endif

#endif

#ifndef SBA_BR_SWITCHING_RECONFIG

#ifdef SBA_BR_SWITCHING

int16_t get_sba_reinit_flag(

    int32_t ivas_total_bitrate,                                /* i  : Current bitrate  */

    int32_t last_ivas_total_brate                              /* i  : Previous bitrate  */

    , int16_t sba_order

);

#endif

#endif

#ifdef SBA_BR_SWITCHING

ivas_error ivas_spar_md_enc_init

(

    ivas_spar_md_enc_state_t *hMdEnc,                         /* o  : MD encoder handle        */

    const ENCODER_CONFIG_HANDLE hEncoderConfig,               /* i  : configuration structure  */

    const int16_t sba_order                                   /* i  : Ambisonic (SBA) order    */

);

#endif

ivas_error ivas_sba_enc_reconfigure( 

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

);
@@ -3161,13 +3143,6 @@ void ivas_sba_config( 
ivas_error ivas_sba_dec_reconfigure(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);

#ifndef SBA_BR_SWITCHING_RECONFIG

#ifdef SBA_BR_SWITCHING

ivas_error ivas_sba_dec_reinit(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);

#endif

#endif



void ivas_init_dec_get_num_cldfb_instances(

    Decoder_Struct *st_ivas,                                    /* i  : IVAS decoder structure                  */
@@ -4065,9 +4040,7 @@ ivas_error ivas_spar_md_dec_open( 
    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */

    const int16_t num_channels,                                 /* i  : number of internal channels             */

	const int16_t sba_order                                     /* i  : SBA order                               */

#ifdef SBA_BR_SWITCHING_RECONFIG

    ,const int16_t sid_format

#endif

);



void ivas_spar_md_dec_close(

lib_com/ivas_sba_config.c

+0 −36
Original line number Diff line number Diff line
@@ -71,42 +71,6 @@ SBA_MODE ivas_sba_mode_select( 


    return sba_mode;

}

#ifndef SBA_BR_SWITCHING_RECONFIG

#ifdef SBA_BR_SWITCHING

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

 * get_sba_reinit_flag()

 *

 * Get SBA reinitialisation flag

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



int16_t get_sba_reinit_flag(

    int32_t ivas_total_bitrate,    /* i  : Current bitrate  */

    int32_t last_ivas_total_brate, /* i  : Previous bitrate  */

    int16_t sba_order )

{

    int16_t sba_reinit_flag;



    sba_reinit_flag = 0;

    if ( ivas_total_bitrate != last_ivas_total_brate && ( ivas_total_bitrate > IVAS_SID_5k2 ) )

    {

        int16_t sba_analysis_order, nchan_transport_old, nchan_transport_new;

        SBA_MODE last_sba_mode, current_sba_mode;

        sba_analysis_order = ivas_sba_get_analysis_order( last_ivas_total_brate, sba_order );

        nchan_transport_old = ivas_get_sba_num_TCs( last_ivas_total_brate, min( sba_analysis_order, IVAS_MAX_SBA_ORDER ) );

        last_sba_mode = ivas_sba_mode_select( last_ivas_total_brate );

        current_sba_mode = ivas_sba_mode_select( ivas_total_bitrate );

        sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_bitrate, sba_order );

        nchan_transport_new = ivas_get_sba_num_TCs( ivas_total_bitrate, min( sba_analysis_order, IVAS_MAX_SBA_ORDER ) );

        if ( ( current_sba_mode != last_sba_mode ) || ( nchan_transport_new != nchan_transport_old ) )

        {

            sba_reinit_flag = 1;

        }

    }



    return sba_reinit_flag;

}

#endif

#endif

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

 * ivas_sba_config()

 *

lib_com/options.h

+0 −4
Original line number Diff line number Diff line
@@ -142,10 +142,6 @@ 
/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



#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*/

#endif





#define LOW_RATE_TRANS_CORE_CODER                       /* Eri: Activate low-rate-encoding-of-transients contribution for core coder, affects MC, MASA and SBA */

lib_dec/ivas_corecoder_dec_reconfig.c

+0 −4
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ ivas_error ivas_corecoder_dec_reconfig( 
            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->use_itd = 0;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->reverse_dmx = 0;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->smooth_ratio = 1.f;

#ifdef SBA_BR_SWITCHING_RECONFIG

            set_s( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->prev_ms_mask[0], 0, MAX_SFB );

            set_s( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->prev_ms_mask[1], 0, MAX_SFB );

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->lastCoh = 1.f;
@@ -255,7 +254,6 @@ ivas_error ivas_corecoder_dec_reconfig( 
            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->mdct_stereo_mode[1] = SMDCT_DUAL_MONO;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->IGFStereoMode[0] = -1;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->IGFStereoMode[1] = -1;

#endif

            for ( n = 0; n < CPE_CHANNELS; n++ )

            {

                /* reset mct_chan_mode */
@@ -514,12 +512,10 @@ ivas_error ivas_cldfb_dec_reconfig( 
            }

        }

    }

#ifdef SBA_BR_SWITCHING_RECONFIG

    /* CLDFB Interpolation weights */

    if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( numCldfbAnalyses_old != numCldfbAnalyses || numCldfbSyntheses_old != numCldfbSyntheses || nchan_transport_old != st_ivas->nchan_transport ) )

    {

        ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig );

    }

#endif

    return IVAS_ERR_OK;

}