Commit 1226b82b authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Revert "replace latencyNsToSamples with NS2SA" 

This reverts commit f4215bf1.
parent cfa8c6f8

lib_rend/lib_rend.c

+12 −5
Original line number Diff line number Diff line
@@ -267,6 +267,13 @@ static void freeInputBaseBufferData( 
    return;

}



static int16_t latencyNsToSamples(

    int32_t sampleRate,

    int32_t latency_ns )

{

    return (int16_t) roundf( (float) ( latency_ns ) * ( sampleRate / 1000000000.f ) );

}



static ivas_error allocateMcLfeDelayBuffer(

    float **lfeDelayBuffer,

    const int16_t data_size )
@@ -1340,7 +1347,7 @@ static ivas_error alignInputDelay( 
    int32_t numSamplesToPush, numSamplesToPop;

    uint32_t tmpSize;



    maxGlobalDelaySamples = NS2SA( sampleRateOut, maxGlobalDelayNs );

    maxGlobalDelaySamples = latencyNsToSamples( sampleRateOut, maxGlobalDelayNs );

    maxGlobalDelaySamples *= cldfb2tdSampleFact;



    /* open the delay buffer if it isn't already */
@@ -1421,7 +1428,7 @@ static void setRendInputDelayIsm( 
                          inputIsm->crendWrapper->binaural_latency_ns );

    }



    inputIsm->base.delayNumSamples = NS2SA( *inputIsm->base.ctx.pOutSampleRate, latency_ns );

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

}
@@ -2427,7 +2434,7 @@ static void setRendInputDelayMc( 
                          inputMc->crendWrapper->binaural_latency_ns );

    }



    inputMc->base.delayNumSamples = NS2SA( *inputMc->base.ctx.pOutSampleRate, latency_ns );

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

}



static ivas_error setRendInputActiveMc(
@@ -2790,7 +2797,7 @@ static void setRendInputDelaySba( 
                          inputSba->crendWrapper->binaural_latency_ns );

    }



    inputSba->base.delayNumSamples = NS2SA( *inputSba->base.ctx.pOutSampleRate, latency_ns );

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

}



static ivas_error setRendInputActiveSba(
@@ -2896,7 +2903,7 @@ static void setRendInputDelayMasa( 
                          (int32_t) ( ( splitPreRendCldfb ? 0 : (float) IVAS_FB_DEC_DELAY_NS + 0.5f ) ) );

    }



    inputMasa->base.delayNumSamples = NS2SA( *inputMasa->base.ctx.pOutSampleRate, latency_ns );

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

}



static ivas_error setRendInputActiveMasa(