Commit 5dc8dc73 authored by multrus's avatar multrus
Browse files

[cleanup] accept BRATE_SWITCHING_RENDERING

parent 8c42c938

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -3145,14 +3145,12 @@ void ivas_init_dec_get_num_cldfb_instances( 
    int16_t *numCldfbSyntheses                                  /* o  : number of CLDFB synthesis instances     */

);



#ifdef BRATE_SWITCHING_RENDERING

ivas_error ivas_cldfb_dec_reconfig(

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

    const int16_t nchan_transport_old,                          /* i  : number of TCs in previous frame                       */

    int16_t numCldfbAnalyses_old,                               /* i  : number of CLDFB analysis instances in previous frame  */

    const int16_t numCldfbSyntheses_old                         /* i  : number of CLDFB synthesis instances in previous frame */

);

#endif

/*! r: Ambisonic (SBA) order */

int16_t ivas_sba_get_order(

    const int16_t nb_channels,                                  /* i  : Number of ambisonic channels            */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
#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 BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

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

#define MC_BITRATE_SWITCHING                            /* Issue 116: support bitrate switching in MC format  */

lib_debug/coan_out_000000

0 → 100644
+924 −0

File added.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_corecoder_dec_reconfig.c

+0 −2
Original line number Diff line number Diff line
@@ -480,7 +480,6 @@ ivas_error ivas_hp20_dec_reconfig( 
}





#ifdef BRATE_SWITCHING_RENDERING

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

 * ivas_cldfb_dec_reconfig()

 *
@@ -572,4 +571,3 @@ ivas_error ivas_cldfb_dec_reconfig( 
#endif

    return IVAS_ERR_OK;

}
 
#endif

lib_dec/ivas_dirac_dec_binaural_functions.c

+0 −12
Original line number Diff line number Diff line
@@ -98,21 +98,17 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
    float binCenterFreq, tmpFloat;

    ivas_error error;



#ifdef BRATE_SWITCHING_RENDERING

    hBinaural = st_ivas->hDiracDecBin;



    if ( hBinaural == NULL )

#endif

    {

        if ( ( hBinaural = (DIRAC_DEC_BIN_HANDLE) malloc( sizeof( DIRAC_DEC_BIN_DATA ) ) ) == NULL )

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC binaural handle " );

        }



#ifdef BRATE_SWITCHING_RENDERING

        hBinaural->hTdDecorr = NULL;

        hBinaural->hReverb = NULL;

#endif

    }



    nBins = st_ivas->hDirAC->num_freq_bands;
@@ -201,7 +197,6 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
    {

        mvr2r( parametricEarlyPartEneCorrection, hBinaural->earlyPartEneCorrection, nBins );



#ifdef BRATE_SWITCHING_RENDERING

        /* reconfiguration needed when Reverb. parameters are changed -> close and open the handle again */

        if ( hBinaural->hReverb != NULL && ( ( hBinaural->hReverb->numBins != nBins ) ||

                                             ( hBinaural->useSubframeMode && hBinaural->hReverb->blockSize != CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ) ||
@@ -211,7 +206,6 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
        }



        if ( hBinaural->hReverb == NULL )

#endif

        {

            if ( hBinaural->useSubframeMode )

            {
@@ -244,9 +238,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
    {

        if ( st_ivas->hDecoderConfig->ivas_total_brate >= IVAS_13k2 && st_ivas->ivas_format == SBA_FORMAT )

        {

#ifdef BRATE_SWITCHING_RENDERING

            if ( hBinaural->hTdDecorr == NULL )

#endif

            {

                ivas_spar_td_decorr_dec_open( &( hBinaural->hTdDecorr ), output_Fs, 3, 1 );

            }
@@ -267,11 +259,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
    }

    else

    {

#ifdef BRATE_SWITCHING_RENDERING

        ivas_spar_td_decorr_dec_close( &( hBinaural->hTdDecorr ) );

#else

        hBinaural->hTdDecorr = NULL;

#endif

    }



    st_ivas->hDiracDecBin = hBinaural;