Commit c649e5f2 authored by vaclav's avatar vaclav
Browse files

Merge branch '785-dead-code-in-function-create_mct_enc' into 'main' 

Remove dead code

See merge request !1161
parents aaaa9234 8b31a844

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 


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

/*#define SPLIT_REND_WITH_HEAD_ROT*/                    /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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





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

lib_dec/ivas_binRenderer_internal.c

+4 −0
Original line number Diff line number Diff line
@@ -872,8 +872,12 @@ 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

+6 −0
Original line number Diff line number Diff line
@@ -334,14 +334,18 @@ 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

    {

        assert( !"IVAS format currently not supported for MCT" );

    }

#endif



    cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS;

    if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )
@@ -463,10 +467,12 @@ ivas_error mct_enc_reconfigure( 
                hMCT->nchan_out_woLFE += st_ivas->hEncoderConfig->nchan_ism;

            }

        }

#ifdef DEBUGGING

        else

        {

            assert( !"IVAS format currently not supported for MCT" );

        }

#endif

    }



    cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS;