Commit 31babc7e authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

cleanup and change variable types to fix MSVC warnings

parent c1c91f5f
Loading
Loading
Loading
Loading
Loading
+3 −9
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ typedef struct
typedef struct
{
    const int32_t *pOutSampleRate;
    const float *pMaxGlobalDelayNs;
    const int32_t *pMaxGlobalDelayNs;
    const AUDIO_CONFIG *pOutConfig;
    const LSSETUP_CUSTOM_STRUCT *pCustomLsOut;
    const EFAP_WRAPPER *pEfapOutWrapper;
@@ -104,7 +104,6 @@ typedef struct
    rendering_context ctx;
    int32_t numNewSamplesPerChannel; /* Used to keep track how much new audio was fed before rendering current frame */
    int32_t delayNumSamples;
    float delay_ns; // TODO is this needed?
} input_base;

typedef struct
@@ -194,7 +193,7 @@ typedef struct hrtf_handles
struct IVAS_REND
{
    int32_t sampleRateOut; // TODO rename to sampleRate?
    float maxGlobalDelayNs;
    int32_t maxGlobalDelayNs;

    IVAS_LIMITER_HANDLE hLimiter;
#ifdef DEBUGGING
@@ -1176,7 +1175,6 @@ static void initRendInputBase(
    inputBase->ctx = rendCtx;
    inputBase->numNewSamplesPerChannel = 0;
    inputBase->delayNumSamples = 0;
    inputBase->delay_ns = 0;
    inputBase->delayBuffer = NULL;

    inputBase->inputBuffer.config.numSamplesPerChannel = 0;
@@ -1348,7 +1346,7 @@ static void updateMaxGlobalDelayNs( IVAS_REND_HANDLE hIvasRend )
static ivas_error alignInputDelay(
    input_base *inputBase,
    const IVAS_REND_ReadOnlyAudioBuffer inputAudio,
    const float maxGlobalDelayNs,
    const int32_t maxGlobalDelayNs,
    const int32_t sampleRateOut,
    const int16_t cldfb2tdSampleFact )
{
@@ -1444,7 +1442,6 @@ static void setRendInputDelayIsm( void *input )
                          (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ) );
    }

    inputIsm->base.delay_ns = latency_ns;
    inputIsm->base.delayNumSamples = latencyNsToSamples( *inputIsm->base.ctx.pOutSampleRate, latency_ns );
}

@@ -2454,7 +2451,6 @@ static void setRendInputDelayMc( void *input )
                          (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ) );
    }

    inputMc->base.delay_ns = latency_ns;
    inputMc->base.delayNumSamples = latencyNsToSamples( *inputMc->base.ctx.pOutSampleRate, latency_ns );
}

@@ -2821,7 +2817,6 @@ static void setRendInputDelaySba( void *input )
                          (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ) );
    }

    inputSba->base.delay_ns = latency_ns;
    inputSba->base.delayNumSamples = latencyNsToSamples( *inputSba->base.ctx.pOutSampleRate, latency_ns );
}

@@ -2920,7 +2915,6 @@ static void setRendInputDelayMasa( void *input )
                          (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ) );
    }

    inputMasa->base.delay_ns = latency_ns;
    inputMasa->base.delayNumSamples = latencyNsToSamples( *inputMasa->base.ctx.pOutSampleRate, latency_ns );
}