Commit 17ab7e28 authored by vaclav's avatar vaclav
Browse files

accept FIX_785_REMOVE_DEAD_CODE

parent 2ba8826f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_820_DOUBLE_PREC_MACROS                      /* VA: issue 820: Double precision arithmetic in IVAS_CALCULATE_ABS() */

#define FIX_785_REMOVE_DEAD_CODE                        /* VA: issue 785: remove dead code */

#define FIX_852_FIX_HANDLE_DEREF                        /* VA: issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close() */

#define FIX_520_REMOVE_MEMMOVE_JBM                      /* VA: issue 520: Remove memmove() from JBM code */

#define FIX_853_ARRAY_SIZE_MISMATCH                     /* Nokia: Issue #853: Mismatch of declaration and definition of computeIntensityVector_ana and computeReferencePower_ana */

lib_dec/ivas_binRenderer_internal.c

+0 −5
Original line number Diff line number Diff line
@@ -891,12 +891,7 @@ static void ivas_binaural_obtain_DMX( 
{

    int16_t chIdx, bandIdx, k;



#ifdef FIX_785_REMOVE_DEAD_CODE

    if ( hBinRenderer->ivas_format == MC_FORMAT )

#else

    // ToDo: hBinRenderer->ivas_format is never set to ISM_FORMAT

    if ( hBinRenderer->ivas_format == MC_FORMAT || hBinRenderer->ivas_format == ISM_FORMAT )

#endif

    {

        /* Obtain the downmix */

        float P_in[CLDFB_NO_CHANNELS_MAX];

lib_enc/ivas_mct_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -334,12 +334,6 @@ ivas_error create_mct_enc( 
    {

        hMCT->nchan_out_woLFE = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS - 1;

    }

#ifndef FIX_785_REMOVE_DEAD_CODE

    else if ( ivas_format == SBA_FORMAT )

    {

        hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar );

    }

#endif

#ifdef DEBUGGING

    else

    {