Commit 98baa369 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch... 

Merge branch '371-division-by-zero-in-decoder-delay-reports-when-delay-compensation-is-off' into 'main'

Resolve "Division by zero in decoder delay reports when delay compensation is off"

See merge request !495
parents 589bd13c d24151b5

apps/decoder.c

+25 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,22 @@ static ivas_error initOnFirstGoodFrame( 
    ivas_error error = IVAS_ERR_UNKNOWN;



    /* Now delay, number of output channels and frame size are known */

#ifdef FIX_371_DELAY_REPORT

    if ( ( error = IVAS_DEC_GetDelay( hIvasDec, pFullDelayNumSamples, delayTimeScale ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );

        return error;

    }



    if ( !arg.delayCompensationEnabled )

    {

#ifdef BINAURALIZATION_DELAY_REPORT

        pFullDelayNumSamples[0] = 0;

#else

        *pFullDelayNumSamples = 0;

#endif

    }

#else

    if ( arg.delayCompensationEnabled )

    {

        if ( ( error = IVAS_DEC_GetDelay( hIvasDec, pFullDelayNumSamples, delayTimeScale ) ) != IVAS_ERR_OK )
@@ -1311,6 +1327,7 @@ static ivas_error initOnFirstGoodFrame( 
        *pFullDelayNumSamples = 0;

#endif

    }

#endif

#ifdef BINAURALIZATION_DELAY_REPORT

    *pRemainingDelayNumSamples = pFullDelayNumSamples[0];

#else
@@ -1813,7 +1830,11 @@ static ivas_error decodeG192( 
        if ( delayNumSamples_orig[2] > 0 )

        {

            printf( "HRIR/BRIR delay:        %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale );

#ifdef FIX_371_DELAY_REPORT

            printf( "Total delay:            %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * ( delayNumSamples_orig[1] + delayNumSamples_orig[2] ) / (float) delayTimeScale, delayNumSamples_orig[1] + delayNumSamples_orig[2], delayTimeScale );

#else

            printf( "Total delay:            %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[0] / (float) delayTimeScale, delayNumSamples_orig[0], delayTimeScale );

#endif

        }

#else

        fprintf( stdout, "\nDecoder delay:          %-5u [samples]  - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );
@@ -2314,7 +2335,11 @@ static ivas_error decodeVoIP( 
        if ( delayNumSamples_orig[2] > 0 )

        {

            printf( "HRIR/BRIR delay:        %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale );

#ifdef FIX_371_DELAY_REPORT

            printf( "Total delay:            %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * ( delayNumSamples_orig[1] + delayNumSamples_orig[2] ) / (float) delayTimeScale, delayNumSamples_orig[1] + delayNumSamples_orig[2], delayTimeScale );

#else

            printf( "Total delay:            %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[0] / (float) delayTimeScale, delayNumSamples_orig[0], delayTimeScale );

#endif

        }

#else

        printf( "\nDecoder delay:       %5u [samples]  - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
#define FIX_376_SBA_ROTATE                              /*DLB: Fix for issue 376*/

#define TD5                                             /* Eri: Contribution 17: Extended metadata for 6 DoF rendering in TD renderer */

#define TD5_FIX_INVALID_MEMORY_ACCESS                   /* FhG: Resolves segfault in case IVAS_REND_InitConfig gets initialized with rendererConfigEnabled:=false && ISM are being rendered */

#define FIX_371_DELAY_REPORT                            /* Issue 371: div. by zero with -no_delay_cmp */



#ifdef FIX_I109_ORIENTATION_TRACKING

#define OTR_REFERENCE_VECTOR_TRACKING                 /* FhG: enables the reference position orientation tracking mode */