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

[fix] MSVC warnings and a compiler error

parent fea97932

lib_rend/ivas_crend.c

+1 −1
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ ivas_error ivas_rend_initCrend( 
    {

        return error;

    }

    hHrtf->max_num_ir = nchan_in;

    hHrtf->max_num_ir = (int16_t) nchan_in;



    if ( hHrtf->max_num_ir <= 0 )

    {

lib_rend/ivas_objectRenderer.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ ivas_error ivas_rend_TDObjRenderFrame( 


    /* Update object position(s) */

    TDREND_Update_object_positions( pTDRend->hBinRendererTd,

                                    num_src,

                                    (int16_t) num_src,

                                    lfe_idx,

                                    ivas_format,

                                    hIsmMetaData,

lib_rend/lib_rend.c

+13 −15
Original line number Diff line number Diff line
@@ -424,8 +424,6 @@ AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig( IVAS_REND_AudioConfig config 
        default:

            return AUDIO_CONFIG_INVALID;

    }



    return AUDIO_CONFIG_INVALID;

}



static ivas_error initLimiter( IVAS_LIMITER_HANDLE *phLimiter, int32_t numChannels, int32_t sampleRate )
@@ -2788,7 +2786,7 @@ static ivas_error rotateFrameMc( 
    /* initialize gains to passthrough */

    for ( ch_in = 0; ch_in < nchan; ch_in++ )

    {

        set_zero( gains[ch_in], nchan );

        set_zero( gains[ch_in], (int16_t) nchan );

        gains[ch_in][ch_in] = 1.f;

    }
@@ -2816,7 +2814,7 @@ static ivas_error rotateFrameMc( 
                          &azimuth,

                          &elevation,

                          Rmat,

                          is_planar_setup );

                          (int16_t) is_planar_setup );



            if ( hEFAPdata != NULL && ( ls_azimuth[ch_in_woLFE] != azimuth || ls_elevation[ch_in_woLFE] != elevation ) )

            {
@@ -2863,7 +2861,7 @@ static ivas_error rotateFrameMc( 
        /* move gains to gains_prev */

        for ( i = 0; i < nchan; i++ )

        {

            mvr2r( gains[i], gains_prev[i], nchan );

            mvr2r( gains[i], gains_prev[i], (int16_t) nchan );

        }

    }
@@ -3083,7 +3081,7 @@ static ivas_error renderIsmToBinauralRoom( 
    /* intermediate rendering to 7_1_4 */

    tmpMcBuffer = ismInput->base.inputBuffer;

    getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp );

    tmpMcBuffer.config.numChannels = tmp;

    tmpMcBuffer.config.numChannels = (int16_t) tmp;

    tmpMcBuffer.data = count_malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) );

    set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels );
@@ -3164,10 +3162,10 @@ static ivas_error renderIsmToSba( 
        return error;

    }



    ivas_dirac_dec_get_response( ismInput->previousPos.azimuth,

                                 ismInput->previousPos.elevation,

    ivas_dirac_dec_get_response( (int16_t) ismInput->previousPos.azimuth,

                                 (int16_t) ismInput->previousPos.elevation,

                                 previousPanGains,

                                 ambiOrderOut );

                                 (int16_t) ambiOrderOut );



    if ( ( ismInput->currentPos.azimuth == ismInput->previousPos.azimuth ) &&

         ( ismInput->currentPos.elevation == ismInput->previousPos.elevation ) )
@@ -3176,10 +3174,10 @@ static ivas_error renderIsmToSba( 
    }

    else

    {

        ivas_dirac_dec_get_response( ismInput->currentPos.azimuth,

                                     ismInput->currentPos.elevation,

        ivas_dirac_dec_get_response( (int16_t) ismInput->currentPos.azimuth,

                                     (int16_t) ismInput->currentPos.elevation,

                                     currentPanGains,

                                     ambiOrderOut );

                                     (int16_t) ambiOrderOut );

    }



    /* Assume num channels in audio buffer to be 1.
@@ -3486,7 +3484,7 @@ static ivas_error renderMcCustomLsToBinauralRoom( 
    /* intermediate conversion to 7_1_4 */

    tmpMcBuffer = mcInput->base.inputBuffer;

    getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp );

    tmpMcBuffer.config.numChannels = tmp;

    tmpMcBuffer.config.numChannels = (int16_t) tmp;

    tmpMcBuffer.data = count_malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) );

    set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels );
@@ -3765,7 +3763,7 @@ static ivas_error renderSbaToBinauralRoom( 
    /* intermediate rendering to 7_1_4 */

    tmpMcBuffer = sbaInput->base.inputBuffer;

    getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp );

    tmpMcBuffer.config.numChannels = tmp;

    tmpMcBuffer.config.numChannels = (int16_t) tmp;

    tmpMcBuffer.data = count_malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) );

    set_zero( tmpMcBuffer.data,

              tmpMcBuffer.config.numChannels * tmpMcBuffer.config.numSamplesPerChannel );
@@ -3941,7 +3939,7 @@ ivas_error IVAS_REND_GetSamples( 
#ifdef DEBUGGING

    hIvasRend->numClipping +=

#endif

        limitRendererOutput( hIvasRend->hLimiter, outAudio.data, outAudio.config.numSamplesPerChannel, LIMITER_THRESHOLD );

        limitRendererOutput( hIvasRend->hLimiter, outAudio.data, outAudio.config.numSamplesPerChannel, IVAS_LIMITER_THRESHOLD );



    return IVAS_ERR_OK;

}