Commit 6fe075c4 authored by sagnowski's avatar sagnowski
Browse files

Fix warnings

parent 8cf2df15

lib_dec/ivas_binRenderer_internal.c

+10 −3
Original line number Diff line number Diff line
@@ -2236,7 +2236,10 @@ void ivas_rend_CldfbMultiBinRendProcess( 
    float Cldfb_Out_Imag[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    const int16_t low_res_pre_rend_rot )

{

    int16_t sf_idx, slot_idx, ch_idx, idx, pose_idx, i, j;

    int16_t slot_idx, ch_idx, idx, pose_idx, i, j;

#ifndef API_5MS

    int16_t sf_idx;

#endif

    float Cldfb_RealBuffer_sfIn[MAX_INPUT_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_sfIn[MAX_INPUT_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG
@@ -2252,7 +2255,7 @@ void ivas_rend_CldfbMultiBinRendProcess( 
    for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )

    {

#endif

        for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ ) /* FhG@Dolby: this looks suspicious */

        for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ ) /* TODO(splitrend): this looks strange */

        {

#ifdef API_5MS

            idx = slot_idx;
@@ -2307,9 +2310,13 @@ void ivas_rend_CldfbMultiBinRendProcess( 


        for ( pose_idx = 0; pose_idx < hCldfbRend->numPoses; pose_idx++ )

        {

            for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ )

            for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ )  /* TODO(splitrend): this looks strange */

            {

#ifdef API_5MS

                idx = slot_idx;

#else

                idx = sf_idx * MAX_PARAM_SPATIAL_SUBFRAMES + slot_idx;

#endif

                for ( ch_idx = 0; ch_idx < BINAURAL_CHANNELS; ch_idx++ )

                {

                    mvr2r( &Cldfb_RealBuffer_Binaural[pose_idx][ch_idx][slot_idx][0], &Cldfb_Out_Real[( pose_idx * BINAURAL_CHANNELS ) + ch_idx][idx][0], hCldfbRend->max_band );

lib_rend/ivas_crend.c

+4 −1
Original line number Diff line number Diff line
@@ -1800,7 +1800,10 @@ ivas_error ivas_rend_crendProcessSplitBin( 
    float *output[],

    const int32_t output_Fs )

{

    int16_t i, j, sf;

    int16_t i, j;

#ifndef API_5MS

    int16_t sf;

#endif

    int16_t pos_idx, output_frame;

    ivas_error error;

    float gain_lfe;

lib_rend/lib_rend.c

+14 −11
Original line number Diff line number Diff line
@@ -5808,8 +5808,10 @@ static ivas_error rotateFrameSba( 
    float tmpRot[2 * HEADROT_ORDER + 1];

    rotation_gains gains;

    ivas_error error;

#ifndef API_5MS

    int16_t idx;

    float val, cf, oneminuscf;

#endif



    push_wmops( "rotateFrameSba" );
@@ -5869,14 +5871,11 @@ static ivas_error rotateFrameSba( 
    for ( i = 0; i < subframe_len; i++ )

#endif

        {

#ifdef API_5MS

            idx = i;

            cf = crossfade[i];

#else

#ifndef API_5MS

        idx = subframe_idx * subframe_len + i;

        cf = headRotData->crossfade[i];

#endif

            oneminuscf = 1 - cf;

#endif

            /*    As the rotation matrix becomes block diagonal in a SH basis, we can*/

            /*      apply each angular-momentum block individually to save complexity. */
@@ -7241,7 +7240,10 @@ static ivas_error renderMcToSplitBinaural( 
    const IVAS_REND_AudioConfig outConfig,

    IVAS_REND_AudioBuffer outAudio )

{

    int16_t i, j, sf, pos_idx;

    int16_t i, j, pos_idx;

#ifndef API_5MS

    int16_t sf;

#endif

    int16_t output_frame;

    ivas_error error;

    const MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData;
@@ -7819,7 +7821,10 @@ static ivas_error renderSbaToMultiBinaural( 
    float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];

    float *p_tmpCrendBuffer[MAX_OUTPUT_CHANNELS];



    int16_t sf, i, j, pos_idx;

#ifndef API_5MS

    int16_t sf;

#endif

    int16_t i, j, pos_idx;

    COMBINED_ORIENTATION_DATA combinedOrientationDataLocal;

    COMBINED_ORIENTATION_HANDLE pCombinedOrientationDataLocal;
@@ -8047,10 +8052,8 @@ static ivas_error renderSbaToBinaural( 


#ifdef API_5MS

        /* fix compiling only, ToDo ext renderer needs to adapted to 5ms */

        if ( ( *hCombinedOrientationData )->enableCombinedOrientation != 0 )

        {

            combinedOrientationEnabled = 1;

        }

        hCombinedOrientationData = sbaInput->base.ctx.pCombinedOrientationData;

        combinedOrientationEnabled = ( *hCombinedOrientationData )->enableCombinedOrientation;

#else

        hCombinedOrientationData = sbaInput->base.ctx.pCombinedOrientationData;

        combinedOrientationEnabled = 0;