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

[cleanup] accept NONBE_1324_TC_BUFFER_MEMOERY_KEEP

parent 8ccb2578

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ 
#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */

#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

#define FIX_1288_SPLIT_REND_XSAN                        /* Dlb: Fix asan, msan and usan issues in split rendering mode*/

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */

#define CODE_IMPROVEMENTS

lib_dec/ivas_jbm_dec_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -804,10 +804,8 @@ ivas_error ivas_jbm_dec_tc_fx( 
            {

                Scale_sig32( p_output_fx[n], output_frame, sub( Q11, output_q ) ); // Q11

            }

#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

            st_ivas->hCPE[0]->q_output_mem_fx[0] = output_q;

            st_ivas->hCPE[0]->q_output_mem_fx[1] = output_q;

#endif

        }

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
@@ -3624,17 +3622,14 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx( 
    const Word16 n_samples_granularity     /* i  : new granularity of the renderer/buffer  */

)

{

#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

    Word16 ch_idx, num_tc_buffer_mem, n_samples_still_available;

    Word32 tc_buffer_mem[MAX_INTERN_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES - 1];

#endif

    ivas_error error;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;



    hTcBuffer = st_ivas->hTcBuffer;

    move16();



#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

    num_tc_buffer_mem = 0;

    move16();

    n_samples_still_available = 0;
@@ -3655,7 +3650,6 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx( 
        }

    }



#endif

    /* if granularity changes, adapt subframe_nb_slots */

    IF( NE_16( n_samples_granularity, hTcBuffer->n_samples_granularity ) )

    {
@@ -3698,14 +3692,12 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx( 
        return error;

    }



#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

    /* propagate samples of the TC buffer from the previous frame */

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

    {

        Copy32( tc_buffer_mem[ch_idx], hTcBuffer->tc_buffer_old_fx[ch_idx], n_samples_still_available );

    }



#endif

    return IVAS_ERR_OK;

}

lib_dec/ivas_omasa_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ ivas_error ivas_omasa_dec_config_fx( 
                /* ISM renderer handle + ISM data handle */

                ivas_omasa_separate_object_renderer_close( st_ivas );

            }

#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP



            IF( EQ_32( old_renderer_type, RENDERER_MONO_DOWNMIX ) )

            {
@@ -769,7 +768,6 @@ ivas_error ivas_omasa_dec_config_fx( 
                    Scale_sig32( hTcBuffer->tc_buffer_old_fx[k], n_samples_still_available, st_ivas->hCPE[0]->q_output_mem_fx[0] - Q11 );

                }

            }

#endif

        }



        IF( EQ_32( st_ivas->renderer_type, RENDERER_OMASA_MIX_EXT ) )