Commit 3866cdda authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

parent b43426f8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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

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

lib_dec/ivas_jbm_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -1561,12 +1561,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
    int16_t n_slots_still_available;

    int16_t n_samples_to_render;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;

#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

    float *p_output[MAX_CICP_CHANNELS + MAX_NUM_OBJECTS];

#else

    float output[MAX_CICP_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];

    float *p_output[MAX_CICP_CHANNELS];

#endif



    if ( !st_ivas->hDecoderConfig->Opt_tsm )

    {
@@ -1611,17 +1606,10 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        hTcBuffer->n_samples_flushed = n_samples_to_render;

        hTcBuffer->n_samples_rendered = 0;



#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

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

        {

            p_output[ch_idx] = st_ivas->p_output_f[ch_idx];

        }

#else

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

        {

            p_output[ch_idx] = output[ch_idx];

        }

#endif



        if ( st_ivas->ivas_format == ISM_FORMAT )

        {