Commit ac011375 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

port NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

parent 766fea43

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ 
#define NONBE_FIX_1000_G1_G2_SWB_TBE                    /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -1546,8 +1546,12 @@ 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 )

    {
@@ -1592,10 +1596,17 @@ 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 )

        {