Commit fba39432 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/ivas-float-update' into... 

Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 2051-ref-PortMr2059-from-float-renderer-granularity-revision
parents cc452afd 7941257d

lib_com/ivas_cnst.h

+0 −8
Original line number Diff line number Diff line
@@ -1292,16 +1292,8 @@ typedef enum 
#define LFE_CHANNEL                             3



#define MIN_LFE_NRG                             0.5f

#ifdef ADJUST_MCT_CHANNELS_MAX   

#define MCT_MAX_CHANNELS                        11                          /* == 7.1.4 LS channels without the LFE channel */

#define MCT_MAX_BLOCKS                          ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

#else

#define MCT_MAX_CHANNELS                        MAX_TRANSPORT_CHANNELS

#define MCT_MAX_BLOCKS                          ( MCT_MAX_CHANNELS / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/



#define MAX_NUM_DATA                            max( MCT_MAX_CHANNELS, 4 )

#endif



#define NBBITS_MCT_RATIO                        4

#define BITRATE_MCT_RATIO_RANGE                 ( 1 << NBBITS_MCT_RATIO )   /* Range of the coded bitrate distribution ratio */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ 
#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */

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

#define FIX_ISSUE_2008_MISSING_CODE_FROM_PORTING        /* FhG: Issue 2008: Code deleted while porting float-main MR !1504 (BASOP issue 1565)*/

#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/

#define FIX_1053_REVERB_RECONFIGURATION

#define FIX_1179_USAN_PHASEECU                          /* Eri: issue 1179:  better handling of 16 bit wrap around for very long(>200ms) FER-bursts   */

#define NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX      /* Ericsson: Issue 1246: High level input which triggers DTX can lead to numerical overflow in coherence calculation */

lib_dec/ivas_mct_core_dec.c

+0 −19
Original line number Diff line number Diff line
@@ -77,15 +77,11 @@ void ivas_mct_side_bits( 
    {

        for ( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

#ifdef ADJUST_MCT_CHANNELS_MAX

            if ( i < MCT_MAX_CHANNELS )

            {

#endif

                sts[i] = hCPE[cpe_id]->hCoreCoder[ch];

                i++;

#ifdef ADJUST_MCT_CHANNELS_MAX

            }

#endif

        }

    }
@@ -201,29 +197,14 @@ void ivas_mct_core_dec( 
    {

        for ( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

#ifdef ADJUST_MCT_CHANNELS_MAX

            if ( i < MCT_MAX_CHANNELS )

            {

#endif

                sts[i] = hCPE[cpe_id]->hCoreCoder[ch];

                i++;

#ifdef ADJUST_MCT_CHANNELS_MAX

            }

#endif

        }

    }



#ifndef ADJUST_MCT_CHANNELS_MAX

    /*seems like obsolete code*/

    for ( ch = 0, i = 0; ch < nChannels; ch++ )

    {

        if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

        {

            continue;

        }

        i++;

    }

#endif

    bfi = sts[0]->bfi;



    for ( ch = 0; ch < nChannels; ch++ )

lib_dec/lib_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -1256,8 +1256,15 @@ ivas_error IVAS_DEC_ReadFormat( 
        }

#else

#ifdef FIX_HRTF_LOAD

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

        if ( ( renderer_type_old != st_ivas->renderer_type && renderer_type_old != RENDERER_DISABLE ) ||

             ( st_ivas->ini_active_frame > 0 &&

               ( ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode != ISM_MASA_MODE_DISC ) ||

                 ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->ism_mode != ISM_SBA_MODE_DISC ) ) ) )

#else

        if ( ( renderer_type_old != st_ivas->renderer_type && renderer_type_old != RENDERER_DISABLE ) ||

             ( st_ivas->ini_active_frame > 0 && ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode != ISM_MASA_MODE_DISC ) )

#endif

        {

            /* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv

            render what still fits in the new granularity */

lib_enc/ivas_mct_core_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -265,14 +265,10 @@ void ivas_mct_core_enc( 
    {

        for ( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

#ifdef ADJUST_MCT_CHANNELS_MAX

            if ( cpe_id * CPE_CHANNELS + ch < nChannels )

            {

#endif

                sts[i] = hCPE[cpe_id]->hCoreCoder[ch];

#ifdef ADJUST_MCT_CHANNELS_MAX

            }

#endif



            if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

            {