Commit b4c3b18f authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1715_fix' into 'main' 

Fix for 3GPP issue 1715: Possible typo in array initialization in function...

See merge request !1677
parents 3ea8505d 5132711f

lib_dec/ivas_dirac_dec_fx.c

+21 −21
Original line number Diff line number Diff line
@@ -2217,27 +2217,6 @@ void ivas_dirac_dec_render_sf_fx( 
    move16();

    move16();





    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )

    {

        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )

        {

            set32_fx( Cldfb_RealBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

            set32_fx( Cldfb_ImagBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

        }

    }



#ifndef OPT_BIN_RENDERER_V2

    FOR( i = 0; i < BINAURAL_CHANNELS; i++ )

    {

        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )

        {

            set32_fx( Cldfb_RealBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

            set32_fx( Cldfb_RealBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

        }

    }

#endif /* OPT_BIN_RENDERER_V2 */



    /* local copies of azi, ele, diffuseness */

    Word16 azimuth[CLDFB_NO_CHANNELS_MAX];

    Word16 elevation[CLDFB_NO_CHANNELS_MAX];
@@ -2288,6 +2267,27 @@ void ivas_dirac_dec_render_sf_fx( 
    push_wmops( "ivas_dirac_dec_render" );



    /* Initialize aux buffers */



    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )

    {

        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )

        {

            set32_fx( Cldfb_RealBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

            set32_fx( Cldfb_ImagBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

        }

    }



#ifndef OPT_BIN_RENDERER_V2

    FOR( i = 0; i < BINAURAL_CHANNELS; i++ )

    {

        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )

        {

            set32_fx( Cldfb_RealBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

            set32_fx( Cldfb_ImagBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

        }

    }

#endif /* OPT_BIN_RENDERER_V2 */



    hDirAC = st_ivas->hDirAC;

    hDirACRend = st_ivas->hDirACRend;

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;