Commit c20e4f8e authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

parent acc32b4a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO            /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */

lib_dec/ivas_jbm_dec.c

+0 −23
Original line number Diff line number Diff line
@@ -1517,11 +1517,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        {

            if ( ism_mode_old == ISM_MASA_MODE_DISC )

            {

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

                float *tc_local[MAX_NUM_OBJECTS];

#else

                float *tc_local[MAX_TRANSPORT_CHANNELS];

#endif



                for ( ch_idx = 0; ch_idx < st_ivas->nchan_ism; ch_idx++ )

                {
@@ -1529,30 +1525,11 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                    mvr2r( st_ivas->hMasaIsmData->delayBuffer[ch_idx], tc_local[ch_idx], st_ivas->hMasaIsmData->delayBuffer_size );

                }



#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

                if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_output, hTcBuffer->n_samples_granularity ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

#else

                if ( st_ivas->nchan_ism > 0 )

                {

                if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_output, hTcBuffer->n_samples_granularity ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

            }

                else

                {

                    for ( ch_idx = 0; ch_idx < st_ivas->hDecoderConfig->nchan_out; ch_idx++ )

                    {

                        set_zero( p_output[ch_idx], (int16_t) ( *nSamplesRendered ) );

                    }

                    st_ivas->hTcBuffer->slots_rendered += 1;

                    st_ivas->hTcBuffer->subframes_rendered += 1;

                }

#endif

            }

        }

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

        {

lib_dec/ivas_objectRenderer_internal.c

+0 −4
Original line number Diff line number Diff line
@@ -99,11 +99,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
    int16_t nchan_ism_internal, nchan_ism, ch_offset;



    /* Set the number of ISMs */

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT || ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_ism > 0 ) )

#else

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

#endif

    {

        nchan_ism_internal = st_ivas->nchan_ism;

        nchan_ism = st_ivas->nchan_ism;

lib_dec/ivas_omasa_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -748,26 +748,14 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm( 
)

{

    int16_t n;

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

    float data_separated_objects[BINAURAL_CHANNELS][L_FRAME48k];

#else

    float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];

#endif

    ivas_error error;

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

    float *p_sepobj[BINAURAL_CHANNELS];

#else

    float *p_sepobj[MAX_NUM_OBJECTS];

#endif

    int16_t slot_idx_start;



    slot_idx_start = st_ivas->hSpatParamRendCom->slots_rendered;



#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

    for ( n = 0; n < BINAURAL_CHANNELS; n++ )

#else

    for ( n = 0; n < MAX_NUM_OBJECTS; n++ )

#endif

    {

        p_sepobj[n] = &data_separated_objects[n][0];

    }