Commit 3cb937f0 authored by bayers's avatar bayers
Browse files

address comments: fix compiler warnings with split rendering enabled, fix... 

address comments: fix compiler warnings with split rendering enabled, fix missing update of head rotation indices in the split rendering crend subframe function, remove an unnecessary call to the limiter.
parent ff70a9a8

apps/decoder.c

+5 −5
Original line number Diff line number Diff line
@@ -1746,7 +1746,11 @@ static ivas_error initOnFirstGoodFrame( 
    const DecArguments arg,            /* i  : */

    const int16_t numInitialBadFrames, /* i  : */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef NONBE_UNIFIED_DECODING_PATHS

    int16_t *numOutSamples, /* i/o: */

#else

    uint16_t *numOutSamples, /* i/o: */

#endif

    int16_t *vec_pos_len,    /* i/o: */

#else

    const uint16_t numOutSamples, /* i  : */
@@ -2067,7 +2071,7 @@ static ivas_error decodeG192( 
    int16_t nOutChannels = 0;

    int16_t delayNumSamples = -1;

    int16_t delayNumSamples_orig[3];

#ifdef SPLIT_REND_WITH_HEAD_ROT

#if defined(SPLIT_REND_WITH_HEAD_ROT) && !defined(NONBE_UNIFIED_DECODING_PATHS)

    uint16_t nOutSamples = 0;

#else

    int16_t nOutSamples = 0;
@@ -2936,12 +2940,8 @@ static ivas_error decodeVoIP( 
#ifdef NONBE_UNIFIED_DECODING_PATHS

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } };

    int16_t vec_pos_update, vec_pos_len;

#if defined( SPLIT_REND_WITH_HEAD_ROT )

    uint16_t nOutSamples = 0;

#else

    int16_t nOutSamples = 0;

#endif

#endif



#ifdef NONBE_UNIFIED_DECODING_PATHS

    vec_pos_update = 0;

lib_dec/ivas_jbm_dec.c

+1 −5
Original line number Diff line number Diff line
@@ -1642,11 +1642,7 @@ ivas_error ivas_jbm_dec_render( 
        if ( st_ivas->ivas_format != MONO_FORMAT )

        {

#ifndef DISABLE_LIMITER

#ifdef SPLIT_REND_WITH_HEAD_ROT

            ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out_syn_output, *nSamplesRendered, st_ivas->BER_detect );

#else

            ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out, *nSamplesRendered, st_ivas->BER_detect );

#endif

#endif

        }

    }
@@ -1660,7 +1656,7 @@ ivas_error ivas_jbm_dec_render( 
            st_ivas->noClipping +=

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

                ivas_syn_output( p_output, *nSamplesRendered, nchan_out, (int16_t *) data );

                ivas_syn_output( p_output, *nSamplesRendered, nchan_out_syn_output, (int16_t *) data );

#else

    ivas_syn_output( p_output, *nSamplesRendered, nchan_out, data );

#endif

lib_dec/lib_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -3782,7 +3782,6 @@ ivas_error IVAS_DEC_GetCldfbSamples( 
)

{

    Decoder_Struct *st_ivas;

    ivas_error error;

    int16_t ch, b, slot_idx, num_chs, maxBand, num_samples;



    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

lib_rend/ivas_crend.c

+3 −0
Original line number Diff line number Diff line
@@ -2398,6 +2398,9 @@ ivas_error ivas_rend_crendProcessSubframesSplitBin( 
        mvr2r( tmpSplitBinBuffer[i], output[i], n_samples_to_render );

    }



    /* update main combined orientation access index */

    ivas_combined_orientation_update_index( hCombinedOrientationData, n_samples_to_render );



    return IVAS_ERR_OK;

}

#endif