Commit ddd110c7 authored by fotopoulou's avatar fotopoulou
Browse files

turn off bandwidth detection for MCT under DISABLE_BWD_MCT

parent 4020bc58

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -2713,7 +2713,9 @@ void ivas_mct_core_enc( 
    CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS],                        /* i/o: CPE encoder structures                  */

    const int16_t nChannels,                                    /* i  : number of channels to be coded          */

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */

#ifndef DISABLE_BWD_MCT

    const int16_t switch_bw,                                    /* i  : flag bandwidth switch occurance         */

#endif

    const int16_t lfe_bits,                                     /* i  : bits spent for LFE                      */

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

);

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
#define FIX_372_LIB_REND_VALIDATE_IO                    /* FhG: Issue 372: IVAS_rend segfaults with unsupported I/O configs - add validation checks of I/O config */

#define FIX_376_SBA_ROTATE                              /*DLB: Fix for issue 376*/

#define TD5                                             /* Eri: Contribution 17: Extended metadata for 6 DoF rendering in TD renderer */

#define DISABLE_BWD_MCT                                 /* FhG: Disable bandwidth detection for MCT*/



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_enc/bw_detect.c

+2 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ void set_bw_stereo( 


    return;

}



#ifndef DISABLE_BWD_MCT

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

 * set_bw_mct()

 *
@@ -698,3 +698,4 @@ int16_t set_bw_mct( 


    return bw_changed;

}

#endif
 
 No newline at end of file

lib_enc/ivas_mct_core_enc.c

+7 −4
Original line number Diff line number Diff line
@@ -194,7 +194,9 @@ void ivas_mct_core_enc( 
    CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS], /* i/o: CPE encoder structures          */

    const int16_t nChannels,             /* i  : number of channels to be coded  */

    const int32_t ivas_total_brate,      /* i  : IVAS total bitrate              */

#ifndef DISABLE_BWD_MCT

    const int16_t switch_bw, /* i  : flag bandwidth switch occurance */

#endif

    const int16_t lfe_bits, /* i  : bits spent for LFE              */

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

)
@@ -278,12 +280,13 @@ void ivas_mct_core_enc( 
    {

        ch_core = ch * CPE_CHANNELS;



#ifndef DISABLE_BWD_MCT

        if ( switch_bw )

        {

            initMdctStereoEncData( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,

                                   sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );

        }



#endif

        if ( sts[ch_core]->igf )

        {

            /* calculate the igf start band from the igf start line */

lib_enc/ivas_mct_enc.c

+8 −1
Original line number Diff line number Diff line
@@ -109,7 +109,9 @@ ivas_error ivas_mct_enc( 
    CPE_ENC_HANDLE hCPE;

    float mdst_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS][L_FRAME48k];

    float orig_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS][L_FRAME48k];

#ifndef DISABLE_BWD_MCT

    int16_t switch_bw;

#endif

    IVAS_FORMAT ivas_format;

    int16_t max_bwidth;

    int32_t ivas_total_brate;
@@ -160,8 +162,10 @@ ivas_error ivas_mct_enc( 
        }

    }



#ifndef DISABLE_BWD_MCT

    /* set coded audio band-width */

    switch_bw = set_bw_mct( st_ivas->hCPE, st_ivas->nCPE );

#endif



    /* pre-processing */

    for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
@@ -173,7 +177,10 @@ ivas_error ivas_mct_enc( 
    }



    /* joint MCT encoding */

    ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE + hMCT->num_lfe, ivas_total_brate, switch_bw,

    ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE + hMCT->num_lfe, ivas_total_brate,

#ifndef DISABLE_BWD_MCT

                       switch_bw,

#endif

                       ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, st_ivas->hEncoderConfig->sba_order );



    /* Spectrum quantization and coding */