Commit 1b256acc authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

parent 23f60a96

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ 
//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS            /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF   */           /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER                  /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO              /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR               /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */

lib_dec/ivas_jbm_dec_fx.c

+0 −18
Original line number Diff line number Diff line
@@ -2594,12 +2594,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
    Word16 n_slots_still_available;

    Word16 n_samples_to_render;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;

#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

    Word32 *p_output_fx[MAX_CICP_CHANNELS + MAX_NUM_OBJECTS];

#else

    Word32 output_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];

    Word32 *p_output_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS];

#endif

    Word16 nchan_in, nchan_out;

    IF( !st_ivas->hDecoderConfig->Opt_tsm )

    {
@@ -2659,17 +2654,10 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        move16();

        move16();



#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

        FOR( ch_idx = 0; ch_idx < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch_idx++ )

        {

            p_output_fx[ch_idx] = st_ivas->p_output_fx[ch_idx];

        }

#else

        FOR( ch_idx = 0; ch_idx < MAX_CICP_CHANNELS; ch_idx++ )

        {

            p_output_fx[ch_idx] = output_fx[ch_idx];

        }

#endif



        test();

        IF( EQ_16( st_ivas->ivas_format, ISM_FORMAT ) )
@@ -2859,15 +2847,9 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
#ifndef DISABLE_LIMITER

            Word16 ch_idx, exp = 11;

            move16();

#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

            FOR( ch_idx = 0; ch_idx < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch_idx++ )

            {

                p_output_fx[ch_idx] = st_ivas->p_output_fx[ch_idx];

#else

            FOR( ch_idx = 0; ch_idx < MAX_CICP_CHANNELS; ch_idx++ )

            {

                p_output_fx[ch_idx] = output_fx[ch_idx];

#endif

            }

            ivas_limiter_dec_fx( st_ivas->hLimiter, p_output_fx, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect, exp );

#endif