Commit 14b23c31 authored by vaclav's avatar vaclav
Browse files

accept NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING,... 

accept NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING, NONBE_FIX_1376_MDCT_CONCEALMENT, and NONBE_1377_REND_DIRATT_CONF
parent cefea067

apps/renderer.c

+1 −2
Original line number Diff line number Diff line
@@ -1228,9 +1228,8 @@ int main( 
    {

        masaIds[i] = 0u;

    }

#ifdef NONBE_1377_REND_DIRATT_CONF



    IVAS_REND_SetObjectIDs( hIvasRend );

#endif



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

    {

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -175,9 +175,7 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */

#define NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING         /* FhG: Fix assert being hit in JBM code during rate switching */

#define NONBE_FIX_1376_MDCT_CONCEALMENT                 /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */

#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */





/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_ism_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        mvs2s( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

    }



#ifdef NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING

    /* 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 */

    tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
@@ -139,7 +138,6 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        }

    }



#endif

    if ( st_ivas->ism_mode != last_ism_mode )

    {

        /* EFAP handle */
@@ -296,9 +294,6 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
    tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels( st_ivas );

    tc_nchan_allocate_new = tc_nchan_tc_new;

    tc_nchan_full_new = tc_nchan_tc_new;

#ifndef NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING

    tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );

#endif



    if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

    {

lib_dec/ivas_masa_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -1501,7 +1501,7 @@ ivas_error ivas_masa_dec_reconfigure( 
                    tc_nchan_to_allocate = 2 * BINAURAL_CHANNELS;

                }

            }

#ifdef NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING



            if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode == ISM_MASA_MODE_DISC )

            {

                if ( n_samples_granularity > st_ivas->hTcBuffer->n_samples_granularity )
@@ -1519,7 +1519,6 @@ ivas_error ivas_masa_dec_reconfigure( 
                    /* flush already done in IVAS_DEC_ReadFormat() */

                }

            }

#endif

        }

        else if ( st_ivas->nchan_transport == 1 && ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirACRend->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) )

        {

lib_dec/ivas_mct_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -788,7 +788,6 @@ static ivas_error ivas_mc_dec_reconfig( 
        }

    }



#ifdef NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING

    /* JBM: when granularity goes down (e.g. MCT with CREND -> ParamMC with binaural fastconv

           render what still fits in the new granularity */

    tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
@@ -806,7 +805,6 @@ static ivas_error ivas_mc_dec_reconfig( 
        }

    }



#endif

    if ( st_ivas->mc_mode == MC_MODE_MCT )

    {

        st_ivas->nchan_transport = ivas_mc_ls_setup_get_num_channels( ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ) );
@@ -1315,9 +1313,6 @@ static ivas_error ivas_mc_dec_reconfig( 
        tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels( st_ivas );

        tc_nchan_allocate_new = tc_nchan_tc_new;

        tc_nchan_full_new = tc_nchan_tc_new;

#ifndef NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING

        tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );

#endif



        if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {