Commit 3f957104 authored by vaclav's avatar vaclav
Browse files

accept BE switches

parent 255e5a38

apps/renderer.c

+0 −8
Original line number Diff line number Diff line
@@ -1229,15 +1229,11 @@ int main( 
        masaIds[i] = 0u;

    }



#ifdef FIX_1377_HANDLE_ERROR_CODE

    if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_REND_SetObjectIDs: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }

#else

    IVAS_REND_SetObjectIDs( hIvasRend );

#endif



    for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )

    {
@@ -2611,14 +2607,10 @@ static CmdlnArgs defaultArgs( 
    args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;

    args.outConfig.outSetupCustom.num_spk = 0;

    args.outConfig.outSetupCustom.num_lfe = 0;

#ifdef FIX_HRTF_LEFTOVERS

    for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )

    {

        args.inConfig.ambisonicsBuses[i].audioConfig = IVAS_AUDIO_CONFIG_INVALID;

    }

#else

    args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;

#endif



    for ( i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )

    {

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -229,9 +229,7 @@ typedef enum 
/* format signaling in SID frames */

#define SID_FORMAT_NBITS                        3                           /* Bit 0 | Bit 1 | Bit 2 */

                                                                            /*-------|-------|------ */

#ifdef FIX_1384_MSAN_ivas_spar_dec_open

#define SID_FORMAT_NONE                         (-0x1)                      /*    n/a|    n/a|    n/a*/

#endif

#define SID_DFT_STEREO                          0x0                         /*      0|      0|     0 */

#define SID_MDCT_STEREO                         0x1                         /*      1|      0|     0 */

#define SID_ISM                                 0x2                         /*      0|      1|     0 */

lib_com/options.h

+0 −8
Original line number Diff line number Diff line
@@ -164,14 +164,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_1119_SPLIT_RENDERING_VOIP                   /* FhG: Add split rendering support to decoder in VoIP mode */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

#define FIX_HRTF_LEFTOVERS                              /* VA: HRTF updates - bring float main in line with BASOP main */

#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */

#define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */

#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

#define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */

#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */

#define FIX_1387_INIT_PRM_SQQ                           /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */





/* #################### End BE switches ################################## */

lib_dec/igf_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -1573,6 +1573,7 @@ void IGFDecRestoreTCX10SubFrameData( 
    return;

}





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

 * init_igf_dec()

 *
@@ -1592,9 +1593,7 @@ void init_igf_dec( 
    hIGFDec->flag_sparse = &hIGFDec->flag_sparseBuf[0];

    hIGFDec->infoTCXNoise = &hIGFDec->infoTCXNoiseBuf[0];

    hIGFDec->virtualSpec = &hIGFDec->virtualSpecBuf[0];

#ifdef FIX_1385_INIT_IGF_STOP_FREQ

    hIGFDec->infoIGFStopFreq = 0;

#endif



    return;

}

lib_dec/ivas_init_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1154,9 +1154,7 @@ ivas_error ivas_init_decoder_front( 
    st_ivas->ism_mode = ISM_MODE_NONE;

    st_ivas->mc_mode = MC_MODE_NONE;



#ifdef FIX_1384_MSAN_ivas_spar_dec_open

    st_ivas->sid_format = SID_FORMAT_NONE;

#endif

    st_ivas->sba_dirac_stereo_flag = 0;



    /* HRTF binauralization latency in ns */