Commit 68332aa2 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_LARGE_RENDERER_DELAY_COMP

parent d7d01beb

apps/renderer.c

+0 −19
Original line number Diff line number Diff line
@@ -785,9 +785,7 @@ int main( 
    int16_t delayNumSamples = -1;

    int16_t delayNumSamples_orig = 0;

    int16_t zeroPad = 0;

#ifdef FIX_LARGE_RENDERER_DELAY_COMP

    int16_t zeroPadToWrite = 0;

#endif

    int32_t delayTimeScale = 0;

    int16_t i, numChannels;

    ivas_error error = IVAS_ERR_OK;
@@ -1811,11 +1809,7 @@ int main( 
        if ( audioWriter != NULL )

        {

#endif

#ifdef FIX_LARGE_RENDERER_DELAY_COMP

            if ( delayNumSamples * num_out_channels < outBufferSize )

#else

        if ( delayNumSamples < outBufferSize )

#endif

            {

                if ( AudioFileWriter_write( audioWriter, &outInt16Buffer[delayNumSamples * num_out_channels], outBufferSize - ( delayNumSamples * num_out_channels ) ) != IVAS_ERR_OK )

                {
@@ -1826,11 +1820,7 @@ int main( 
            }

            else

            {

#ifdef FIX_LARGE_RENDERER_DELAY_COMP

                delayNumSamples -= (int16_t) ( outBufferSize / num_out_channels );

#else

            delayNumSamples -= (int16_t) outBufferSize;

#endif

            }

#ifdef SPLIT_REND_WITH_HEAD_ROT

        }
@@ -1930,7 +1920,6 @@ int main( 
    if ( audioWriter != NULL )

    {

#endif

#ifdef FIX_LARGE_RENDERER_DELAY_COMP

        for ( zeroPadToWrite = zeroPad; zeroPadToWrite > frameSize_smpls; zeroPadToWrite -= frameSize_smpls )

        {

            memset( outInt16Buffer, 0, outBufferSize * sizeof( int16_t ) );
@@ -1948,14 +1937,6 @@ int main( 
            exit( -1 );

        }

        zeroPadToWrite = 0;

#else

    memset( outInt16Buffer, 0, zeroPad * outBuffer.config.numChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, zeroPad * outBuffer.config.numChannels ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nOutput audio file writer error\n" );

        exit( -1 );

    }

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

    }

#endif

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
#endif





#define FIX_LARGE_RENDERER_DELAY_COMP                   /* Fix renderer delay compensation with delays greater than 1 frame */



#define API_5MS                                         /*FhG, Dlb: add 5ms framing cmd line arg*/

#define FIX_706_REND_COMPLEXITY_LEVELS                  /* VoiceAge: Implement complexity levels to renderer */