Commit 5366f51e authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

parent f261f2fd

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 


#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

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

#define NONBE_1118_EVS_LR_HQ_BITERROR                   /* VA: issue 1118: fix EVS decoder crash in LR-HQ in case of bit errors */

#define FIX_1139_REV_COLORATION_SHORT_T60               /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */

lib_dec/ivas_jbm_dec_fx.c

+0 −25
Original line number Diff line number Diff line
@@ -2828,11 +2828,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        {

            IF( EQ_16( ism_mode_old, ISM_MASA_MODE_DISC ) )

            {

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

                Word32 *tc_local_fx[MAX_NUM_OBJECTS];

#else

                Word32 *tc_local_fx[MAX_TRANSPORT_CHANNELS];

#endif



                move16();

                FOR( ch_idx = 0; ch_idx < st_ivas->nchan_ism; ch_idx++ )
@@ -2841,32 +2837,11 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
                    Copy32( st_ivas->hMasaIsmData->delayBuffer_fx[ch_idx], tc_local_fx[ch_idx], st_ivas->hMasaIsmData->delayBuffer_size ); /*Q11*/

                }



#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

                IF( NE_32( ( error = ivas_td_binaural_renderer_sf_fx( st_ivas, p_output_fx, hTcBuffer->n_samples_granularity ) ), IVAS_ERR_OK ) )

                {

                    return error;

                }

#else

                IF( st_ivas->nchan_ism > 0 )

                {

                IF( NE_32( ( error = ivas_td_binaural_renderer_sf_fx( st_ivas, p_output_fx, 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_fx( p_output_fx[ch_idx], (Word16) ( *nSamplesRendered ) );

                    }

                    st_ivas->hTcBuffer->slots_rendered = add( st_ivas->hTcBuffer->slots_rendered, 1 );

                    st_ivas->hTcBuffer->subframes_rendered = add( st_ivas->hTcBuffer->subframes_rendered, 1 );

                    move16();

                    move16();

                }

#endif

            }

        }

        ELSE IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

        {

lib_dec/ivas_objectRenderer_internal_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -96,13 +96,9 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
    Word16 enableCombinedOrientation;



    /* Set the number of ISMs */

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

    test();

    test();

    IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) || ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && GT_16( st_ivas->nchan_ism, 0 ) ) )

#else

    IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )

#endif

    {

        nchan_ism_internal = st_ivas->nchan_ism;

        move16();

lib_dec/ivas_omasa_dec_fx.c

+0 −9
Original line number Diff line number Diff line
@@ -1166,23 +1166,14 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm_fx( 
{

    Word16 n;

    ivas_error error;

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

    Word32 *p_sepobj_fx[BINAURAL_CHANNELS]; // Q11

    Word32 data_separated_objects_fx[BINAURAL_CHANNELS][L_FRAME48k];

#else

    Word32 *p_sepobj_fx[MAX_NUM_OBJECTS]; // Q11

    Word32 data_separated_objects_fx[MAX_NUM_OBJECTS][L_FRAME48k];

#endif

    Word16 slot_idx_start;



    slot_idx_start = st_ivas->hSpatParamRendCom->slots_rendered;

    move16();



#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_fx[n] = &data_separated_objects_fx[n][0];

    }