Commit 15e9dbdf authored by vaclav's avatar vaclav
Browse files

address review comments

parent f6c55524

lib_com/ivas_prot.h

+2 −2
Original line number Diff line number Diff line
@@ -3707,8 +3707,8 @@ void ivas_dirac_dec_render_sf( 
    float *output_f[],                                          /* i/o: synthesized core-coder transport channels/DirAC output  */

    const int16_t nchan_transport,                              /* i  : number of transport channels            */

#ifdef FIX_1319_STACK_SBA_DECODER

    float *pppQMfFrame_ts_re[HOA3_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX],

    float *pppQMfFrame_ts_im[HOA3_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX]

    float *pppQMfFrame_ts_re[HOA3_CHANNELS][CLDFB_NO_COL_MAX],

    float *pppQMfFrame_ts_im[HOA3_CHANNELS][CLDFB_NO_COL_MAX]

#else

    float *pppQMfFrame_ts_re[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX],

    float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX]

lib_dec/ivas_dirac_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1730,8 +1730,8 @@ void ivas_dirac_dec_render_sf( 
    float *output_f[],             /* i/o: synthesized core-coder transport channels/DirAC output  */

    const int16_t nchan_transport, /* i  : number of transport channels                            */

#ifdef FIX_1319_STACK_SBA_DECODER

    float *pppQMfFrame_ts_re[HOA3_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX],

    float *pppQMfFrame_ts_im[HOA3_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX]

    float *pppQMfFrame_ts_re[HOA3_CHANNELS][CLDFB_NO_COL_MAX],

    float *pppQMfFrame_ts_im[HOA3_CHANNELS][CLDFB_NO_COL_MAX]

#else

    float *pppQMfFrame_ts_re[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX],

    float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX]

lib_dec/ivas_spar_decoder.c

+5 −5
Original line number Diff line number Diff line
@@ -1368,8 +1368,8 @@ void ivas_spar_dec_upmixer_sf( 
{

    int16_t cldfb_band, num_cldfb_bands, numch_in, numch_out;

#ifdef FIX_1319_STACK_SBA_DECODER

    float *cldfb_in_ts_re[HOA3_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX];

    float *cldfb_in_ts_im[HOA3_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX];

    float *cldfb_in_ts_re[HOA3_CHANNELS][CLDFB_NO_COL_MAX];

    float *cldfb_in_ts_im[HOA3_CHANNELS][CLDFB_NO_COL_MAX];

#else

    float *cldfb_in_ts_re[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX];

    float *cldfb_in_ts_im[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_COL_MAX];
@@ -1379,13 +1379,13 @@ void ivas_spar_dec_upmixer_sf( 
    int16_t num_in_ingest, split_band;

    int16_t slot_size, slot_idx_start;

#ifdef FIX_1319_STACK_SBA_DECODER

    float *p_tc[MAX_INTERN_CHANNELS];

    float *p_tc[HOA3_CHANNELS];

#else

    float *p_tc[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS];

#endif

    int16_t md_idx;

#ifdef FIX_1319_STACK_SBA_DECODER

    float Pcm_tmp[MAX_INTERN_CHANNELS][2 /* Re, Im*/ * L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];

    float Pcm_tmp[HOA3_CHANNELS][2 /* Re, Im*/ * L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];

#else

    float Pcm_tmp[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k];

#endif
@@ -1504,7 +1504,7 @@ void ivas_spar_dec_upmixer_sf( 
    {

        /* at this point, output channels are used as intermediate procesing buffers */

#ifdef FIX_1319_STACK_SBA_DECODER

        for ( in_ch = 0; in_ch < MAX_INTERN_CHANNELS; in_ch++ )

        for ( in_ch = 0; in_ch < HOA3_CHANNELS; in_ch++ )

#else

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

#endif

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -4802,7 +4802,7 @@ static void ivas_destroy_handle_isar( 
        }

#ifdef FIX_1319_STACK_SBA_DECODER



        free_( ( *hSplitBinRend ) );

        free( ( *hSplitBinRend ) );

        ( *hSplitBinRend ) = NULL;

#endif

    }