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

port NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

parent 26e87d1f

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ 
#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif

#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_fx.c

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

    {
@@ -2729,10 +2733,17 @@ 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 ) )